[Libreoffice-commits] .: configure.ac sdext/source

[Libreoffice Gerrit user]

 configure.ac                                          |    3 ---
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    4 +++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    8 +++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit bb6a12caede53029ecb99810f2f58daae4e11af7
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 31 18:00:18 2012 +0100

    fix sdext build with poppler >= 0.19.x
    
    Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a

diff --git a/configure.ac b/configure.ac
index d1dc127..145569b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9788,9 +9788,6 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" !=
       AC_MSG_RESULT([external])
       SYSTEM_POPPLER=YES
       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-      # sdext test fails with 0.20.0
-      PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler < 0.20.0,
-        , [AC_MSG_ERROR([Poppler 0.20.x is broken, do not use --with-system-poppler or use a different version])])
       AC_LANG_PUSH([C++])
       save_CXXFLAGS=$CXXFLAGS
       save_CPPFLAGS=$CPPFLAGS
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 77a9aa6..7adc487 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -489,7 +489,9 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-#if POPPLER_CHECK_VERSION(0, 17, 0)
+#if POPPLER_CHECK_VERSION(0, 19, 0)
+void PDFOutDev::processLink(AnnotLink *link)
+#elif POPPLER_CHECK_VERSION(0, 17, 0)
 void PDFOutDev::processLink(AnnotLink *link, Catalog *)
 #else
 void PDFOutDev::processLink(Link* link, Catalog*)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 0a19b9a..e5e48fc 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -189,10 +189,12 @@ namespace pdfi
         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
 
-        #if POPPLER_CHECK_VERSION(0, 17, 0)
-        virtual void processLink(AnnotLink *link, Catalog *catalog);
-        #else
         //----- link borders
+	#if POPPLER_CHECK_VERSION(0, 19, 0)
+        virtual void processLink(AnnotLink *link);
+        #elif POPPLER_CHECK_VERSION(0, 17, 0)
+	virtual void processLink(AnnotLink *link, Catalog *catalog);
+        #else
         virtual void processLink(Link *link, Catalog *catalog);
         #endif