sw/qa/extras/odfexport/odfexport.cxx | 71 --------------------
sw/qa/extras/ooxmlexport/ooxmlencryption.cxx | 4 -
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 89 --------------------------
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 78 ----------------------
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 18 -----
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 53 ---------------
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 34 ---------
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 84 ------------------------
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 42 ------------
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 77 ----------------------
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 76 ----------------------
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 59 -----------------
sw/qa/extras/ww8export/ww8export2.cxx | 40 -----------
sw/qa/extras/ww8export/ww8export3.cxx | 28 --------
14 files changed, 753 deletions(-)
New commits:
commit 9c5ffdbdd60385a3d4618f5e36034f550d9b15c9
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon May 11 19:25:16 2020 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon May 11 20:33:40 2020 +0200
CppUnittest: Revert all my previous commits asserting pages
The problem is that I assumed I could automatically assert
all tests where the number of pages is the same at import
and export time but I didn't consider the number of pages might
be already wrong at import time as it happens with a few docx files.
Reverting for now until I come with a better solution
Change-Id: Ieddcf7e5f33c99ad35d0c96a12893e0996415aa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94008
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index cabf37dd3e52..6614e1642efc 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -102,7 +102,6 @@ public:
DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<util::XModifiable> xModifiable(mxComponent, uno::UNO_QUERY);
CPPUNIT_ASSERT(!xModifiable->isModified());
// see preTest(), set the OLE cache to 1 for this test
@@ -209,7 +208,6 @@ static void testTdf43569_CheckIfFieldParse()
// instead of insertion of the pair of two field-marks:
<field:fieldmark-start> + <field:fieldmark-end>.
DECLARE_ODFEXPORT_TEST(testTdf43569, "tdf43569_conditionalfield.doc")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// check if our parser is valid
testTdf43569_CheckIfFieldParse();
@@ -224,7 +222,6 @@ DECLARE_ODFEXPORT_TEST(testTdf43569,
"tdf43569_conditionalfield.doc")
DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> const xShape(getShape(1));
// contour wrap polygon
@@ -260,7 +257,6 @@ DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
DECLARE_ODFEXPORT_TEST(testUserFieldDecl, "user-field-decl.odt")
{
- 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;
// Actual: 1', i.e. the in-table field had no declaration (in the
header), while the
@@ -270,7 +266,6 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDecl,
"user-field-decl.odt")
DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly, "user-field-decl-fly.odt")
{
- 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;
// Actual: 1', i.e. the in-textframe field had no declaration (in the
header), while the
@@ -280,7 +275,6 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly,
"user-field-decl-fly.odt")
DECLARE_ODFEXPORT_TEST(testFramebackgrounds, "framebackgrounds.odt")
{
- 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);
uno::Reference<container::XIndexAccess>
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -407,19 +401,16 @@ DECLARE_ODFEXPORT_TEST(testFramebackgrounds,
"framebackgrounds.odt")
DECLARE_SW_ROUNDTRIP_TEST(testSHA1Correct, "sha1_correct.odt",
"1012345678901234567890123456789012345678901234567890", Test)
{ // tdf#114939 this has both an affected password as well as content.xml
- CPPUNIT_ASSERT_EQUAL(1, getPages());
getParagraph(1, "012");
}
DECLARE_SW_ROUNDTRIP_TEST(testSHA1Wrong, "sha1_wrong.odt",
"1012345678901234567890123456789012345678901234567890", Test)
{ // tdf#114939 this has both an affected password as well as content.xml
- CPPUNIT_ASSERT_EQUAL(1, getPages());
getParagraph(1, "012");
}
DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded, "oooxml_embedded.sxw")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextEmbeddedObjectsSupplier>
xTEOSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XNameAccess>
xAccess(xTEOSupplier->getEmbeddedObjects());
uno::Sequence<OUString> aSeq(xAccess->getElementNames());
@@ -452,7 +443,6 @@ DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded,
"oooxml_embedded.sxw")
DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
//Note this is for a crash test
//Counting the Number of Frames and checking with the expected count
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -468,7 +458,6 @@ DECLARE_ODFEXPORT_TEST(testTdf131621, "tdf131621.ott")
DECLARE_ODFEXPORT_TEST(testFdo38244, "fdo38244.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// See ooxmlexport's testFdo38244().
// Test comment range feature.
@@ -495,7 +484,6 @@ DECLARE_ODFEXPORT_TEST(testFdo38244, "fdo38244.odt")
DECLARE_ODFEXPORT_TEST(testSenderInitials, "sender-initials.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test sender-initial properties (both annotation metadata and text field)
uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xFieldsAccess(xTextFieldsSupplier->getTextFields());
@@ -516,7 +504,6 @@ DECLARE_ODFEXPORT_TEST(testSenderInitials,
"sender-initials.fodt")
DECLARE_ODFEXPORT_TEST(testResolvedComment, "resolved-comment.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xFieldsAccess(xTextFieldsSupplier->getTextFields());
uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
@@ -528,7 +515,6 @@ DECLARE_ODFEXPORT_TEST(testResolvedComment,
"resolved-comment.odt")
DECLARE_ODFEXPORT_TEST(testTdf92379, "tdf92379.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// frame style fo:background-color was not imported
uno::Reference<container::XNameAccess> xStyles(getStyles("FrameStyles"));
uno::Reference<beans::XPropertySet> xStyle(xStyles->getByName("encarts"),
@@ -609,7 +595,6 @@ DECLARE_ODFEXPORT_TEST(testTdf92379, "tdf92379.fodt")
DECLARE_ODFEXPORT_TEST(testFdo79358, "fdo79358.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// the boolean properties of the index were not exported properly
uno::Reference<text::XDocumentIndexesSupplier> xIndexSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexes =
xIndexSupplier->getDocumentIndexes();
@@ -629,7 +614,6 @@ DECLARE_ODFEXPORT_TEST(testFdo79358, "fdo79358.odt")
DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter, "first-header-footer.odt")
{
- CPPUNIT_ASSERT_EQUAL(6, getPages());
// Test import and export of the header-first token.
// The document has 6 pages, two page styles for the first and second half
of pages.
@@ -649,7 +633,6 @@ DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter,
"first-header-footer.odt")
DECLARE_ODFEXPORT_TEST(testTextframeGradient, "textframe-gradient.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
@@ -671,7 +654,6 @@ DECLARE_ODFEXPORT_TEST(testTextframeGradient,
"textframe-gradient.odt")
DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark,
"CrossRefHeadingBookmark.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// the file contains invalid duplicate heading cross reference bookmarks
// but we have to round trip them, tdf#94804
@@ -699,7 +681,6 @@
DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark, "CrossRefHeadingBoo
DECLARE_ODFEXPORT_TEST(testFdo60769, "fdo60769.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test multi-paragraph comment range feature.
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
@@ -726,7 +707,6 @@ DECLARE_ODFEXPORT_TEST(testFdo60769, "fdo60769.odt")
DECLARE_ODFEXPORT_TEST(testFdo58949, "fdo58949.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
/*
* The problem was that the exporter didn't insert "Obj102" to the
* resulting zip file. No idea how to check for "broken" (missing OLE data
@@ -762,7 +742,6 @@ DECLARE_ODFEXPORT_TEST(testFdo58949, "fdo58949.docx")
DECLARE_ODFEXPORT_TEST(testStylePageNumber, "ooo321_stylepagenumber.odt")
{
- CPPUNIT_ASSERT_EQUAL(5, getPages());
uno::Reference<text::XTextContent> xTable1(getParagraphOrTable(1));
// actually no break attribute is written in this case
// CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE,
getProperty<style::BreakType>(xTable1, "BreakType"));
@@ -794,7 +773,6 @@ DECLARE_ODFEXPORT_TEST(testStylePageNumber,
"ooo321_stylepagenumber.odt")
DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Make sure paragraph and character attributes don't interfere
// First paragraph has a paragraph border and a character border included
by the paragraph style
@@ -950,7 +928,6 @@ DECLARE_ODFEXPORT_TEST(testCharacterBorder,
"charborder.odt")
DECLARE_ODFEXPORT_TEST(testProtectionKey, "protection-key.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
OUString const
password("1012345678901234567890123456789012345678901234567890");
// check 1 invalid OOo legacy password and 3 valid ODF 1.2 passwords
@@ -982,7 +959,6 @@ DECLARE_ODFEXPORT_TEST(testProtectionKey,
"protection-key.fodt")
DECLARE_ODFEXPORT_TEST(testTdf128188,
"footnote-collect-at-end-of-section.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
SwDoc *const pDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get())->GetDocShell()->GetDoc();
CPPUNIT_ASSERT(pDoc);
SwFootnoteIdxs const& rFootnotes(pDoc->GetFootnoteIdxs());
@@ -1006,7 +982,6 @@ DECLARE_ODFEXPORT_TEST(testTdf128188,
"footnote-collect-at-end-of-section.fodt")
DECLARE_ODFEXPORT_TEST(testFdo43807, "fdo43807.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xSet(getParagraph(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Drop
Caps"),getProperty<OUString>(xSet,"DropCapCharStyleName"));
@@ -1016,7 +991,6 @@ DECLARE_ODFEXPORT_TEST(testFdo43807, "fdo43807.odt")
DECLARE_ODFEXPORT_TEST(testTdf103091, "tdf103091.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// check that all conditional paragraph style conditions are imported
uno::Reference<container::XNameAccess>
xParaStyles(getStyles("ParagraphStyles"));
uno::Reference<beans::XPropertySet> xStyle1(xParaStyles->getByName(
@@ -1084,7 +1058,6 @@ DECLARE_ODFEXPORT_TEST(testTdf103091, "tdf103091.fodt")
DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow,
"textframe-transparent-shadow.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xPicture = getShape(1);
// ODF stores opacity of 75%, that means 25% transparency.
CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getProperty<sal_Int32>(xPicture,
"ShadowTransparence"));
@@ -1092,7 +1065,6 @@ DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow,
"textframe-transparent-sh
DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
{
- 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.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty<sal_Int16>(xTextFrame, "RelativeHeightRelation"));
@@ -1105,7 +1077,6 @@ DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
DECLARE_ODFEXPORT_TEST(testRelhPageTdf80282, "relh-page-tdf80282.odt")
{
- 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());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Width", sal_Int32(5953),
parseDump("//anchored/fly/infos/bounds", "width").toInt32());
@@ -1113,7 +1084,6 @@ DECLARE_ODFEXPORT_TEST(testRelhPageTdf80282,
"relh-page-tdf80282.odt")
DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
{
- 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.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty<sal_Int16>(xTextFrame, "RelativeWidthRelation"));
@@ -1126,7 +1096,6 @@ DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, "textframe-vertadjust.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test import/export of new frame attribute called TextVerticalAdjust
// 1st frame's context is adjusted to the top
@@ -1142,14 +1111,12 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust,
"textframe-vertadjust.odt")
DECLARE_ODFEXPORT_TEST(testTdf111891_frameVertStyle,
"tdf111891_frameVertStyle.odt")
{
- 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"));
}
DECLARE_ODFEXPORT_TEST(testShapeRelsize, "shape-relsize.odt")
{
- 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.
CPPUNIT_ASSERT_EQUAL(sal_Int16(40), getProperty<sal_Int16>(xShape,
"RelativeWidth"));
@@ -1163,7 +1130,6 @@ DECLARE_ODFEXPORT_TEST(testShapeRelsize,
"shape-relsize.odt")
DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners,
"textbox-rounded-corners.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
comphelper::SequenceAsHashMap aCustomShapeGeometry(getProperty<
uno::Sequence<beans::PropertyValue> >(xShape, "CustomShapeGeometry"));
@@ -1185,7 +1151,6 @@ 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(1, getPages());
uno::Reference<container::XEnumerationAccess> xPara;
uno::Reference<container::XEnumeration> xPortions;
uno::Reference<text::XTextRange> xPortion;
@@ -1508,7 +1473,6 @@ DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
DECLARE_ODFEXPORT_TEST(testBtlrCell, "btlr-cell.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the accompanying fix in place, this test would have failed, as
// the btlr text direction in the A1 cell was lost on ODF import and
// export.
@@ -1528,7 +1492,6 @@ DECLARE_ODFEXPORT_TEST(testBtlrCell, "btlr-cell.odt")
DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
{
- 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
// export.
@@ -1583,7 +1546,6 @@ DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Export of this document failed with beans::UnknownPropertyException.
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -1639,12 +1601,10 @@ DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
DECLARE_ODFEXPORT_TEST(testGerrit13858, "gerrit13858.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Just make sure the output is valid.
}
DECLARE_ODFEXPORT_TEST(testOdtBorderTypes, "border_types.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
static const sal_Int32 lineStyles[] = { 0, 1, 2, 14, 16, 17, 3, 15 };
uno::Reference<text::XTextDocument> textDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(textDocument->getText(), uno::UNO_QUERY);
@@ -1679,7 +1639,6 @@ DECLARE_ODFEXPORT_TEST(testOdtBorderTypes,
"border_types.odt")
DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr, "userdefattr-tablecell.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1),
uno::UNO_QUERY);
uno::Reference<table::XCell> const xCellA1(xTable->getCellByName("A1"),
uno::UNO_SET_THROW);
uno::Reference<table::XCell> const xCellB1(xTable->getCellByName("B1"),
uno::UNO_SET_THROW);
@@ -1692,7 +1651,6 @@ DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr,
"userdefattr-tablecell.odt")
#if HAVE_FEATURE_PDFIUM
DECLARE_ODFEXPORT_TEST(testEmbeddedPdf, "embedded-pdf.odt")
{
- 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.
auto xReplacementGraphic =
getProperty<uno::Reference<graphic::XGraphic>>(xShape, "ReplacementGraphic");
@@ -1726,7 +1684,6 @@ DECLARE_ODFEXPORT_TEST(testEmbeddedPdf,
"embedded-pdf.odt")
DECLARE_ODFEXPORT_TEST(testTableStyles1, "table_styles_1.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Table styles basic graphic test.
// Doesn't cover all attributes.
uno::Reference<style::XStyleFamiliesSupplier>
XFamiliesSupplier(mxComponent, uno::UNO_QUERY);
@@ -1767,7 +1724,6 @@ DECLARE_ODFEXPORT_TEST(testTableStyles1,
"table_styles_1.odt")
DECLARE_ODFEXPORT_TEST(testTableStyles2, "table_styles_2.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Table styles paragraph and char tests
// Doesn't cover all attributes.
// Problem: underline for table autoformat doesn't work.
@@ -1975,7 +1931,6 @@ DECLARE_ODFEXPORT_TEST(testTableStyles2,
"table_styles_2.odt")
DECLARE_ODFEXPORT_TEST(testTableStyles3, "table_styles_3.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This test checks if default valued attributes aren't exported.
xmlDocUniquePtr pXmlDoc = parseExport("styles.xml");
if (!pXmlDoc)
@@ -2050,7 +2005,6 @@ DECLARE_ODFIMPORT_TEST(testTableStyles4,
"table_styles_4.odt")
DECLARE_ODFEXPORT_TEST(testTableStyles5, "table_styles_5.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test if cell styles doesn't have a style:parent-style-name attribute.
xmlDocUniquePtr pXmlDoc = parseExport("styles.xml");
if (!pXmlDoc)
@@ -2077,7 +2031,6 @@ DECLARE_ODFEXPORT_TEST(testTableStyles5,
"table_styles_5.odt")
DECLARE_ODFEXPORT_TEST(testTdf101710, "tdf101710.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test that number format of cell styles can be imported and exported.
uno::Reference<beans::XPropertySet>
xStyle(getStyles("CellStyles")->getByName("Test Style.11"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_uInt32(10104), getProperty<sal_uInt32>(xStyle,
"NumberFormat"));
@@ -2085,7 +2038,6 @@ DECLARE_ODFEXPORT_TEST(testTdf101710, "tdf101710.odt")
DECLARE_ODFEXPORT_TEST(testTdf129568, "tdf129568.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test that export doesn't fail, and that style is imported and in use.
uno::Reference<style::XStyle>
xStyle(getStyles("CellStyles")->getByName("Default Style.1"), uno::UNO_QUERY);
CPPUNIT_ASSERT(xStyle->isInUse());
@@ -2094,7 +2046,6 @@ DECLARE_ODFEXPORT_TEST(testTdf129568, "tdf129568.fodt")
DECLARE_ODFEXPORT_TEST(testTdf129568ui, "tdf129568-ui.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Same as above, but styles referenced by UI name.
uno::Reference<style::XStyle>
xStyle(getStyles("CellStyles")->getByName("Default Style.1"), uno::UNO_QUERY);
CPPUNIT_ASSERT(xStyle->isInUse());
@@ -2103,7 +2054,6 @@ DECLARE_ODFEXPORT_TEST(testTdf129568ui,
"tdf129568-ui.fodt")
DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Test that the loext:mimetype attribute is written for exported images,
tdf#109202
if (xmlDocUniquePtr pXmlDoc = parseExport("content.xml"))
{
@@ -2114,7 +2064,6 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype,
"image-mimetype.odt")
DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
#if !defined(MACOSX)
// Test that font style/weight of embedded fonts is exposed.
// Test file is a normal ODT, except EmbedFonts is set to true in
settings.xml.
@@ -2135,7 +2084,6 @@ DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps,
"embedded-font-props.odt")
DECLARE_ODFEXPORT_TEST(testTdf100492, "tdf100492.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT(xShape.is());
@@ -2167,7 +2115,6 @@ DECLARE_ODFEXPORT_TEST(testTdf100492, "tdf100492.odt")
DECLARE_ODFEXPORT_TEST(testTdf77961, "tdf77961.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XNameAccess> xStyles(getStyles("PageStyles"));
uno::Reference<beans::XPropertySet> xStyle(xStyles->getByName("Standard"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL( false , getProperty<bool>(xStyle, "GridDisplay"));
@@ -2176,7 +2123,6 @@ DECLARE_ODFEXPORT_TEST(testTdf77961, "tdf77961.odt")
DECLARE_ODFEXPORT_TEST(testReferenceLanguage, "referencelanguage.odt")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
// Test loext:reference-language attribute of reference fields
// (used from LibreOffice 6.1, and proposed for next ODF)
const char* aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek",
@@ -2210,7 +2156,6 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage,
"referencelanguage.odt")
DECLARE_ODFEXPORT_TEST(testRubyPosition, "ruby-position.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
if (xmlDocUniquePtr pXmlDoc = parseExport("content.xml"))
{
assertXPath(pXmlDoc,
"//style:style[@style:family='ruby']/style:ruby-properties[@loext:ruby-position='inter-character']",
1);
@@ -2220,7 +2165,6 @@ DECLARE_ODFEXPORT_TEST(testRubyPosition,
"ruby-position.odt")
DECLARE_ODFEXPORT_TEST(testAllowOverlap, "allow-overlap.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Without the accompanying fix in place, this test would have failed with:
// - Expression: !getProperty<bool>(xShape, "AllowOverlap")
@@ -2232,7 +2176,6 @@ DECLARE_ODFEXPORT_TEST(testAllowOverlap,
"allow-overlap.odt")
DECLARE_ODFEXPORT_TEST(testSignatureLineProperties,
"signatureline-properties.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT(xShape.is());
@@ -2259,7 +2202,6 @@ DECLARE_ODFEXPORT_TEST(testSignatureLineProperties,
"signatureline-properties.fo
DECLARE_ODFEXPORT_TEST(testQrCodeGenProperties, "qrcode-properties.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT(xShape.is());
@@ -2275,7 +2217,6 @@ DECLARE_ODFEXPORT_TEST(testQrCodeGenProperties,
"qrcode-properties.odt")
DECLARE_ODFEXPORT_TEST(testChapterNumberingNewLine,
"chapter-number-new-line.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XChapterNumberingSupplier>
xNumberingSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xNumberingRules =
xNumberingSupplier->getChapterNumberingRules();
comphelper::SequenceAsHashMap hashMap(xNumberingRules->getByIndex(0));
@@ -2287,7 +2228,6 @@ DECLARE_ODFEXPORT_TEST(testChapterNumberingNewLine,
"chapter-number-new-line.odt
DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes,
"spellout-numberingtypes.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// ordinal indicator, ordinal and cardinal number numbering styles (from
LibreOffice 6.1)
static const char* const aFieldTexts[] = { "1st", "Erste", "Eins", "1.",
"Premier", "Un", "1ᵉʳ", "First", "One" };
// fallback for old platforms without std::codecvt and std::regex supports
@@ -2315,7 +2255,6 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes,
"spellout-numberingtypes.odt"
// MAILMERGE Add conditional to expand / collapse bookmarks
DECLARE_ODFEXPORT_TEST(tdf101856_overlapped, "tdf101856_overlapped.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// get bookmark interface
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
@@ -2340,7 +2279,6 @@ DECLARE_ODFEXPORT_TEST(tdf101856_overlapped,
"tdf101856_overlapped.odt")
// MAILMERGE Add conditional to expand / collapse bookmarks
DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// get bookmark interface
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
@@ -2386,7 +2324,6 @@ DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Make sure the replacement graphic is still there
// (was gone because the original graphic was not recognized during load)
@@ -2397,7 +2334,6 @@ DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// check import of VisualArea settings of the embedded XLSX OLE objects
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/settings.xml");
if (!pXmlDoc)
@@ -2414,7 +2350,6 @@ DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
DECLARE_ODFEXPORT_TEST(tdf128504, "tdf128504.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextRange> xPara = getParagraph(6);
uno::Reference<beans::XPropertySet> xRun(getRun(xPara,1), uno::UNO_QUERY);
OUString unVisitedStyleName = getProperty<OUString>(xRun,
"UnvisitedCharStyleName");
@@ -2425,7 +2360,6 @@ DECLARE_ODFEXPORT_TEST(tdf128504, "tdf128504.docx")
DECLARE_ODFEXPORT_TEST(tdf121658, "tdf121658.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XNameAccess>
xParaStyles(getStyles("ParagraphStyles"));
uno::Reference<beans::XPropertySet> xStyle1(xParaStyles->getByName(
"Standard"), uno::UNO_QUERY);
@@ -2434,7 +2368,6 @@ DECLARE_ODFEXPORT_TEST(tdf121658, "tdf121658.odt")
DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xNumberingRules
=
getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(1),
"NumberingRules");
comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
@@ -2448,7 +2381,6 @@ DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering,
"arabic-zero-numbering.odt")
DECLARE_ODFEXPORT_TEST(testArabicZero3Numbering, "arabic-zero3-numbering.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xNumberingRules
=
getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(1),
"NumberingRules");
comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
@@ -2462,7 +2394,6 @@ DECLARE_ODFEXPORT_TEST(testArabicZero3Numbering,
"arabic-zero3-numbering.odt")
DECLARE_ODFEXPORT_TEST(testArabicZero4Numbering, "arabic-zero4-numbering.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xNumberingRules
=
getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(1),
"NumberingRules");
comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
@@ -2476,7 +2407,6 @@ DECLARE_ODFEXPORT_TEST(testArabicZero4Numbering,
"arabic-zero4-numbering.odt")
DECLARE_ODFEXPORT_TEST(testArabicZero5Numbering, "arabic-zero5-numbering.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xNumberingRules
=
getProperty<uno::Reference<container::XIndexAccess>>(getParagraph(1),
"NumberingRules");
comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
@@ -2490,7 +2420,6 @@ DECLARE_ODFEXPORT_TEST(testArabicZero5Numbering,
"arabic-zero5-numbering.odt")
DECLARE_ODFEXPORT_TEST(testPageContentBottom, "page-content-bottom.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
sal_Int16 nExpected = text::RelOrientation::PAGE_PRINT_AREA_BOTTOM;
CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int16>(xShape,
"VertOrientRelation"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx
b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx
index 34bd0bc10773..c0d6d2ba95b3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx
@@ -23,7 +23,6 @@ protected:
DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2007, "Encrypted_MSO2007_abc.docx",
"abc", Test)
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Standard encryption format, AES 128, SHA1
uno::Reference<text::XTextRange> xParagraph(getParagraph(1));
CPPUNIT_ASSERT_EQUAL(OUString("abc"), xParagraph->getString());
@@ -31,7 +30,6 @@ DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2007,
"Encrypted_MSO2007_abc.docx", "ab
DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2010, "Encrypted_MSO2010_abc.docx",
"abc", Test)
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Agile encryption format, AES 128, CBC, SHA1
uno::Reference<text::XTextRange> xParagraph(getParagraph(1));
CPPUNIT_ASSERT_EQUAL(OUString("abc"), xParagraph->getString());
@@ -39,7 +37,6 @@ DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2010,
"Encrypted_MSO2010_abc.docx", "ab
DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2013, "Encrypted_MSO2013_abc.docx",
"abc", Test)
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Agile encryption format, AES 256, CBC, SHA512
uno::Reference<text::XTextRange> xParagraph(getParagraph(1));
CPPUNIT_ASSERT_EQUAL(OUString("ABC"), xParagraph->getString());
@@ -47,7 +44,6 @@ DECLARE_SW_ROUNDTRIP_TEST(testPasswordMSO2013,
"Encrypted_MSO2013_abc.docx", "ab
DECLARE_SW_ROUNDTRIP_TEST(testPasswordLOStandard,
"Encrypted_LO_Standard_abc.docx", "abc", Test)
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Standard encryption format, AES 128, SHA1
uno::Reference<text::XTextRange> xParagraph(getParagraph(1));
CPPUNIT_ASSERT_EQUAL(OUString("ABC"), xParagraph->getString());
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index dbd1ef17f3b3..4ba57fabc25f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -102,7 +102,6 @@ protected:
DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDraws =
xDrawPageSupplier->getDrawPage();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount()); // One groupshape
in the doc
@@ -127,7 +126,6 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo69548, "fdo69548.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
if (!mbExported)
return;
@@ -137,7 +135,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69548, "fdo69548.docx")
DECLARE_OOXMLEXPORT_TEST(testWpsOnly, "wps-only.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Document has wp:anchor, not wp:inline, so handle it accordingly.
uno::Reference<drawing::XShape> xShape = getShape(1);
text::TextContentAnchorType eValue =
getProperty<text::TextContentAnchorType>(xShape, "AnchorType");
@@ -161,7 +158,6 @@ DECLARE_OOXMLEXPORT_TEST(testWpsOnly, "wps-only.docx")
DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Check position, it was nearly 0. This is a shape, so use getPosition(),
not a property.
CPPUNIT_ASSERT_EQUAL(oox::drawingml::convertEmuToHmm(548005),
xShape->getPosition().X);
@@ -169,7 +165,6 @@ DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx")
DECLARE_OOXMLEXPORT_TEST(testWpgNested, "wpg-nested.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY);
uno::Reference<drawing::XShapeDescriptor>
xShapeDescriptor(xGroup->getByIndex(0), uno::UNO_QUERY);
// This was a com.sun.star.drawing.CustomShape, due to lack of handling of
groupshapes inside groupshapes.
@@ -192,7 +187,6 @@ DECLARE_OOXMLEXPORT_TEST(testWpgNested, "wpg-nested.docx")
DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// The relativeFrom attribute was ignored for groupshapes, i.e. these were
text::RelOrientation::FRAME.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getProperty<sal_Int16>(xShape, "HoriOrientRelation"));
@@ -212,7 +206,6 @@ DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly,
"textbox-wpg-only.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript,
"tdf120412_400PercentSubscript.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextRange> xPara = getParagraph(1);
// The word "Base" should not be subscripted.
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty<float>(getRun(xPara, 1,
"Base"), "CharEscapement"), 0);
@@ -222,7 +215,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript,
"tdf120412_400Percen
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFontEsc, "test_tdf120412.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc =parseExport("word/document.xml");
// don't lose the run with superscript formatting
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 2);
@@ -234,7 +226,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFontEsc,
"test_tdf120412.docx")
DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Make sure that we read the primary branch, if wpg is requested as a
feature.
uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
uno::Reference<text::XText> xText =
uno::Reference<text::XTextRange>(xGroup->getByIndex(0),
uno::UNO_QUERY_THROW)->getText();
@@ -244,7 +235,6 @@ DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")
DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Vertical position of the shape was incorrect due to incorrect nested
mce handling.
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
// positionV's posOffset from the bugdoc, was 0.
@@ -268,7 +258,6 @@ DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
DECLARE_OOXMLEXPORT_TEST(testMissingPath, "missing-path.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
comphelper::SequenceAsHashMap
aCustomShapeGeometry(getProperty<beans::PropertyValues>(getShape(1),
"CustomShapeGeometry"));
comphelper::SequenceAsHashMap
aPath(aCustomShapeGeometry["Path"].get<beans::PropertyValues>());
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates =
aPath["Coordinates"].get<
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> >();
@@ -278,7 +267,6 @@ DECLARE_OOXMLEXPORT_TEST(testMissingPath,
"missing-path.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo70457, "fdo70457.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The document contains a rotated bitmap
// It must be imported as a XShape object with the proper rotation value
@@ -293,14 +281,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70457, "fdo70457.docx")
DECLARE_OOXMLEXPORT_TEST(testLOCrash,"file_crash.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
//The problem was libreoffice crash while opening the file.
getParagraph(1,"Contents");
}
DECLARE_OOXMLEXPORT_TEST(testFdo72560, "fdo72560.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was libreoffice confuse when there RTL default style for
paragraph
uno::Reference<uno::XInterface> xParaLeftRTL(getParagraph( 1, "RTL LEFT"));
uno::Reference<uno::XInterface> xParaRightLTR(getParagraph( 2, "LTR
RIGHT"));
@@ -315,7 +301,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560, "fdo72560.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo72560b, "fdo72560b.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was libreoffice confuse when RTL was specified in
non-default style
uno::Reference<uno::XInterface> xParaEndRTL(getParagraph( 2, "RTL END"));
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getProperty<sal_Int16>(
xParaEndRTL, "WritingMode" ));
@@ -324,7 +309,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560b, "fdo72560b.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo72560c, "fdo72560c.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was libreoffice confuse when RTL was specified in
DocDefaults
uno::Reference<uno::XInterface> xParaEndRTL(getParagraph( 2, "RTL END"));
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getProperty<sal_Int16>(
xParaEndRTL, "WritingMode" ));
@@ -333,7 +317,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560c, "fdo72560c.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo72560d, "fdo72560d.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was libreoffice confuse when RTL was specified in "Normal"
when not using Normal at all
CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_RIGHT),
getProperty< sal_Int32 >( getParagraph(1), "ParaAdjust" ));
CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_RIGHT),
getProperty< sal_Int32 >( getParagraph(2), "ParaAdjust" ));
@@ -341,7 +324,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560d, "fdo72560d.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo72560e, "fdo72560e.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was libreoffice confuse when *locale* is RTL, but w:bidi /
w:jc are never defined.
// This unit test would only be noticed if the testing environment is set
to something like an Arabic locale.
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getProperty<sal_Int16>(
getParagraph(2), "WritingMode" ));
@@ -353,7 +335,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560e, "fdo72560e.docx")
DECLARE_OOXMLEXPORT_TEST(testRPrChangeClosed, "rprchange_closed.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Redline defined by rPrChanged wasn't removed.
// First paragraph has an rPrChange element, make sure it doesn't appear
in the second paragraph.
CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 1),
"RedlineType"));
@@ -361,7 +342,6 @@ DECLARE_OOXMLEXPORT_TEST(testRPrChangeClosed,
"rprchange_closed.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo65090, "fdo65090.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -372,7 +352,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo65090, "fdo65090.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
{
- CPPUNIT_ASSERT_EQUAL(15, getPages());
// The DOCX containing the Table of Contents was not imported with correct
page nos
uno::Reference<text::XDocumentIndexesSupplier> xIndexSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexes =
xIndexSupplier->getDocumentIndexes( );
@@ -391,7 +370,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo73389,"fdo73389.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The width of the inner table was too large. The first fix still
converted
// the "auto" table width to a fixed one. The second fix used variable
width.
// The recent fix uses fixed width again, according to the fixed width
cells.
@@ -403,7 +381,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo73389,"fdo73389.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Table with "auto" table width and incomplete grid: 11 columns, but only
4 gridCol elements.
xmlDocUniquePtr pXmlDoc = parseExport();
@@ -418,7 +395,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274,
"tdf59274.docx")
DECLARE_OOXMLEXPORT_TEST(testDMLGroupshapeSdt, "dml-groupshape-sdt.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShapes> xGroupShape(getShape(1), uno::UNO_QUERY);
// The text in the groupshape was missing due to the w:sdt and
w:sdtContent wrapper around it.
CPPUNIT_ASSERT_EQUAL(OUString("sdt and sdtContent inside groupshape"),
uno::Reference<text::XTextRange>(xGroupShape->getByIndex(1),
uno::UNO_QUERY_THROW)->getString());
@@ -426,7 +402,6 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupshapeSdt,
"dml-groupshape-sdt.docx")
DECLARE_OOXMLEXPORT_TEST(testDmlCharheightDefault,
"dml-charheight-default.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
uno::Reference<text::XTextRange> xShape(xGroup->getByIndex(0),
uno::UNO_QUERY);
// This was 16: the first run of the second para incorrectly inherited the
char height of the first para.
@@ -435,7 +410,6 @@ DECLARE_OOXMLEXPORT_TEST(testDmlCharheightDefault,
"dml-charheight-default.docx"
DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeCapitalization,
"dml-groupshape-capitalization.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Capitalization inside a group shape was not imported
uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
uno::Reference<text::XText> xText =
uno::Reference<text::XTextRange>(xGroup->getByIndex(1),
uno::UNO_QUERY_THROW)->getText();
@@ -451,7 +425,6 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeCapitalization,
"dml-groupshape-capita
DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor,
"picture-with-schemecolor.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// At the start of the document, a picture which has a color specified
with a color scheme, lost
// it's color during import.
uno::Reference<beans::XPropertySet> xImage(getShape(1), uno::UNO_QUERY);
@@ -468,7 +441,6 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor,
"picture-with-schemecolor.d
DECLARE_OOXMLEXPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8153),
getProperty<sal_Int32>(xTables->getByIndex(0), "Width"));
@@ -476,7 +448,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69656,
"Table_cell_auto_width_fdo69656.docx")
DECLARE_OOXMLEXPORT_TEST(testFloatingTablesAnchor,
"floating-tables-anchor.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Problem was one of the two text frames was anchored to the other text
frame
// Both frames should be anchored to the paragraph with the text "Anchor
point"
uno::Reference<text::XTextContent> xTextContent(getShape(1),
uno::UNO_QUERY);
@@ -492,7 +463,6 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTablesAnchor,
"floating-tables-anchor.docx"
DECLARE_OOXMLEXPORT_TEST(testAnnotationFormatting,
"annotation-formatting.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xTextField = getProperty<
uno::Reference<beans::XPropertySet> >(getRun(getParagraph(2), 2), "TextField");
uno::Reference<text::XText> xText = getProperty<
uno::Reference<text::XText> >(xTextField, "TextRange");
// Make sure we test the right annotation.
@@ -503,7 +473,6 @@ DECLARE_OOXMLEXPORT_TEST(testAnnotationFormatting,
"annotation-formatting.docx")
DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeRunFonts,
"dml-groupshape-runfonts.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Fonts defined by w:rFonts was not imported and so the font specified by
a:fontRef was used.
uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
uno::Reference<text::XText> xText =
uno::Reference<text::XTextRange>(xGroup->getByIndex(1),
uno::UNO_QUERY_THROW)->getText();
@@ -515,7 +484,6 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeRunFonts,
"dml-groupshape-runfonts.doc
DECLARE_OOXMLEXPORT_TEST(testStrict, "strict.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
uno::Reference<beans::XPropertySet>
xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
// This was only 127, pt suffix was ignored, so this got parsed as twips
instead of points.
CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(72 * 20)),
getProperty<sal_Int32>(xPageStyle, "BottomMargin"));
@@ -547,7 +515,6 @@ DECLARE_OOXMLEXPORT_TEST(testStrict, "strict.docx")
DECLARE_OOXMLEXPORT_TEST(testSmartartStrict, "strict-smartart.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
// This was 0, SmartArt was visually missing.
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), xGroup->getCount()); // background, 3
ellipses + 3 arrows
@@ -555,7 +522,6 @@ DECLARE_OOXMLEXPORT_TEST(testSmartartStrict,
"strict-smartart.docx")
DECLARE_OOXMLEXPORT_TEST(testLibreOfficeHang, "frame-wrap-auto.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// fdo#72775
// This was text::WrapTextMode_NONE.
CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_DYNAMIC,
getProperty<text::WrapTextMode>(getShape(1), "Surround"));
@@ -569,7 +535,6 @@ DECLARE_OOXMLEXPORT_TEST(testI124106, "i124106.docx")
DECLARE_OOXMLEXPORT_TEST(testLargeTwips, "large-twips.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// cp#1000043: MSO seems to ignore large twips values, we didn't, which
resulted in different
// layout of broken documents (text not visible in this specific document).
OUString width = parseDump(
"/root/page/body/tab/row[1]/cell[1]/txt/infos/bounds", "width" );
@@ -578,7 +543,6 @@ DECLARE_OOXMLEXPORT_TEST(testLargeTwips, "large-twips.docx"
)
DECLARE_OOXMLEXPORT_TEST(testNegativeCellMarginTwips,
"negative-cell-margin-twips.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Slightly related to cp#1000043, the twips value was negative, which
wrapped around somewhere,
// while MSO seems to ignore that as well.
OUString width = parseDump(
"/root/page/body/tab/row[1]/cell[1]/txt/infos/bounds", "width" );
@@ -602,7 +566,6 @@ DECLARE_OOXMLIMPORT_TEST(testFdo38414, "fdo38414.docx" )
DECLARE_OOXMLEXPORT_TEST(test_extra_image, "test_extra_image.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// fdo#74652 Check there is no shape added to the doc during import
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDraws =
xDrawPageSupplier->getDrawPage();
@@ -611,7 +574,6 @@ DECLARE_OOXMLEXPORT_TEST(test_extra_image,
"test_extra_image.docx" )
DECLARE_OOXMLEXPORT_TEST(testFdo74401, "fdo74401.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShapes> xGroupShape(getShape(1), uno::UNO_QUERY);
uno::Reference<drawing::XShapeDescriptor>
xShape(xGroupShape->getByIndex(1), uno::UNO_QUERY);
// The triangle (second child) was a TextShape before, so it was shown as
a rectangle.
@@ -628,7 +590,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo74401, "fdo74401.docx")
DECLARE_OOXMLEXPORT_TEST(testGridBefore, "gridbefore.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// w:gridBefore is faked by inserting two cells without border (because
Writer can't do non-rectangular tables).
// So check the first cell in the first row is in fact 3rd and that it's
more to the right than the second
// cell on the second row.
@@ -646,7 +607,6 @@ DECLARE_OOXMLEXPORT_TEST(testGridBefore, "gridbefore.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf116194, "tdf116194.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The problem was that the importer lost consecutive tables with
w:gridBefore
xmlDocUniquePtr pXmlDoc = parseExport();
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl", 2);
@@ -654,7 +614,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf116194,
"tdf116194.docx")
DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast,
"msobrightnesscontrast.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> image = getShape(1);
uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY);
uno::Reference<graphic::XGraphic> graphic;
@@ -669,7 +628,6 @@ DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast,
"msobrightnesscontrast.docx"
DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// When chart was in a TextFrame, its size was too large.
uno::Reference<text::XTextEmbeddedObjectsSupplier>
xTextEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xEmbeddedObjects(xTextEmbeddedObjectsSupplier->getEmbeddedObjects(),
uno::UNO_QUERY);
@@ -683,7 +641,6 @@ DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx")
DECLARE_OOXMLEXPORT_TEST(testInlineGroupshape, "inline-groupshape.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Inline groupshape was in the background, so it was hidden sometimes by
other shapes.
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Opaque"));
}
@@ -706,7 +663,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo79535, "fdo79535.docx")
DECLARE_OOXMLEXPORT_TEST(testBnc875718, "bnc875718.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The frame in the footer must not accidentally end up in the document
body.
// The easiest way for this to test I've found is checking that
// xray ThisComponent.TextFrames.GetByIndex( index
).Anchor.Text.ImplementationName
@@ -730,7 +686,6 @@ DECLARE_OOXMLEXPORT_TEST(testBnc875718, "bnc875718.docx")
DECLARE_OOXMLEXPORT_TEST(testCaption, "caption.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet>
xStyle(getStyles("ParagraphStyles")->getByName("Caption"), uno::UNO_QUERY);
// This was awt::FontSlant_ITALIC: Writer default was used instead of what
is in the document.
CPPUNIT_ASSERT_EQUAL(awt::FontSlant_NONE,
getProperty<awt::FontSlant>(xStyle, "CharPosture"));
@@ -738,7 +693,6 @@ DECLARE_OOXMLEXPORT_TEST(testCaption, "caption.docx")
DECLARE_OOXMLEXPORT_TEST(testGroupshapeTrackedchanges,
"groupshape-trackedchanges.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY);
uno::Reference<text::XTextRange> xShape(xGroup->getByIndex(0),
uno::UNO_QUERY);
// Shape text was completely missing, ensure inserted text is available.
@@ -747,7 +701,6 @@ DECLARE_OOXMLEXPORT_TEST(testGroupshapeTrackedchanges,
"groupshape-trackedchange
DECLARE_OOXMLEXPORT_TEST(testFdo78939, "fdo78939.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// fdo#78939 : LO hanged while opening issue document
// Whenever a para-style was applied to a Numbering format level,
@@ -760,7 +713,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78939, "fdo78939.docx")
DECLARE_OOXMLEXPORT_TEST(testFootnote, "footnote.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xFootnotes =
xFootnotesSupplier->getFootnotes();
uno::Reference<text::XTextRange> xFootnote(xFootnotes->getByIndex(0),
uno::UNO_QUERY);
@@ -771,7 +723,6 @@ DECLARE_OOXMLEXPORT_TEST(testFootnote, "footnote.docx")
DECLARE_OOXMLEXPORT_TEST(testTableBtlrCenter, "table-btlr-center.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Note that this is btLr text, so layout and doc model
horizontal/vertical is the opposite of
// each other.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -789,7 +740,6 @@ DECLARE_OOXMLEXPORT_TEST(testTableBtlrCenter,
"table-btlr-center.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo80555, "fdo80555.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xShape = getShape(1);
// Shape was wrongly placed at X=0, Y=0
CPPUNIT_ASSERT_EQUAL(sal_Int32(3318), xShape->getPosition().X);
@@ -798,7 +748,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80555, "fdo80555.docx")
DECLARE_OOXMLEXPORT_TEST(testHidemark, "hidemark.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Problem was that <w:hideMark> cell property was ignored.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
@@ -815,7 +764,6 @@ DECLARE_OOXMLEXPORT_TEST(testHidemark, "hidemark.docx")
DECLARE_OOXMLEXPORT_TEST(testHidemarkb, "tdf99616_hidemarkb.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Problem was that the smallest possible height was forced, not the min
specified size.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
@@ -829,7 +777,6 @@ DECLARE_OOXMLEXPORT_TEST(testHidemarkb,
"tdf99616_hidemarkb.docx")
DECLARE_OOXMLEXPORT_TEST(testBnc891663, "bnc891663.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The image should be inside a cell, so the text in the following cell
should be below it.
int imageTop =
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
"top").toInt32();
int imageHeight =
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
"height").toInt32();
@@ -839,7 +786,6 @@ DECLARE_OOXMLEXPORT_TEST(testBnc891663, "bnc891663.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf123104, "tdf123104.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -852,7 +798,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123104, "tdf123104.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3),
xBookmarksByIdx->getCount());
@@ -882,7 +827,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf65955, "tdf65955.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2),
xBookmarksByIdx->getCount());
@@ -901,7 +845,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf65955, "tdf65955.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf65955_2, "tdf65955_2.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1),
xBookmarksByIdx->getCount());
@@ -915,7 +858,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf65955_2, "tdf65955_2.odt")
DECLARE_OOXMLEXPORT_TEST(testChtOutlineNumberingOoxml, "chtoutline.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
const sal_Unicode aExpectedNumbering[] = { 0x7b2c, ' ', '1', ' ', 0x7ae0 };
uno::Reference<beans::XPropertySet> xPara(getParagraph(1), uno::UNO_QUERY);
@@ -925,7 +867,6 @@ DECLARE_OOXMLEXPORT_TEST(testChtOutlineNumberingOoxml,
"chtoutline.docx")
DECLARE_OOXMLEXPORT_TEST(mathtype, "mathtype.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextEmbeddedObjectsSupplier>
xTextEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xEmbeddedObjects(xTextEmbeddedObjectsSupplier->getEmbeddedObjects(),
uno::UNO_QUERY);
// This failed as the Model property was empty.
@@ -935,7 +876,6 @@ DECLARE_OOXMLEXPORT_TEST(mathtype, "mathtype.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf8255, "tdf8255.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xTextDocument, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -945,7 +885,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf8255, "tdf8255.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf87460, "tdf87460.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XEndnotesSupplier> xEndnotesSupplier(xTextDocument,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xEndnotes =
xEndnotesSupplier->getEndnotes();
@@ -955,7 +894,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87460, "tdf87460.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf90611, "tdf90611.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xFootnotes =
xFootnotesSupplier->getFootnotes();
uno::Reference<text::XText> xFootnoteText;
@@ -966,7 +904,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90611, "tdf90611.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf89702, "tdf89702.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Get the first paragraph's numbering style's 2nd level's character style
name.
uno::Reference<text::XTextRange> xParagraph = getParagraph(1);
auto xLevels = getProperty< uno::Reference<container::XIndexAccess>
>(xParagraph, "NumberingRules");
@@ -981,7 +918,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89702, "tdf89702.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf86374, "tdf86374.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -992,7 +928,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf86374, "tdf86374.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf87924, "tdf87924.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xPropertySet(getShape(1),
uno::UNO_QUERY);
comphelper::SequenceAsHashMap
aGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
// This was -270, the text rotation angle was set when it should not be
rotated.
@@ -1001,7 +936,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87924, "tdf87924.docx")
DECLARE_OOXMLEXPORT_TEST(testIndents, "indents.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
//expected left margin and first line indent values
static const sal_Int32 indents[] =
{
@@ -1035,7 +969,6 @@ DECLARE_OOXMLEXPORT_TEST(testIndents, "indents.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf92454, "tdf92454.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The first paragraph had a large indentation / left margin as inheritance
// in Word and Writer works differently, and no direct value was set to be
// explicit.
@@ -1046,7 +979,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92454, "tdf92454.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf95377, "tdf95377.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertyState> xParagraph(getParagraph(1),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), getProperty<sal_Int32>(xParagraph,
"ParaRightMargin"));
@@ -1071,7 +1003,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95377, "tdf95377.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf95376, "tdf95376.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertyState> xParagraph(getParagraph(2),
uno::UNO_QUERY);
// This was beans::PropertyState_DIRECT_VALUE: indentation-from-numbering
// did not have priority over indentation-from-paragraph-style, due to a
@@ -1085,7 +1016,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95376, "tdf95376.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf92124, "tdf92124.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Get the second paragraph's numbering style's 1st level's suffix.
uno::Reference<text::XTextRange> xParagraph = getParagraph(2);
auto xLevels = getProperty< uno::Reference<container::XIndexAccess>
>(xParagraph, "NumberingRules");
@@ -1098,21 +1028,18 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92124, "tdf92124.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf90153, "tdf90153.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This was at-para, so the line-level VertOrientRelation was lost,
resulting in an incorrect vertical position.
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf93919, "tdf93919.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This was 0, left margin was not inherited from the list style.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1270),
getProperty<sal_Int32>(getParagraph(1), "ParaLeftMargin"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf91417, "tdf91417.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The first paragraph should contain a link to "http://www.google.com/";
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XTextCursor> xTextCursor =
xTextDocument->getText()->createTextCursor( );
@@ -1124,7 +1051,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf91417, "tdf91417.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf90810, "tdf90810short.docx")
{
- CPPUNIT_ASSERT_EQUAL(4, getPages());
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XFootnotesSupplier> xFootnoteSupp(xTextDocument,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xFootnoteIdxAcc =
xFootnoteSupp->getFootnotes();
@@ -1136,13 +1062,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90810,
"tdf90810short.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf89165, "tdf89165.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This must not hang in layout
}
DECLARE_OOXMLEXPORT_TEST(testTdf95777, "tdf95777.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This must not fail on open
}
@@ -1158,7 +1082,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf94374)
DECLARE_OOXMLEXPORT_TEST(testTdf83300, "tdf83300.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This was 'Contents Heading', which (in the original document) implied
'keep with next' on unexpected paragraphs.
CPPUNIT_ASSERT_EQUAL(OUString("TOC Heading"),
getProperty<OUString>(getParagraph(1), "ParaStyleName"));
}
@@ -1171,13 +1094,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf78902, "tdf78902.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf95775, "tdf95775.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This must not fail in layout
}
DECLARE_OOXMLEXPORT_TEST(testTdf92157, "tdf92157.docx")
{
- CPPUNIT_ASSERT_EQUAL(7, getPages());
// A graphic with dimensions 0,0 should not fail on load
}
@@ -1199,7 +1120,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf97417,
"section_break_numbering.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf94043, "tdf94043.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
auto xTextSection = getProperty< uno::Reference<beans::XPropertySet>
>(getParagraph(2), "TextSection");
auto xTextColumns = getProperty< uno::Reference<text::XTextColumns>
>(xTextSection, "TextColumns");
// This was 0, the separator line was not visible due to 0 width.
@@ -1208,7 +1128,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf94043, "tdf94043.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf95213, "tdf95213.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Get the second paragraph's numbering style's 2nd level's character
style name.
uno::Reference<text::XTextRange> xParagraph = getParagraph(2);
auto xLevels = getProperty< uno::Reference<container::XIndexAccess>
>(xParagraph, "NumberingRules");
@@ -1223,7 +1142,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95213, "tdf95213.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf97371, "tdf97371.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
@@ -1237,7 +1155,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf97371, "tdf97371.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf99140, "tdf99140.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xTextDocument, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -1253,7 +1170,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf99140, "tdf99140.docx")
DECLARE_OOXMLEXPORT_TEST(testTableMarginAdjustment, "table.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Writer, (new) Word: margin 0 means table border starts at 0
// (old) Word: margin 0 means paragraph in table starts at 0
@@ -1273,7 +1189,6 @@ DECLARE_OOXMLEXPORT_TEST(testTableMarginAdjustment,
"table.fodt")
DECLARE_OOXMLEXPORT_TEST(testTdf119760_tableInTablePosition,
"tdf119760_tableInTablePosition.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
if ( mbExported )
{
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
@@ -1292,7 +1207,6 @@
DECLARE_OOXMLEXPORT_TEST(testTdf119760_tableInTablePosition, "tdf119760_tableInT
DECLARE_OOXMLEXPORT_TEST( testTableCellMargin, "table-cell-margin.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
sal_Int32 const cellLeftMarginFromOffice[] = { 250, 100, 0, 0 };
uno::Reference< text::XTextTablesSupplier > xTablesSupplier( mxComponent,
uno::UNO_QUERY );
@@ -1334,7 +1248,6 @@ DECLARE_OOXMLEXPORT_TEST( testTableCellMargin,
"table-cell-margin.docx" )
// tdf#106742 for DOCX with compatibility level <= 14 (MS Word up to and incl.
ver.2010), we should use cell margins when calculating table left border
position
DECLARE_OOXMLEXPORT_TEST( testTablePosition14, "table-position-14.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
sal_Int32 const aXCoordsFromOffice[] = { 2500, -1000, 0, 0 };
uno::Reference< text::XTextTablesSupplier > xTablesSupplier( mxComponent,
uno::UNO_QUERY );
@@ -1360,7 +1273,6 @@ DECLARE_OOXMLEXPORT_TEST( testTablePosition14,
"table-position-14.docx" )
// we should NOT use cell margins when calculating table left border position.
But we do need to use border width.
DECLARE_OOXMLEXPORT_TEST( testTablePosition15, "table-position-15.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
sal_Int32 const aXCoordsFromOffice[] = { 2751, -899, 1, 212 };
uno::Reference< text::XTextTablesSupplier > xTablesSupplier( mxComponent,
uno::UNO_QUERY );
@@ -1384,7 +1296,6 @@ DECLARE_OOXMLEXPORT_TEST( testTablePosition15,
"table-position-15.docx" )
DECLARE_OOXMLEXPORT_TEST( testTdf107359, "tdf107359-char-pitch.docx" )
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
bool bGridSnapToChars;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 86d6c5aa7194..1e9e55da8958 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -38,7 +38,6 @@ protected:
DECLARE_OOXMLEXPORT_TEST(testTdf57589_hashColor, "tdf57589_hashColor.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty<drawing::FillStyle>(getParagraph(1), "FillStyle"));
CPPUNIT_ASSERT_EQUAL(COL_LIGHTMAGENTA,
Color(getProperty<sal_uInt32>(getParagraph(1), "ParaBackColor")));
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty<drawing::FillStyle>(getParagraph(2), "FillStyle"));
@@ -47,7 +46,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf57589_hashColor,
"tdf57589_hashColor.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf90906_colAuto, "tdf90906_colAuto.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -60,7 +58,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90906_colAuto,
"tdf90906_colAuto.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf90906_colAutoB, "tdf90906_colAutoB.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -81,14 +78,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90906_colAutoB,
"tdf90906_colAutoB.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, "tdf92524_autoColor.doc")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty<drawing::FillStyle>(getParagraph(1), "FillStyle"));
CPPUNIT_ASSERT_EQUAL(COL_AUTO,
Color(getProperty<sal_uInt32>(getParagraph(1), "ParaBackColor")));
}
DECLARE_OOXMLEXPORT_TEST(testTdf116436_rowFill, "tdf116436_rowFill.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -98,14 +93,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116436_rowFill,
"tdf116436_rowFill.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf121665_back2backColumnBreaks,
"tdf121665_back2backColumnBreaks.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Column break type",
style::BreakType_COLUMN_BEFORE,
getProperty<style::BreakType>(getParagraph(2), "BreakType"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf126795_TabsRelativeToIndent0,
"tdf126795_TabsRelativeToIndent0.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Sequence< style::TabStop > stops = getProperty<
uno::Sequence<style::TabStop> >(getParagraph( 2 ), "ParaTabStops");
CPPUNIT_ASSERT_EQUAL( sal_Int32(1), stops.getLength());
CPPUNIT_ASSERT_EQUAL( css::style::TabAlign_LEFT, stops[ 0 ].Alignment );
@@ -114,7 +107,6 @@
DECLARE_OOXMLEXPORT_TEST(testTdf126795_TabsRelativeToIndent0, "tdf126795_TabsRel
DECLARE_OOXMLEXPORT_TEST(testTdf126795_TabsRelativeToIndent1,
"tdf126795_TabsRelativeToIndent1.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Sequence< style::TabStop > stops = getProperty<
uno::Sequence<style::TabStop> >(getParagraph( 2 ), "ParaTabStops");
CPPUNIT_ASSERT_EQUAL( sal_Int32(1), stops.getLength());
CPPUNIT_ASSERT_EQUAL( css::style::TabAlign_LEFT, stops[ 0 ].Alignment );
@@ -123,14 +115,12 @@
DECLARE_OOXMLEXPORT_TEST(testTdf126795_TabsRelativeToIndent1, "tdf126795_TabsRel
DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop,
"tdf46938_clearTabStop.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Number of tabstops should be zero, overriding the one in the style
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(1), "ParaTabStops").getLength());
}
DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs, "tdf63561_clearTabs.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(1), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(3), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(4), "ParaTabStops").getLength());
@@ -138,7 +128,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs,
"tdf63561_clearTabs.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs2, "tdf63561_clearTabs2.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(1), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(3), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(4), "ParaTabStops").getLength());
@@ -174,7 +163,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitle,
"tdf121456_tabsOffse
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf129525, "tdf129525.rtf")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport();
assertXPathContent(pXmlDoc,
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[4]/w:t", "Overview");
assertXPathContent(pXmlDoc,
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[5]/w:t", "3");
@@ -185,7 +173,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf129525,
"tdf129525.rtf")
// Related issue tdf#121561: w:sdt/w:sdtContent around TOC
DECLARE_OOXMLEXPORT_TEST(testTdf124106, "tdf121456.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextDocument> textDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> text = textDocument->getText();
// -1 if the 'Y' character does not occur
@@ -195,7 +182,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf124106, "tdf121456.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitleDocx,
"tdf121456_tabsOffset.odt")
{
- CPPUNIT_ASSERT_EQUAL(7, getPages());
xmlDocUniquePtr pXmlDoc = parseExport();
// get TOC node
@@ -212,7 +198,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitleDocx, "tdf121456_tabsO
DECLARE_OOXMLEXPORT_TEST(testTdf106174_rtlParaAlign,
"tdf106174_rtlParaAlign.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER),
getProperty<sal_Int16>(getParagraph(1), "ParaAdjust"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER),
getProperty<sal_Int16>(getParagraph(2), "ParaAdjust"));
uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("ParagraphStyles")->getByName("Another paragraph aligned
to right"), uno::UNO_QUERY);
@@ -233,7 +218,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106174_rtlParaAlign,
"tdf106174_rtlParaAlign.doc
DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict,
"tdf82065_Ind_start_strict.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aProps;
@@ -254,7 +238,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict,
"tdf82065_Ind_start_stri
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf76683_negativeTwipsMeasure,
"tdf76683_negativeTwipsMeasure.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:cols/w:col", 2);
sal_uInt32 nColumn1 = getXPath(pXmlDoc,
"/w:document/w:body/w:sectPr/w:cols/w:col[1]", "w").toUInt32();
@@ -264,7 +247,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf76683_negativeTwipsMeasure, "tdf76683
DECLARE_OOXMLEXPORT_TEST(testTdf112694, "tdf112694.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
// Header was on when header for file was for explicit first pages only
// (marked via <w:titlePg>).
@@ -290,14 +272,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113849_evenAndOddHeaders,
"tdf113849_evenAndOddH
DECLARE_OOXMLEXPORT_TEST(testTdf118361_RTLfootnoteSeparator,
"tdf118361_RTLfootnoteSeparator.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
CPPUNIT_ASSERT_EQUAL_MESSAGE("Footnote separator RTL", sal_Int16(2),
getProperty<sal_Int16>(aPageStyle, "FootnoteLineAdjust"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf115861, "tdf115861.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
// Second item in the paragraph enumeration was a table, 2nd paragraph was
// lost.
CPPUNIT_ASSERT_EQUAL(OUString("(k)"), getParagraph(2)->getString());
@@ -305,7 +285,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf115861, "tdf115861.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xTextField = getProperty<
uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 2), "TextField");
CPPUNIT_ASSERT(xTextField.is());
uno::Reference<lang::XServiceInfo> xServiceInfo(xTextField,
uno::UNO_QUERY_THROW);
@@ -382,7 +361,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder,
"parasplit-on-section-border.odt")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// Test document has only two paragraphs. After splitting, it should
contain
@@ -393,14 +371,12 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder, "paraspli
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf44832_testSectionWithDifferentHeader,
"tdf44832_section_new_header.odt")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:headerReference", 1);
}
DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape,
"signature-line-all-props-set.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<drawing::XShape> xSignatureLineShape = getShape(1);
uno::Reference<beans::XPropertySet> xPropSet(xSignatureLineShape,
uno::UNO_QUERY);
@@ -439,7 +415,6 @@ DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape,
"signature-line-all-props-set.d
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf117805, "tdf117805.odt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess
=
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
maTempFile.GetURL());
@@ -453,7 +428,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf117805,
"tdf117805.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf113183, "tdf113183.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// The horizontal positioning of the star shape affected the positioning of
// the triangle one, so the triangle was outside the page frame.
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
@@ -471,14 +445,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113183, "tdf113183.docx")
DECLARE_OOXMLEXPORT_TEST(testGraphicObjectFliph, "graphic-object-fliph.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
CPPUNIT_ASSERT(getProperty<bool>(getShape(1), "HoriMirroredOnEvenPages"));
CPPUNIT_ASSERT(getProperty<bool>(getShape(1), "HoriMirroredOnOddPages"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf113547, "tdf113547.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<beans::XPropertySet> xPropertySet(
getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xLevels(
@@ -490,7 +462,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113547, "tdf113547.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf113399, "tdf113399.doc")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// 0 padding was not preserved
// In LO 0 is the default, but in OOXML format the default is 254 / 127
uno::Reference<beans::XPropertySet> xPropSet(getShape(1), uno::UNO_QUERY);
@@ -507,13 +478,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113399, "tdf113399.doc")
DECLARE_OOXMLEXPORT_TEST(testTdf114882, "tdf114882.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// fastserializer must not fail assertion because of mismatching elements
}
DECLARE_OOXMLEXPORT_TEST(testTdf49073, "tdf49073.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// test case for Asian phontic guide (ruby text.)
sal_Unicode aRuby[3] = {0x304D,0x3082,0x3093};
OUString sRuby(aRuby, SAL_N_ELEMENTS(aRuby));
@@ -531,7 +500,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf49073, "tdf49073.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf114703, "tdf114703.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<container::XIndexAccess> xRules
= getProperty<uno::Reference<container::XIndexAccess>>(
getStyles("NumberingStyles")->getByName("WWNum1"),
"NumberingRules");
@@ -544,7 +512,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf114703, "tdf114703.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY);
// This was 494, i.e. automatic spacing resulted in non-zero paragraph top
// margin for the first paragraph in a shape.
@@ -554,7 +521,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing,
"tdf113258_noBeforeAutospacing.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY);
// This was 0, i.e. disabled automatic spacing still resulted in zero
paragraph
// top margin for the first paragraph in a shape.
@@ -564,7 +530,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing,
"tdf113258_noBeforeA
DECLARE_OOXMLEXPORT_TEST(testTdf120511_eatenSection,
"tdf120511_eatenSection.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
sal_Int32 nHeight = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds",
"height").toInt32();
sal_Int32 nWidth = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds",
"width").toInt32();
@@ -576,7 +541,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120511_eatenSection,
"tdf120511_eatenSection.doc
DECLARE_OOXMLEXPORT_TEST(testTdf104354, "tdf104354.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY);
// This was 494, i.e. automatic spacing resulted in non-zero paragraph top
// margin for the first paragraph in a text frame.
@@ -608,7 +572,6 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreak_after,
"pageBreak_after.odt")
DECLARE_OOXMLEXPORT_TEST(testTdf107035, "tdf107035.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Select the second run containing the page number field
auto xPgNumRun = getRun(getParagraph(1), 2, "1");
@@ -619,7 +582,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107035, "tdf107035.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf112118_DOCX, "tdf112118.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
// The resulting left margin width (2081) differs from its DOC counterpart
from ww8export2.cxx,
// because DOCX import does two conversions between mm/100 and twips on
the route, losing one
// twip on the road and arriving with a value that is 2 mm/100 less. I
don't see an obvious way
@@ -685,7 +647,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112118_DOCX,
"tdf112118.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf82177_outsideCellBorders,
"tdf82177_outsideCellBorders.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference< text::XTextTable > xTable( xTables->getByIndex(0),
uno::UNO_QUERY );
@@ -696,7 +657,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82177_outsideCellBorders,
"tdf82177_outsideCellB
DECLARE_OOXMLEXPORT_TEST(testTdf82177_insideCellBorders,
"tdf82177_insideCellBorders.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference< text::XTextTable > xTable( xTables->getByIndex(0),
uno::UNO_QUERY );
@@ -707,7 +667,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82177_insideCellBorders,
"tdf82177_insideCellBor
DECLARE_OOXMLEXPORT_TEST(testTdf82177_tblBorders, "tdf82177_tblBorders.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference< text::XTextTable > xTable( xTables->getByIndex(0),
uno::UNO_QUERY );
@@ -721,7 +680,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82177_tblBorders,
"tdf82177_tblBorders.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf119760_positionCellBorder,
"tdf119760_positionCellBorder.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
//inconsistent in Word even. 2016 positions on last row, 2003 positions on
first cell.
sal_Int32 nRowLeft =
parseDump("/root/page/body/tab[4]/row[1]/infos/bounds", "left").toInt32();
sal_Int32 nTextLeft =
parseDump("/root/page/body/tab[4]/row[1]/cell[1]/txt/infos/bounds",
"left").toInt32();
@@ -730,7 +688,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119760_positionCellBorder,
"tdf119760_positionCe
DECLARE_OOXMLEXPORT_TEST(testTdf98620_environmentBiDi,
"tdf98620_environmentBiDi.odt")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getProperty<sal_Int16>(
getParagraph(1), "WritingMode" ));
CPPUNIT_ASSERT_EQUAL(sal_Int32(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int32>( getParagraph(1), "ParaAdjust" ));
@@ -740,7 +697,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf98620_environmentBiDi,
"tdf98620_environmentBiDi
DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// This was 0, relative size of shape after bitmap was ignored.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(40),
getProperty<sal_Int16>(getShape(1), "RelativeWidth"));
@@ -748,7 +704,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf116985, "tdf116985.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// Body frame width is 10800, 40% is the requested relative width, with 144
// spacing to text on the left/right side. So ideal width would be 4032,
// was 3431. Allow one pixel tolerance, though.
@@ -759,7 +714,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116985, "tdf116985.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
uno::UNO_QUERY);
@@ -772,7 +726,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// A VML object in a footnote's tracked changes caused write past end of
document.xml at export to docx.
// After that, importing after export failed with
// SAXParseException: '[word/document.xml line 2]: Extra content at the
end of the document', Stream 'word/document.xml'.
@@ -780,7 +733,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx")
DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, "open-as-read-only.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument
*>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
CPPUNIT_ASSERT(pTextDoc->GetDocShell()->IsSecurityOptOpenReadOnly());
@@ -788,7 +740,6 @@ DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly,
"open-as-read-only.docx")
DECLARE_OOXMLEXPORT_TEST(testNoDefault, "noDefault.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -817,7 +768,6 @@ DECLARE_OOXMLEXPORT_TEST(testNoDefault, "noDefault.docx")
DECLARE_OOXMLEXPORT_TEST(testMarginsFromStyle, "margins_from_style.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// tdf#118521 paragraphs with direct formatting of top or bottom margins
have
// lost the other margin comes from paragraph style, getting a bad
// margin from the default style
@@ -835,7 +785,6 @@ DECLARE_OOXMLEXPORT_TEST(testMarginsFromStyle,
"margins_from_style.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf104348_contextMargin,
"tdf104348_contextMargin.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// tdf#104348 shows that ContextMargin belongs with Top/Bottom handling
uno::Reference<beans::XPropertySet>
xMyStyle(getStyles("ParagraphStyles")->getByName("MyStyle"), uno::UNO_QUERY);
@@ -848,7 +797,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104348_contextMargin,
"tdf104348_contextMargin.d
DECLARE_OOXMLEXPORT_TEST(testTdf118521_marginsLR, "tdf118521_marginsLR.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
// tdf#118521 paragraphs with direct formatting of only some of left,
right, or first margins have
// lost the other unset margins coming from paragraph style, getting a bad
margin from the default style instead
@@ -886,7 +834,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf104797, "tdf104797.docx")
DECLARE_OOXMLEXPORT_TEST(testTdf113608_runAwayNumbering,
"tdf113608_runAwayNumbering.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
// check that an incorrect numbering style is not applied
// after removing a w:r-less paragraph
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(getParagraph(2),
"NumberingStyleName"));
@@ -894,7 +841,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113608_runAwayNumbering,
"tdf113608_runAwayNumbe
DECLARE_OOXMLEXPORT_TEST(testTdf119188_list_margin_in_cell,
"tdf119188_list_margin_in_cell.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
@@ -914,7 +860,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119188_list_margin_in_cell,
"tdf119188_list_marg
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testChart_BorderLine_Style,
"Chart_BorderLine_Style.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
/* DOCX containing Chart with BorderLine Style as Dash Type should get
preserved
* inside an XML tag <a:prstDash> with value "dash", "sysDot, "lgDot", etc.
*/
@@ -926,7 +871,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testChart_BorderLine_Style, "Chart_BorderLin
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testChart_Plot_BorderLine_Style,
"Chart_Plot_BorderLine_Style.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
/* DOCX containing Chart wall (plot area) and Chart Page with BorderLine
Style as Dash Type
* should get preserved inside an XML tag <a:prstDash> with value "dash",
"sysDot, "lgDot", etc.
*/
@@ -938,14 +882,12 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testChart_Plot_BorderLine_Style, "Chart_Plot
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesDeletedEmptyParagraph,
"testTrackChangesDeletedEmptyParagraph.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:rPr/w:del");
}
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
"testTrackChangesEmptyParagraphsInADeletion.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
for (int i = 1; i < 12; ++i)
assertXPath(pXmlDoc, "/w:document/w:body/w:p[" + OString::number(i) +
"]/w:pPr/w:rPr/w:del");
@@ -953,7 +895,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, "tdf70234.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// import field with tracked deletion
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r[1]/w:fldChar");
@@ -967,7 +908,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234,
"tdf70234.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115212, "tdf115212.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// export field with tracked deletion
assertXPath(pXmlDoc, "//w:p[2]/w:del[1]/w:r[1]/w:fldChar");
@@ -975,7 +915,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115212,
"tdf115212.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf126243, "tdf120338.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// export change tracking rejection data for tracked paragraph style change
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[11]/w:pPr/w:pPrChange/w:pPr/w:pStyle", "val",
"Heading3");
@@ -983,7 +922,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf126243,
"tdf120338.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf126245, "tdf126245.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// export change tracking rejection data for tracked numbering change
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:pPr/w:pPrChange/w:pPr/w:numPr/w:numId", "val",
"1");
@@ -991,7 +929,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf126245,
"tdf126245.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf124491, "tdf124491.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// import format change of empty lines, FIXME: change w:r with w:pPr in
export
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/*/w:rPr/w:rPrChange");
@@ -1002,7 +939,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf124491,
"tdf124491.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf105485, "tdf105485.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// import change tracking of deleted comments
assertXPath(pXmlDoc, "//w:del/w:r/w:commentReference");
@@ -1010,7 +946,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf105485,
"tdf105485.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894, "tdf125894.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// import change tracking in frames
assertXPath(pXmlDoc, "//w:del", 2);
@@ -1019,7 +954,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894,
"tdf125894.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
{
- CPPUNIT_ASSERT_EQUAL(2, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// import change tracking in frames
assertXPath(pXmlDoc, "//w:ins");
@@ -1027,7 +961,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156,
"tdf128156.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125546, "tdf125546.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// compress redlines (it was 15)
assertXPath(pXmlDoc, "//w:rPrChange", 2);
@@ -1035,7 +968,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125546,
"tdf125546.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testLabelWidthAndPosition_Left_FirstLineIndent,
"Hau_min_list2.fodt")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// list is LABEL_WIDTH_AND_POSITION with SvxAdjust::Left
// I) LTR
@@ -1138,7 +1070,6 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testLabelWidthAndPosition_Left_FirstLineInde
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf124604, "tdf124604.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// If the numbering comes from a base style, indentation of the base style
has also priority.
assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:ind", "start",
"0");
@@ -1146,7 +1077,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf124604,
"tdf124604.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf95374, "tdf95374.docx")
{
- CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// Numbering disabled by non-existent numId=0, disabling also inheritance
of indentation of parent styles
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:ind", "hanging",
"0");
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
