[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

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

New commits:
commit 72b0f1df2c3dce641f65ae845c425cd3fa92f6d2
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Mar 31 16:05:28 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Apr 1 14:20:11 2020 +0200

    sw: DOCX export: avoid section breaks in text frames harder
    
    Follow-up to 0dd48d1a9a716456ff1ebe67e19881ad2f56939b - in another
    document, the sectPr is written from
    DocxAttributeOutput::StartParagraphProperties(), which lacks a check
    that it's in the body text.
    
    Change-Id: Ia3b56f40a7457f072735a0e09205089a0c5f4584
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91429
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 38be440dbe8a706052182d06bb1ae95abdd06fcc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91399
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a88cb7ce30ab..ec37717bc7bc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1020,7 +1020,7 @@ void DocxAttributeOutput::StartParagraphProperties()
     m_pSerializer->startElementNS(XML_w, XML_pPr);
 
     // and output the section break now (if it appeared)
-    if ( m_pSectionInfo && (!m_setFootnote))
+    if (m_pSectionInfo && !m_setFootnote && m_rExport.m_nTextTyp == TXT_MAINTEXT)
     {
         m_rExport.SectionProperties( *m_pSectionInfo );
         m_pSectionInfo.reset();