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

[Caolán McNamara (via logerrit)]

 sw/qa/extras/mailmerge/mailmerge2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e280cf69d54048cf8f8d78158f55846980ad2cad
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 20 12:37:11 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jan 20 16:17:56 2023 +0000

    don't crash with --disable-pdfium
    
    Change-Id: I946e62d70b937d27b2f1258acc643fdaa5bee23d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145890
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/qa/extras/mailmerge/mailmerge2.cxx 
b/sw/qa/extras/mailmerge/mailmerge2.cxx
index 20eb6b0f3896..cd8871e780d3 100644
--- a/sw/qa/extras/mailmerge/mailmerge2.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge2.cxx
@@ -513,7 +513,8 @@ DECLARE_SHELL_MAILMERGE_TEST(exportDirectToPDF_shell, 
"linked-with-condition.odt
     SvMemoryStream aMemory;
     aMemory.WriteStream(aPDFFile);
     std::shared_ptr<vcl::pdf::PDFium> pPDFium = vcl::pdf::PDFiumLibrary::get();
-    CPPUNIT_ASSERT(pPDFium);
+    if (!pPDFium)
+        return;
 
     std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument
         = pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize(), 
OString());