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

[Daniel Arato (NISZ) (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit d9e1775941ff2314d4c1c3d2ace273796d809ca4
Author:     Daniel Arato (NISZ) <arato.daniel at nisz.hu>
AuthorDate: Mon Aug 24 13:24:02 2020 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Mon Aug 24 15:32:17 2020 +0200

    tdf#129423 sw: remove last two bad nullptr checks
    
    Clean-up of commit 5ac88d12b377f64ff36551bfb3cf95a4a23a167d
    (tdf#129423 sw: Convert more tests to export-only).
    
    After a bulk refactor of OOXML export-only tests some unnecessary,
    in fact harmful, checks whether parseExport returned a valid pointer
    remained in the codebase (spotted by Mike Kaganski).
    
    These checks have been deleted.
    
    Change-Id: I0374596c2f1b01be8092461168177f8c13ee1ca4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101274
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 61d914ced235..08f4826277c9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -86,8 +86,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testAnchorIdForWP14AndW14, "AnchorId.docx")
 
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/mc:AlternateContent/mc:Choice/w:drawing/wp:inline", "anchorId", "78735EFD");
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/mc:AlternateContent/mc:Fallback/w:pict/v:rect", "anchorId", "78735EFD");
-
-
 }
 
 DECLARE_OOXMLEXPORT_TEST(testDkVert, "dkvert.docx")
@@ -105,8 +103,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTextWatermark, "textWatermark.docx")
     //and Word uses the object ID to identify if it is a watermark.
     //It has to have the 'PowerPlusWaterMarkObject' string in it
     xmlDocUniquePtr pXmlHeader1 = parseExport("word/header1.xml");
-    if (!pXmlHeader1)
-        return;
 
     assertXPath(pXmlHeader1, "/w:hdr[1]/w:p[1]/w:r[1]/w:pict[1]/v:shape[1]","id","PowerPlusWaterMarkObject93701316");
 
@@ -122,8 +118,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPictureWatermark, "pictureWatermark.docx
     //It has to have the 'WordPictureWaterMarkObject' string in it
 
     xmlDocUniquePtr pXmlHeader1 = parseExport("word/header1.xml");
-    if (!pXmlHeader1)
-        return;
 
     // Check the watermark ID
     assertXPath(pXmlHeader1, "/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Fallback[1]/w:pict[1]/v:shape[1]","id","WordPictureWatermark11962361");