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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit b18e5fc324edb4a4ea20387fbdd3acc7c1e08309
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Dec 15 08:21:37 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Sat Dec 22 05:12:21 2018 +0100

    tdf#107618 revert fix missing header when doc ends with section
    
    This fix is replaced by the fix for tdf#121374.
    
    Change-Id: I2944050d51689cac7cca68f2066fe196a52312ec
    Reviewed-on: https://gerrit.libreoffice.org/65247
    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 462af4db6ebc..dee0bdb33f59 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5950,20 +5950,6 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectio
                     bEmit = (nColumns > 1 && bBalance);
                 }
 
-                if (!bEmit)
-                {
-                    // Also need to emit if the page desc contains a header or
-                    // footer, otherwise we go with the properties of the
-                    // section (and not the page style), which never has
-                    // headers/footers.
-                    const SwPageDesc* pPageDesc = pSectionInfo->pPageDesc;
-                    if ( pPageDesc && pPageDesc != m_rExport.m_pCurrentPageDesc )
-                    {
-                        const auto& rMaster = pPageDesc->GetMaster();
-                        bEmit = rMaster.GetHeader().IsActive() || rMaster.GetFooter().IsActive();
-                    }
-                }
-
                 // don't add section properties if this will be the first
                 // paragraph in the document
                 if ( !m_bParagraphOpened && !m_bIsFirstParagraph && bEmit )