[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Lubos Lunak]

 sw/source/filter/ww8/wrtw8sty.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 323476bbcc3d1b787d5fe7602c45db68a3580ac5
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 21 17:41:42 2011 +0200

    fix detection of first-page header/footer (previous commit,bnc#654230)

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 0ca0160..947b438 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 );