[Libreoffice-commits] .: sdext/source

[Lubos Lunak]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8861df394604fa6dd8c72181a023557d037f7235
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Sep 21 17:13:25 2011 +0200

    build without glib poppler bindings
    
    - there's not configure check for it, only for poppler itself
    - and it's not actually used anyway

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 2a35fb7..f24dd9f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -68,7 +68,11 @@ class PDFDoc;
 #define POPPLER_CHECK_VERSION(major,minor,micro) (0)
 typedef GString GooString;
 #else
-#include <glib/poppler-features.h>
+#include <cpp/poppler-version.h>
+#define POPPLER_CHECK_VERSION(major,minor,micro) \
+  (POPPLER_VERSION_MAJOR > (major) || \
+   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
+   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
 #endif
 
 namespace pdfi