summaryrefslogtreecommitdiff
path: root/vigra
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-10 11:54:03 +0200
committerJan Holesovsky <kendy@collabora.com>2015-04-10 14:11:34 +0200
commita9d3de2994438bc1891d733cb7f88f3cefe3db43 (patch)
tree98e5563f4c4e9703937270a3df067f34b45d79f9 /vigra
parent813ee98ed511fd8ce13d1bee4c84c18076ed66e1 (diff)
tdf#90230 SwDoc::AppendDoc: take care of marks when inserting page break private/kendy/mailmerge-05
SwDoc::AppendDoc() inserts nodes from an other document, and before doing that, it inserts a page break at the end of the document. In case there are marks at the end of the last paragraph, the insertion of the page break moves them to the next page. This is a rare situation, but happens e.g. when the source document is an empty one: then MM puts a mark at the first paragraph of each inserted MM part, and then the first paragraph == the last paragraph, so the mark of the only paragraph in the document gets moved to the next page. This is a problem on its own, but is detected by the SwIndexReg dtor when that empty paragraph gets deleted later in SwNodes::Delete() called by SwDoc::AppendDoc(), resulting in an assertion failure. Triggered by commit a305a2c91420652db450b7f8edd140e1d69f42cf (use bookmarks to mark mailmerge parts in a mailmerge document (fdo#80823), 2014-10-20), these not adjusted bookmarks were not detected before. Unit test not included, as the entire mailmerge unit test framework is missing in 4.1. Conflicts: sw/qa/extras/mailmerge/mailmerge.cxx Change-Id: I89775b477a2fd3182b2bc87144aed2bfe7912aff
Diffstat (limited to 'vigra')
0 files changed, 0 insertions, 0 deletions