summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-02-13 13:47:30 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-13 18:22:44 +0100
commit378f8ffee21ce20b5bb44b81ce76b4ff834fc49d (patch)
treec05e7dc2a5789c3fa85e5dd77bc8dd98ed98e9dc /sdext
parentf9a4886b5796b85fb5a99d2a63748bdb45688129 (diff)
cp#1000115 SwTxtFrm: don't join follow just because it has no content
The problem was that the bugdoc had a table, and inside the table there was a long paragraph that flows to the next page, but only the paragraph mark of it does so. We first split the frame to have space for the paragraph mark, but later decided that all the content would fit the first frame, and this way the last hard line break and the paragraph mark was painted on each other. This is normally not a problem without tables, because SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to join it, and we're ready. However, when the paragraph is inside a table, then the paragraph was formatted multiple times, and next time when we already had a follow nNew was not set, so even if there was a correct split first, the new frame was joined later. Fix the problem by explicitly setting nNew for the "in a table and paragraph ends with a hard line break" case, that way we don't blindly join the frame, only in case there is enough space for the follow in the master. (cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9) Conflicts: sw/CppunitTest_sw_uiwriter.mk sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a
Diffstat (limited to 'sdext')
0 files changed, 0 insertions, 0 deletions