Revision 1203238

Go back to digest for 5th December 2010

Features in Office

Pavol Korinek committed changes in /branches/work/koffice-essen:

Do anchors like in ODF - merge from odfanchors branch

All alignment attributes have been changed from KWord special values to horizRel,horizPos,vertRel and vertPos
This in theory should allow us to support anything MSWord and OOO does

saveOdf and loadOdf implemented with support for old KWord values on load

Recalculation of placement redone based on the new attributes
- new feature is containment inside page borders

Move empty line down if it doesn't fit or shape has wrap-none

Don't create a line if the anchor is at the begining of the line

Make the layout process store the top of the paragraph (including topmargin) in the KoTextBlockData

Remove the functionality that when a user moved a shape it would try to guess (badly) the users intentions - never ever second guess the user.

Outstanding issues:
- behave as character combined with char and text alingments not working (rare use case
- recalulate enough when shape is above anchor is not yet done (but hanzes is working on it)
- unit tests needs to be reimplemented
- char anchor has height of default font (strictly speaking fallout of commit in essen about
overstrike of images)

Work done by Matus Hanzes, Pavol Korinik and Casper Boemann

File Changes

Modified 13 files
  • /branches/work/koffice-essen
  •   /kword/part/KWPageTextInfo.cpp
  •   /kword/part/KWPageTextInfo.h
  •   /libs/kotext/KoTextAnchor.cpp
  •   /libs/kotext/KoTextAnchor.h
  •   /libs/kotext/KoTextBlockData.cpp
  •   /libs/kotext/KoTextBlockData.h
  •   /libs/kotext/KoTextShapeContainerModel.cpp
  •   /plugins/textshape/Layout.cpp
  •   /plugins/textshape/Layout.h
  •   /kword/part/frames/KWAnchorStrategy.cpp
  •   /kword/part/frames/KWAnchorStrategy.h
  •   /kword/part/frames/KWTextDocumentLayout.cpp
  •   /kword/part/tests/TestDocumentLayout.cpp
13 files changed in total