summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport4.cxx')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 01d3992285ee..e4e90ba86655 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -363,9 +363,11 @@ DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx")
/* fdo73545: Column Break with Column_count = 0 was not getting preserved.
* The <w:br w:type="column" /> was missing after roundtrip
*/
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
- if (pXmlDoc)
+ if (isExported())
+ {
+ xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[1]/w:br","type","column");
+ }
//tdf76349 match Word's behavior of treating breaks in single columns as page breaks.
CPPUNIT_ASSERT_EQUAL(2, getPages());
@@ -489,9 +491,9 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"), getShape(2)->getShapeType());
// check the objects are present in the exported document.xml
- xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
- if (!pXmlDocument)
+ if (!isExported())
return;
+ xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
assertXPath(pXmlDocument, "/w:document/w:body/w:p/w:r/w:object", 2);
// finally check the embedded files are present in the zipped document