sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
New commits: commit 8e572dc82b132de8472928db0ab0aed6388390e8 Author: Xisco Fauli <[email protected]> AuthorDate: Tue May 19 17:48:07 2020 +0200 Commit: Xisco Faulí <[email protected]> CommitDate: Tue May 19 20:13:45 2020 +0200 tdf#129423: make these tests export-only Change-Id: I5697ff10c1118c9f6b4ea1760a9dce7e94d56f96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94542 Reviewed-by: Xisco Faulí <[email protected]> Tested-by: Xisco Faulí <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 3962b9ebeceb..74e98cfb49da 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -1263,23 +1263,19 @@ DECLARE_OOXMLEXPORT_TEST(testNonBMPChar, "nonbmpchar.docx") CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString()); } -DECLARE_OOXMLEXPORT_TEST(testSpacingGroupShapeText, "tdf131775_SpacingGroupShapeText.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testSpacingGroupShapeText, "tdf131775_SpacingGroupShapeText.docx") { // tdf#131775: Check if correct spacing. xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); - if (!pXmlDocument) - return; assertXPath(pXmlDocument, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor" "/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:txbx/w:txbxContent/w:p/w:r/w:rPr/w:spacing", "val", "71"); } -DECLARE_OOXMLEXPORT_TEST(testTdf100581, "tdf100581.odt") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf100581, "tdf100581.odt") { xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); - if (!pXmlDocument) - return; assertXPath(pXmlDocument, "/w:document/w:body/w:p[1]/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor" "/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p[1]/w:pPr/w:pStyle", "val", "FrameContents"); @@ -1296,13 +1292,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf100581, "tdf100581.odt") "/v:textbox/w:txbxContent/w:p[1]/w:pPr/w:sectPr", 0); } -DECLARE_OOXMLEXPORT_TEST(testTdf112287, "tdf112287.docx") +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf112287, "tdf112287.docx") { // tdf#131775: Check if correct spacing. xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); - if (!pXmlDocument) - return; assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr","vAnchor","margin"); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
