Revision 78e74eb...

Go back to digest for 20th January 2013

Other in Office

C. Boemann committed changes in [calligra] /:

Change KoTextAnchor into three new classes
KoShapeAnchor - which in theory should be moved to flake later
KoAnchorInlineObject - which is the kotext part responsible for being an inline (asChar) object
KoAnchorTextRange - which is the kotext part resposible for toChar and toParagraph anchoring

Now the user no longer have to contend with invisible characters acting as anchors. These kinds
of anchors are now placed at a cursor position instead (using KoTextRange)

This also has the benefit that we can support toParagraph anchoring a bit better, as it's no
longer possible to move the anchor character away from the paragraphs first position.

REVIEW: 108459

File Changes

Added 4 files
  • /kotext
  •   libs/KoAnchorInlineObject.cpp
  •   libs/KoAnchorInlineObject.h
  •   libs/KoAnchorTextRange.cpp
  •   libs/KoAnchorTextRange.h
Modified 48 files
  •   libs/kotext/CMakeLists.txt
  •   libs/kotext/KoTextEditor.cpp
  •   libs/kotext/KoTextEditor.h
  •   libs/kotext/KoTextRange.cpp
  •   libs/kotext/KoTextRange.h
  •   libs/textlayout/AnchorStrategy.cpp
  •   libs/textlayout/AnchorStrategy.h
  •   libs/textlayout/FloatingAnchorStrategy.cpp
  •   libs/textlayout/FloatingAnchorStrategy.h
  •   libs/textlayout/InlineAnchorStrategy.cpp
  •   libs/textlayout/InlineAnchorStrategy.h
  •   libs/textlayout/KoTextDocumentLayout.cpp
  •   libs/textlayout/KoTextDocumentLayout.h
  •   libs/textlayout/KoTextLayoutArea.cpp
  •   libs/textlayout/KoTextShapeContainerModel.cpp
  •   libs/textlayout/KoTextShapeContainerModel.h
  •   libs/textlayout/KoTextShapeData.cpp
  •   words/part/KWDocument.cpp
  •   words/part/KWDocument.h
  •   words/part/KWOdfSharedLoadingData.cpp
  •   words/part/KWOdfSharedLoadingData.h
  •   words/part/KWOdfWriter.cpp
  •   words/part/KWRootAreaProvider.cpp
  •   words/part/KWView.cpp
  •   words/part/KWView.h
  •   libs/kotext/commands/ChangeAnchorPropertiesCommand.cpp
  •   libs/kotext/commands/ChangeAnchorPropertiesCommand.h
  •   libs/kotext/commands/ChangeTrackedDeleteCommand.cpp
  •   libs/kotext/commands/DeleteAnchorsCommand.cpp
  •   libs/kotext/commands/DeleteAnchorsCommand.h
  •   libs/kotext/commands/DeleteCommand.cpp
  •   libs/kotext/commands/DeleteCommand.h
  •   libs/kotext/opendocument/KoTextLoader.cpp
  •   libs/kotext/opendocument/KoTextSharedLoadingData.cpp
  •   libs/kotext/opendocument/KoTextSharedLoadingData.h
  •   libs/kotext/opendocument/KoTextWriter_p.cpp
  •   libs/kotext/opendocument/KoTextWriter_p.h
  •   plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp
  •   plugins/textshape/commands/ShowChangesCommand.cpp
  •   words/part/commands/KWShapeCreateCommand.cpp
  •   words/part/commands/KWShapeCreateCommand.h
  •   words/part/dialogs/KWAnchoringProperties.cpp
  •   words/part/dialogs/KWAnchoringProperties.h
  •   words/part/dialogs/KWFrameDialog.cpp
  •   words/part/frames/KWFrame.cpp
  •   words/part/frames/KWFrame.h
  •   words/part/frames/KWFrameLayout.cpp
  •   words/part/frames/KWTextFrameSet.cpp
52 files changed in total