sw/qa/extras/fodfexport/fodfexport.cxx | 2 ++
sw/qa/extras/odfexport/odfexport.cxx | 24 ++++++++++++++++++++++++
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 8 ++++++++
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 4 ++++
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 6 ++++++
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2 ++
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 5 +++++
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 3 +++
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 1 +
sw/qa/extras/rtfexport/rtfexport.cxx | 5 +++++
sw/qa/extras/rtfexport/rtfexport3.cxx | 1 +
sw/qa/extras/rtfexport/rtfexport4.cxx | 2 ++
sw/qa/extras/rtfexport/rtfexport5.cxx | 2 ++
sw/qa/extras/ww8export/ww8export.cxx | 3 +++
sw/qa/extras/ww8export/ww8export2.cxx | 3 +++
sw/qa/extras/ww8export/ww8export3.cxx | 2 ++
22 files changed, 79 insertions(+)
New commits:
commit ec8dc357e68e20fa00a7d37f8c3195f571fb1fa6
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri May 15 20:46:27 2020 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sat May 16 00:09:25 2020 +0200
CppUnittest: assert shapes in odf files
found by bin/check-missing-export-asserts.py
Change-Id: I270b5dce748039427aaf5507006a8c145ef1419b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94331
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx
b/sw/qa/extras/fodfexport/fodfexport.cxx
index 3300eee46acf..7e0e57ffb160 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -29,6 +29,7 @@ public:
DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test that an image which is written in svm format (image/x-vclgraphic)
// is accompanied by a png fallback graphic.
@@ -43,6 +44,7 @@ DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Same as testTdf113696, but with a writer image instead of a draw image
// (they use different code paths).
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 7648af492ced..8c0cae715428 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -222,6 +222,7 @@ DECLARE_ODFEXPORT_TEST(testTdf43569,
"tdf43569_conditionalfield.doc")
DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> const xShape(getShape(1));
@@ -268,6 +269,7 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDecl,
"user-field-decl.odt")
DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly, "user-field-decl-fly.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"))
// Without the accompanying fix in place, this test would have failed
with 'Expected: 2;
@@ -278,6 +280,7 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly,
"user-field-decl-fly.odt")
DECLARE_ODFEXPORT_TEST(testFramebackgrounds, "framebackgrounds.odt")
{
+ CPPUNIT_ASSERT_EQUAL(16, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
//Counting the Number of Frames and checking with the expected count
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -449,6 +452,7 @@ DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded,
"oooxml_embedded.sxw")
DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
//Note this is for a crash test
//Counting the Number of Frames and checking with the expected count
@@ -459,6 +463,7 @@ DECLARE_ODFEXPORT_TEST(testredlineTextFrame,
"redlineTextFrame.odt")
DECLARE_ODFEXPORT_TEST(testTdf131621, "tdf131621.ott")
{
+ CPPUNIT_ASSERT_EQUAL(12, getShapes());
//Crash test, Check number of pages
CPPUNIT_ASSERT_EQUAL( 1, getPages() );
}
@@ -644,6 +649,7 @@ DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter,
"first-header-footer.odt")
DECLARE_ODFEXPORT_TEST(testTextframeGradient, "textframe-gradient.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -1074,6 +1080,7 @@ DECLARE_ODFEXPORT_TEST(testTdf103091, "tdf103091.fodt")
DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow,
"textframe-transparent-shadow.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xPicture = getShape(1);
// ODF stores opacity of 75%, that means 25% transparency.
@@ -1082,6 +1089,7 @@ DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow,
"textframe-transparent-sh
DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xTextFrame = getShape(1);
// This was text::RelOrientation::FRAME (the default),
RelativeHeightRelation was not handled in xmloff.
@@ -1095,6 +1103,7 @@ DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
DECLARE_ODFEXPORT_TEST(testRelhPageTdf80282, "relh-page-tdf80282.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xTextFrame = getShape(1);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Height", sal_Int32(8391),
parseDump("//anchored/fly/infos/bounds", "height").toInt32());
@@ -1103,6 +1112,7 @@ DECLARE_ODFEXPORT_TEST(testRelhPageTdf80282,
"relh-page-tdf80282.odt")
DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xTextFrame = getShape(1);
// This was text::RelOrientation::FRAME (the default),
RelativeWidthRelation was not handled in xmloff.
@@ -1116,6 +1126,7 @@ DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, "textframe-vertadjust.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test import/export of new frame attribute called TextVerticalAdjust
@@ -1132,6 +1143,7 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust,
"textframe-vertadjust.odt")
DECLARE_ODFEXPORT_TEST(testTdf111891_frameVertStyle,
"tdf111891_frameVertStyle.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xFrame(getShape(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM,
getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
@@ -1139,6 +1151,7 @@ DECLARE_ODFEXPORT_TEST(testTdf111891_frameVertStyle,
"tdf111891_frameVertStyle.o
DECLARE_ODFEXPORT_TEST(testShapeRelsize, "shape-relsize.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// These were all 0, as style:rel-width/height was ignored on import for
shapes.
@@ -1153,6 +1166,7 @@ DECLARE_ODFEXPORT_TEST(testShapeRelsize,
"shape-relsize.odt")
DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners,
"textbox-rounded-corners.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
comphelper::SequenceAsHashMap aCustomShapeGeometry(getProperty<
uno::Sequence<beans::PropertyValue> >(xShape, "CustomShapeGeometry"));
@@ -1175,6 +1189,7 @@ DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners,
"textbox-rounded-corners.odt")
// test that import whitespace collapsing is compatible with old docs
DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
{
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XEnumerationAccess> xPara;
uno::Reference<container::XEnumeration> xPortions;
@@ -1518,6 +1533,7 @@ DECLARE_ODFEXPORT_TEST(testBtlrCell, "btlr-cell.odt")
DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the accompanying fix in place, this test would have failed, as
// the btlr text direction in the text frame was lost on ODF import and
@@ -1627,6 +1643,7 @@ DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
DECLARE_ODFEXPORT_TEST(testGerrit13858, "gerrit13858.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Just make sure the output is valid.
}
@@ -1680,6 +1697,7 @@ DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr,
"userdefattr-tablecell.odt")
#if HAVE_FEATURE_PDFIUM
DECLARE_ODFEXPORT_TEST(testEmbeddedPdf, "embedded-pdf.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// This failed, pdf+png replacement graphics pair didn't survive an ODT
roundtrip.
@@ -2089,6 +2107,7 @@ DECLARE_ODFEXPORT_TEST(testTdf129568ui,
"tdf129568-ui.fodt")
DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test that the loext:mimetype attribute is written for exported images,
tdf#109202
if (xmlDocUniquePtr pXmlDoc = parseExport("content.xml"))
@@ -2121,6 +2140,7 @@ DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps,
"embedded-font-props.odt")
DECLARE_ODFEXPORT_TEST(testTdf100492, "tdf100492.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT(xShape.is());
@@ -2206,6 +2226,7 @@ DECLARE_ODFEXPORT_TEST(testRubyPosition,
"ruby-position.odt")
DECLARE_ODFEXPORT_TEST(testAllowOverlap, "allow-overlap.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Without the accompanying fix in place, this test would have failed with:
@@ -2244,6 +2265,7 @@ DECLARE_ODFEXPORT_TEST(testSignatureLineProperties,
"signatureline-properties.fo
DECLARE_ODFEXPORT_TEST(testQrCodeGenProperties, "qrcode-properties.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT(xShape.is());
@@ -2371,6 +2393,7 @@ DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Make sure the replacement graphic is still there
@@ -2473,6 +2496,7 @@ DECLARE_ODFEXPORT_TEST(testArabicZero5Numbering,
"arabic-zero5-numbering.odt")
DECLARE_ODFEXPORT_TEST(testPageContentBottom, "page-content-bottom.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
sal_Int16 nExpected = text::RelOrientation::PAGE_PRINT_AREA_BOTTOM;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 2133feded15e..df21b60935a5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -421,6 +421,7 @@ DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape,
"signature-line-all-props-set.d
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf117805, "tdf117805.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess
=
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 872e94adac6e..15ae1de673ce 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -346,6 +346,7 @@
DECLARE_OOXMLEXPORT_TEST(testTableCrossReferenceCustomFormat,
DECLARE_OOXMLEXPORT_TEST(testObjectCrossReference,
"object_cross_reference.odt")
{
+ CPPUNIT_ASSERT_EQUAL(10, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
// tdf#42346: Cross references to objects were not saved
// MSO uses simple bookmarks for referencing table caption, so we do the
same by export
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 28f91f578645..272daae72c78 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -588,6 +588,7 @@ DECLARE_OOXMLEXPORT_TEST(testInputListExport,
"tdf122186_input_list.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf116371, "tdf116371.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Make sure the rotation is exported correctly, and size not distorted
auto xShape(getShape(1));
@@ -879,6 +880,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf78657,
"tdf78657_picture_hyperlink.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testBtlrFrame, "btlr-frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xPropertySet(getShape(1),
uno::UNO_QUERY);
comphelper::SequenceAsHashMap
aGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
@@ -890,6 +892,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testBtlrFrame,
"btlr-frame.odt")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125518, "tdf125518.odt")
{
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1068,6 +1071,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127339, "tdf127339.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127362, "tdf127362.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1082,6 +1086,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127362,
"tdf127362.odt")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127605, "tdf127605.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1092,6 +1097,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127605,
"tdf127605.odt")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127732,
"internal_hyperlink_frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1102,6 +1108,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127732,
"internal_hyperlink_frame.odt
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127733,
"internal_hyperlink_ole.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1173,6 +1180,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf127579,
"tdf127579.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf128304, "tdf128304.odt")
{
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
css::text::WritingMode eMode;
uno::Reference<beans::XPropertySet> xProps1(getShape(1), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index c2b98c36333e..cf6d3f6e2671 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -948,6 +948,7 @@ DECLARE_OOXMLEXPORT_TEST(testStrikeoutGroupShapeText,
"tdf131776_StrikeoutGroupS
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131539, "tdf131539.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
//The positions of OLE objects were not exported, check if now it is
exported correctly
xmlDocUniquePtr p_XmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index c622c6999c9b..50b43fed1a44 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -409,6 +409,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableBorders,
"table-borders.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo51550, "fdo51550.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was that we lacked the fallback to export the replacement
// graphic for OLE objects. But we can actually export the OLE itself now,
@@ -552,6 +553,7 @@ DECLARE_OOXMLEXPORT_TEST(testMathLiteral,
"math-literal.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo48557, "fdo48557.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Inner margins of the textframe wasn't exported.
uno::Reference<beans::XPropertySet> xFrame(getShape(1), uno::UNO_QUERY);
@@ -788,6 +790,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66543, "fdo66543.docx")
DECLARE_OOXMLEXPORT_TEST(testN822175, "n822175.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xFrame(getShape(1), uno::UNO_QUERY);
// Was text::WrapTextMode_THROUGH, due to missing Surround handling in the
exporter.
@@ -923,6 +926,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66781, "fdo66781.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo60990, "fdo60990.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The shape had no background, no paragraph adjust and no font color.
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index db1fa7520d33..6993eb54c273 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -767,6 +767,7 @@ DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop,
"test_PNG_ImageCrop.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf41542_imagePadding,
"tdf41542_imagePadding.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// borderlessImage - image WITHOUT BORDERS : simulate padding with -crop
text::GraphicCrop crop = getProperty<text::GraphicCrop>(getShape(2),
"GraphicCrop");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 00976d2c3022..08642a53da7f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -409,6 +409,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testChartInFooter,
"chart-in-footer.docx")
DECLARE_OOXMLEXPORT_TEST(testNestedTextFrames, "nested-text-frames.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// First problem was LO crashed during export (crash test)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 183cf5cf3b99..5d6e3338b99d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -112,6 +112,7 @@ DECLARE_OOXMLEXPORT_TEST(testDecimalNumberingNoLeveltext,
"decimal-numbering-no-
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testNoDuplicateAttributeExport,
"duplicate-east-asia.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// File asserting while saving in LO.
parseExport("word/document.xml");
@@ -310,6 +311,7 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOldComplexMergeTableInTable, "ooo96040-2
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testHyperlinkContainingPlaceholderField,
"hyperlink-field.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
parseExport("word/document.xml");
}
@@ -1184,6 +1186,7 @@ DECLARE_OOXMLEXPORT_TEST(testSectionHeader,
"sectionprot.odt")
DECLARE_OOXMLEXPORT_TEST(testOO47778_1, "ooo47778-3.odt")
{
+ CPPUNIT_ASSERT_EQUAL(5, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"))
assertXPathContent(pXmlDoc, "(//w:t)[3]", "c");
@@ -1191,6 +1194,7 @@ DECLARE_OOXMLEXPORT_TEST(testOO47778_1, "ooo47778-3.odt")
DECLARE_OOXMLEXPORT_TEST(testOO47778_2, "ooo47778-4.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"))
assertXPathContent(pXmlDoc, "(//w:t)[4]", "c");
@@ -1212,6 +1216,7 @@ DECLARE_OOXMLEXPORT_TEST(testOO67471, "ooo67471-2.odt")
DECLARE_OOXMLEXPORT_TEST(testKDE302504, "kde302504-1.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"))
assertXPath(pXmlDoc, "//v:shape", "ID", "KoPathShape");
@@ -1219,6 +1224,7 @@ DECLARE_OOXMLEXPORT_TEST(testKDE302504, "kde302504-1.odt")
DECLARE_OOXMLEXPORT_TEST(testKDE216114, "kde216114-1.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"))
assertXPath(pXmlDoc, "//w:pict", 1);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 0ce0b3c150b3..14d8a979facc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -49,6 +49,7 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle,
"dml-shape-title.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDmlZorder, "dml-zorder.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// This was "0": causing that in Word, the second shape was on top, while
in the original odt the first shape is on top.
@@ -946,6 +947,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testExtentValue,
"fdo74605.docx")
// other dimension.
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testSyncedRelativePercent,
"tdf93676-1.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index a0e2b920dadc..bb961d13defe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -148,6 +148,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo76979,
"fdo76979.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf104539, "tdf104539.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
@@ -919,6 +920,7 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureColormodeGrayscale, "picture_colo
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureColormodeBlackWhite,
"picture_colormode_black_white.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport ("word/document.xml");
@@ -927,6 +929,7 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureColormodeBlackWhite, "picture_col
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureColormodeWatermark,
"picture_colormode_watermark.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport ("word/document.xml");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"bright", "70000");
@@ -936,6 +939,7 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureColormodeWatermark, "picture_colo
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testExportShadow, "bnc637947.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was that shadows of shapes from non-OOXML origin were not
exported to DrawingML
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1054,6 +1058,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTDF93675,
"no-numlevel-but-indented.odt"
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// there should be no flipH and flipV attributes in this case
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index f31bf3e4b31f..e41501720a49 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -87,6 +87,7 @@ DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf48569, "tdf48569.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// File crashing while saving in LO
text::TextContentAnchorType eValue =
getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 7f9015c0bc84..85376af95392 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1234,6 +1234,7 @@ DECLARE_OOXMLEXPORT_TEST( testActiveXCheckbox,
"activex_checkbox.docx" )
DECLARE_OOXMLEXPORT_TEST(testActiveXControlAlign, "activex_control_align.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// First check box aligned as a floating object
uno::Reference<drawing::XControlShape> xControlShape(getShape(1),
uno::UNO_QUERY);
@@ -1336,6 +1337,7 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark,
"watermark-shapetype.docx")
DECLARE_OOXMLEXPORT_TEST(testActiveXControlAtRunEnd,
"activex_control_at_run_end.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Two issues were here:
// 1) second shape was not export (it is anchored to the end of the run)
@@ -1388,6 +1390,7 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXOptionButtonGroup,
"activex_option_button_gr
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(tdf112169, "tdf112169.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(6, getPages());
// LO crashed while export because of character background color handling
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index e23815c5b40f..df4ac56ec5b1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -59,6 +59,7 @@ DECLARE_OOXMLEXPORT_TEST(testN789482, "n789482.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testBnc834035, "bnc834035.odt")
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(3, getPages());
// Illustration index had wrong hyperlinks: anchor was using Writer's
// <seqname>!<index>|sequence syntax, not a bookmark name.
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index b12fd8ec1db3..76d880c17a0f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -398,6 +398,7 @@ DECLARE_RTFEXPORT_TEST(testFdo77979, "fdo77979.odt")
DECLARE_RTFEXPORT_TEST(testFdo53113, "fdo53113.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
/*
* The problem was that a custom shape was missing its second (and all the
other remaining) coordinates.
@@ -449,6 +450,7 @@ DECLARE_RTFEXPORT_TEST(testFdo55939, "fdo55939.odt")
DECLARE_RTFEXPORT_TEST(testTextFrames, "textframes.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The output was simply invalid, so let's check if all 3 frames were
imported back.
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -801,6 +803,7 @@ DECLARE_RTFEXPORT_TEST(testFdo80167, "fdo80167.rtf")
DECLARE_RTFEXPORT_TEST(testFdo32613, "fdo32613.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// This was AS_CHARACTER, RTF export did not support writing anchored
pictures.
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
@@ -834,6 +837,7 @@ DECLARE_RTFEXPORT_TEST(testTdf113408, "tdf113408.rtf")
DECLARE_RTFEXPORT_TEST(testAbi10039, "abi10039.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Make sure we don't just crash on export, and additionally the shape
should not be inline (as it's at-page anchored originally).
CPPUNIT_ASSERT(text::TextContentAnchorType_AS_CHARACTER
@@ -873,6 +877,7 @@ DECLARE_RTFEXPORT_TEST(testNumberingFont,
"numbering-font.rtf")
DECLARE_RTFEXPORT_TEST(testFdo82860, "fdo82860.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was that:
// 1) The import tried to use fieldmarks for SHAPE fields
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 43c06fd68208..7bb20cbb410e 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -205,6 +205,7 @@ DECLARE_RTFEXPORT_TEST(testTdf117268, "tdf117268.rtf")
DECLARE_RTFEXPORT_TEST(testTdf117505, "tdf117505.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XNameAccess>
xPageStyles(getStyles("PageStyles"));
uno::Reference<beans::XPropertySet>
xFirstPage(xPageStyles->getByName("First Page"),
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index e17d8743b40b..d0906fae9b3a 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -237,6 +237,7 @@ DECLARE_RTFEXPORT_TEST(testBtlrCell, "btlr-cell.rtf")
DECLARE_RTFEXPORT_TEST(testTbrlFrame, "tbrl-frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
auto nActual = getProperty<sal_Int16>(xShape, "WritingMode");
@@ -249,6 +250,7 @@ DECLARE_RTFEXPORT_TEST(testTbrlFrame, "tbrl-frame.odt")
DECLARE_RTFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
auto nActual = getProperty<sal_Int16>(xShape, "WritingMode");
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 299cea3bcc90..12023f321232 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1155,6 +1155,7 @@ DECLARE_RTFEXPORT_TEST(testTdf106950, "tdf106950.rtf")
DECLARE_RTFEXPORT_TEST(testTdf116371, "tdf116371.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xShape(getShape(1));
// Without the accompanying fix in place, this test would have failed with
@@ -1165,6 +1166,7 @@ DECLARE_RTFEXPORT_TEST(testTdf116371, "tdf116371.odt")
DECLARE_RTFEXPORT_TEST(testTdf128320, "tdf128320.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Shape does exist in RTF output
auto xShape(getShape(1));
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 9efd5aa9616e..f3325616f725 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -747,6 +747,7 @@ DECLARE_WW8EXPORT_TEST(testTscp, "tscp.doc")
DECLARE_WW8EXPORT_TEST(testFdo45724, "fdo45724.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// The text and background color of the control shape was not correct.
uno::Reference<drawing::XControlShape> xControlShape(getShape(1),
uno::UNO_QUERY);
@@ -865,6 +866,7 @@ DECLARE_WW8EXPORT_TEST(testCharacterBorder,
"charborder.odt")
DECLARE_WW8EXPORT_TEST(testTdf41542_imagePadding, "tdf41542_imagePadding.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// borderlessImage - image WITHOUT BORDERS : simulate padding with -crop
text::GraphicCrop crop = getProperty<text::GraphicCrop>(getShape(2),
"GraphicCrop");
@@ -949,6 +951,7 @@ DECLARE_WW8EXPORT_TEST(testCommentsNested,
"comments-nested.doc")
DECLARE_WW8EXPORT_TEST(testBorderColoursExport, "bordercolours.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// This is very close to testBorderColours in ww8import.cxx, but for export
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index bc4819c15ddb..de6c3354c5f7 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -433,6 +433,7 @@ DECLARE_WW8EXPORT_TEST(testTdf111480, "tdf111480.doc")
DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -444,6 +445,7 @@ DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
DECLARE_WW8EXPORT_TEST(testTdf70838b_verticalRotation,
"tdf70838b_verticalRotation.odt")
{
+ CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -458,6 +460,7 @@ DECLARE_WW8EXPORT_TEST(testTdf70838b_verticalRotation,
"tdf70838b_verticalRotati
DECLARE_WW8EXPORT_TEST( testActiveXCheckbox, "checkbox_control.odt" )
{
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// First check box anchored as a floating object
uno::Reference<drawing::XControlShape> xControlShape;
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 976819fc9a26..85801a003f0f 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -488,6 +488,7 @@ DECLARE_WW8EXPORT_TEST(testImageCommentAtChar,
"image-comment-at-char.doc")
DECLARE_WW8EXPORT_TEST(testTdf126708emf, "tdf126708_containsemf.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xShape = getShape(1);
// First check the size of the EMF graphic contained in the shape.
@@ -506,6 +507,7 @@ DECLARE_WW8EXPORT_TEST(testTdf126708emf,
"tdf126708_containsemf.odt")
DECLARE_WW8EXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
{
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
if (!mbExported)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
