diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-04-21 17:41:42 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-04-21 17:43:25 +0200 |
| commit | 8dc7fcfb5e5a8de2411d2bb29f450cabc3690859 (patch) | |
| tree | dd29d09c38f6bdd2deeec53107751834436586f7 | |
| parent | ed68bd23c0542e4e34fe51eb9854b7772d7b2cfe (diff) | |
fix detection of first-page header/footer (previous commit,bnc#654230)
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 17716b65cc05..0f93dd67b669 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1648,7 +1648,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt bOutFirstPage = false; } - // left-/right chain of pagedescs ? if ( pPd->GetFollow() && pPd != pPd->GetFollow() && pPd->GetFollow()->GetFollow() == pPd && @@ -1714,10 +1713,10 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); } - // write other headers/footers only if it's not the first page - I'm not quite sure + // write other headers/footers only if it's not on the first page - I'm not quite sure // this is technically correct, but it avoids first-page headers/footers // extending to all pages (bnc#654230) - if( pPdFmt != pPdFirstPgFmt ) + if( !titlePage || pPdFmt != pPdFirstPgFmt ) { MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); |