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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedEmptyParagraph.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx                               |    7 +++++++
 sw/source/filter/ww8/docxattributeoutput.cxx                             |    1 +
 3 files changed, 8 insertions(+)

New commits:
commit 4e5f89d2d3511b6421b388ecaba2f61ada14d084
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Thu Sep 13 16:41:51 2018 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Fri Sep 14 09:53:03 2018 +0200

    tdf#119848 DOCX export: keep tracked deleted empty line
    
    when it has no other paragraph property change.
    
    Change-Id: I4e18c89f1a4c7f39a7e55303956b85f61c9d5105
    Reviewed-on: https://gerrit.libreoffice.org/60442
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedEmptyParagraph.docx b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedEmptyParagraph.docx
new file mode 100644
index 000000000000..bd332efa4cfe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedEmptyParagraph.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index c7400b974394..e92bb8178b4b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -711,7 +711,14 @@ DECLARE_OOXMLEXPORT_TEST(testChart_BorderLine_Style, "Chart_BorderLine_Style.doc
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:spPr/a:ln/a:prstDash", "val", "sysDot");
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:spPr/a:ln/a:prstDash", "val", "sysDash");
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:spPr/a:ln/a:prstDash", "val", "dash");
+}
 
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedEmptyParagraph, "testTrackChangesDeletedEmptyParagraph.docx")
+{
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:rPr/w:del");
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 505ea1b74f8a..a72f89a7d022 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2084,6 +2084,7 @@ void DocxAttributeOutput::InitCollectedRunProperties()
         FSNS( XML_w, XML_specVanish ),
         FSNS( XML_w, XML_oMath ),
         FSNS( XML_w, XML_rPrChange ),
+        FSNS( XML_w, XML_del ),
         FSNS( XML_w14, XML_glow ),
         FSNS( XML_w14, XML_shadow ),
         FSNS( XML_w14, XML_reflection ),