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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf128156.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |    7 +++++++
 writerfilter/source/dmapper/DomainMapper.cxx |    3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 350972a8bffc1a74b531e0336954bf54b1356025
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Wed Oct 16 10:16:46 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Oct 16 11:44:09 2019 +0200

    tdf#128156 DOCX import: fix losing redline at page break
    
    w:framePr of page header doesn't mean real frame conversion,
    so don't store and lose redlines after it.
    
    Regression from commit e8bae67b3dbcc90ace8264b6b1aefaf0ce459aba
    "tdf#125894: DOCX: import tracked changes in frames".
    
    Change-Id: I46cd153cccef4824deca1f64341f2ea6672cdc42
    Reviewed-on: https://gerrit.libreoffice.org/80871
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf128156.docx b/sw/qa/extras/ooxmlexport/data/tdf128156.docx
new file mode 100644
index 000000000000..b499f6e50bdc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf128156.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 2f1207098c9b..807dd7b79708 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -908,6 +908,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894, "tdf125894.docx")
     assertXPath(pXmlDoc, "//w:ins");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
+{
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    // import change tracking in frames
+    assertXPath(pXmlDoc, "//w:ins");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125546, "tdf125546.docx")
 {
     xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index c8c4ce04f850..60cd9202b813 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1999,7 +1999,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
             if (pParaContext)
                 pParaContext->SetFrameMode();
 
-            m_pImpl->m_bIsActualParagraphFramed = true;
+            if (!IsInHeaderFooter())
+                m_pImpl->m_bIsActualParagraphFramed = true;
         }
         else
         {