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

[Miklos Vajna (via logerrit)]

 emfio/qa/cppunit/emf/EmfImportTest.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 700fe95fac2e2f592159f189ed3ac9e633bf749d
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Apr 22 20:59:42 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Apr 23 09:13:11 2021 +0200

    CppunitTest_emfio_emf: avoid --disable-pdfium failure
    
    'make check' now passes for me without pdfium, all relevant tests are
    annotated to skip asserts when there is no pdfium anyway.
    
    Change-Id: Ie22a2b3b42d16e72f9d34ada85dee264d79d5155
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114523
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 9ab862f6cd69..590b0e6beac1 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -26,6 +26,7 @@
 
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/tools/primitive2dxmldump.hxx>
+#include <vcl/filter/PDFiumLibrary.hxx>
 
 #include <memory>
 #include <string_view>
@@ -415,6 +416,11 @@ void Test::TestCreatePen()
 
 void Test::TestPdfInEmf()
 {
+    if (!vcl::pdf::PDFiumLibrary::get())
+    {
+        return;
+    }
+
     // Load a PPTX file, which has a shape, with a bitmap fill, which is an EMF, containing a PDF.
     OUString aURL = m_directories.getURLFromSrc(u"emfio/qa/cppunit/emf/data/pdf-in-emf.pptx");
     getComponent() = loadFromDesktop(aURL);