summaryrefslogtreecommitdiff
authorLuboš Luňák <l.lunak@suse.cz>2012-05-24 13:27:57 (GMT)
committer Luboš Luňák <l.lunak@suse.cz>2012-05-24 15:59:40 (GMT)
commit5935a6db64830ac5b932803cdcac5813aa033594 (patch) (side-by-side diff)
treebc74457f27a305d8708addc38e0431320c779fc6
parentf6d9b4afbda6cf1a3db822b5fb5125448ef9e1d1 (diff)
downloadcore-5935a6db64830ac5b932803cdcac5813aa033594.zip
core-5935a6db64830ac5b932803cdcac5813aa033594.tar.gz
column break without columns seems to be a page break (bnc#750255)
That at least seems to be my conclusion after testing the doc and bnc#652364 in MSO2k7. Change-Id: Iec172dad32ba47c1f843df49a4eaff688c094373
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--sw/source/filter/ww8/ww8par.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e7ae45c..fdeafca 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3886,8 +3886,10 @@ void wwSectionManager::InsertSegments()
mySegIter aStart = maSegments.begin();
for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
{
- // If the section is of type "New column" (0x01), then simply insert a column break
- if ( aIter->maSep.bkc == 1 )
+ // If the section is of type "New column" (0x01), then simply insert a column break.
+ // But only if there actually are columns on the page, otherwise a column break
+ // seems to be handled like a page break by MSO.
+ if ( aIter->maSep.bkc == 1 && aIter->maSep.ccolM1 > 0 )
{
SwPaM start( aIter->maStart );
mrReader.rDoc.InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);