summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-08-28 15:00:48 +0300
committerJustin Luth <justin_luth@sil.org>2020-09-24 19:18:31 +0200
commit5a234ba7f02660ab770f2744d0b936e5607ddafe (patch)
treea03c300faefa869c8c85f832a5cfd7aa8102c5ef /sw/source
parentf90da5211abb470982b2070237c7758556a70145 (diff)
tdf#132149 ww8export: use left page properties for left style
This code was unchanged since original import from OOo. There is some monkey business going on here to handle left/right page styles following each other. Normally, the settings between these pages would be identical in terms of margins and page size etc. But not necessarily so. So, make sure that for the left style, use the format properties from the left style before switching over to the right style to grab its header/footer. [At least, that is how I understand what is happening...] Change-Id: Idc65a14fb39566e05d32d677c90e68971d77590c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101544 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 0e7830ccfb04..5f4c31d9bc99 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1775,8 +1775,8 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
if ( UseOnPage::Left == ( UseOnPage::All & pPd->ReadUseOn() ) )
{
nBreakCode = 3;
- pPd = pPd->GetFollow();
- pPdFormat = &pPd->GetMaster();
+ pPdFormat = &pPd->GetMaster(); //use the current page for settings (margins/width etc)
+ pPd = pPd->GetFollow(); //switch to the right page for the right/odd header/footer
}
else
nBreakCode = 4;