[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff66e912c4019c9d6320eeef4d75f265cd878d01
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Mon Dec 17 14:15:55 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Dec 24 06:32:54 2018 +0100

    sw ooxmlexport: Header/Footer - ignore postponed page breaks
    
    I ran across this causing problems as I was developing a
    patch. I don't see any documents where I can see the problem
    any more, so no unit test.
    
    Change-Id: I432edae0ae47150a4b38de78714b284a02766e99
    Reviewed-on: https://gerrit.libreoffice.org/65265
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index dee0bdb33f59..0a71d47edc58 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1148,7 +1148,7 @@ void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMar
         m_nColBreakStatus = COLBRK_NONE;
     }
 
-    if ( m_bPostponedPageBreak )
+    if ( m_bPostponedPageBreak && !m_bWritingHeaderFooter )
     {
         m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
         m_pSerializer->singleElementNS( XML_w, XML_br,