summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Co <rattles2013@gmail.com>2013-12-31 15:39:32 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-02 09:33:02 +0100
commit53745911a7055cab0ddcfc4ac221ecfaccb04902 (patch)
treef737189ad51df5553de31260613ba58a20b073f3
parent96dcea05d2aedceeb27f9506b4178c664be5f80b (diff)
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
-rw-r--r--sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docxbin0 -> 16364 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx10
2 files changed, 9 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx
new file mode 100644
index 000000000000..5d85f326d3c7
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 15ca09e6b3f2..77491ea853e6 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();