diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-05-24 15:27:57 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-31 14:53:24 +0100 |
commit | c15f23b561b9a540cd8024a4f4294a8b51596c28 (patch) | |
tree | e734f41b87ded36b2d9d9fb2941b628190a5c5ba /sw | |
parent | a73a229f77471bcf50b00a8395ddcd7c85be69f6 (diff) |
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
(cherry picked from commit 5935a6db64830ac5b932803cdcac5813aa033594)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1070fdc974b7..8d6d699f869a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3931,8 +3931,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); |