Revision 8f5bb09...

Go back to digest for 4th September 2011

Other in Office

Boudewijn Rempt committed changes in [calligra] /kotext:

Use a stack of stacks for the inline object start/end matching

Previously, if you had a document that contained a table with a bookmark
start before and bookmark end after the table, all table cells would
be written out with a bookmark-end because we call writeblocks recursively,
even on nested documents.

This patch creates a stack of stacks which gets pushed at the start
of writeBlocks and popped at the end of writeblock. Hopefully, there's
not more KoTextWriter::Private state that gets confused because we
call writeBlocks recursively.

File Changes

Modified 3 files
  • /kotext
  •   libs/KoBookmark.cpp
  •   libs/opendocument/KoTextWriter_p.cpp
  •   libs/opendocument/KoTextWriter_p.h
3 files changed in total