[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac vcl/qa

[Miklos Vajna (via logerrit)]

 config_host/config_features.h.in     |    5 -----
 configure.ac                         |    1 -
 vcl/qa/cppunit/PDFiumLibraryTest.cxx |    6 ------
 3 files changed, 12 deletions(-)

New commits:
commit 9e63e22c4d584e49577d08d3ecb94233be680bbf
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Apr 14 20:41:28 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 15 09:07:48 2021 +0200

    vcl PDFiumLibraryTest: clean up not needed HAVE_FEATURE_PDFIUM ifdefs
    
    This was already conditional in Module_vcl, so no need to have a
    duplicated check here.
    
    Which allows finally removing the HAVE_FEATURE_PDFIUM ifdef completely.
    
    New code can just call vcl::pdf::PDFiumLibrary::get() at runtime and see
    if the result is nullptr or not.
    
    Change-Id: I36508181865a31618e48cf7c2680d75465130dd3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114108
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 742e5e02e2ed..a4ecdd76af8b 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -131,11 +131,6 @@
  */
 #define HAVE_FEATURE_NSS 0
 
-/*
- * Whether pdfium is available
- */
-#define HAVE_FEATURE_PDFIUM 0
-
 /*
  * Whether poppler is available
  */
diff --git a/configure.ac b/configure.ac
index bf93113fabdd..35e80904d58d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11627,7 +11627,6 @@ ENABLE_PDFIUM=
 if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_pdfium" = yes; then
     AC_MSG_RESULT([yes])
     ENABLE_PDFIUM=TRUE
-    AC_DEFINE(HAVE_FEATURE_PDFIUM)
     BUILD_TYPE="$BUILD_TYPE PDFIUM"
 else
     AC_MSG_RESULT([no])
diff --git a/vcl/qa/cppunit/PDFiumLibraryTest.cxx b/vcl/qa/cppunit/PDFiumLibraryTest.cxx
index 635bf6304f20..71ed79dd59e3 100644
--- a/vcl/qa/cppunit/PDFiumLibraryTest.cxx
+++ b/vcl/qa/cppunit/PDFiumLibraryTest.cxx
@@ -7,10 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <config_features.h>
-
-#if HAVE_FEATURE_PDFIUM
-
 #include <string_view>
 
 #include <cppunit/TestAssert.h>
@@ -406,6 +402,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(PDFiumLibraryTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */