[Libreoffice-commits] core.git: sw/qa

[umutbayramoglu (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |    4 +---
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0825f53a715d7c0e8ddcd9220726c71c4250536e
Author:     umutbayramoglu <umut265 at gmail.com>
AuthorDate: Sun Dec 6 19:36:42 2020 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jan 5 10:00:31 2021 +0100

    tdf#129423: Make export tests export-only where applicable
    
    Change-Id: I6bf5a62a0f2a8dd6852b59d26066d3169b0616b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107317
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index be654093e229..626157e803dd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1332,12 +1332,10 @@ DECLARE_OOXMLEXPORT_TEST( testTdf107359, "tdf107359-char-pitch.docx" )
     CPPUNIT_ASSERT_EQUAL( sal_Int32(convertTwipToMm100(24 * 20)), nBaseWidth );
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf77236_MissingSolidFill, "tdf77236_MissingSolidFill.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf77236_MissingSolidFill, "tdf77236_MissingSolidFill.docx")
 {
     // tdf#77236: solidFill of VML shape was not exported if the colors of line and style were the same
     xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
-    if (!pXmlDoc)
-        return;
     assertXPath(pXmlDoc, "//mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill", 1);
 }
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 9e3aecaa6c20..b5f5493b9557 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -886,12 +886,10 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf135667, "tdf135667.odt")
     assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:stroke", "dashstyle", "Dash");
 }
 
-DECLARE_OOXMLEXPORT_TEST(testImageSpaceSettings, "tdf135047_ImageSpaceSettings.fodt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testImageSpaceSettings, "tdf135047_ImageSpaceSettings.fodt")
 {
     // tdf#135047 The spaces of image were not saved.
     xmlDocUniquePtr pXmlDoc = parseExport();
-    if (!pXmlDoc)
-        return;
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor", "distT", "90170");
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor", "distB", "90170");
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor", "distL", "90170");