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

[Adam Co]

 sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx                                |   10 +++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 53745911a7055cab0ddcfc4ac221ecfaccb04902
Author: Adam Co <rattles2013 at gmail.com>
Date:   Tue Dec 31 15:39:32 2013 +0200

    Add unit-test for 'track changes - deleted paragraph mark' preservation
    
    This is a unit-test added to complement the patch that added support
    for the preservation of 'Track Changes - Deleted Paragraph Mark' from
    a DOCX file.
    
    Conflicts:
    	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
    Reviewed on:
    	https://gerrit.libreoffice.org/7240
    
    Change-Id: I161bcd90ec891fad60dfd5b7c77edddfd90b7fa8

diff --git a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx
new file mode 100644
index 0000000..5d85f32
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 15ca09e..77491ea 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2148,7 +2148,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testCrashWhileSave, "testCrashWhileSave.docx")
 {
-        xmlDocPtr pXmlDoc = parseExport("word/footer1.xml");
+    xmlDocPtr pXmlDoc = parseExport("word/footer1.xml");
     if (!pXmlDoc)
         return;
     CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle", "val").match("Normal"));
@@ -2175,6 +2175,14 @@ DECLARE_OOXMLEXPORT_TEST(testRelorientation, "relorientation.docx")
     CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChangesDeletedParagraphMark.docx")
+{
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();