[Libreoffice-commits] .: sdext/source

[Libreoffice Gerrit user]

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

New commits:
commit 397f3e5d7b0b079ef3a6ef4b859ea2b2ab814b67
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 21 17:37:26 2012 +0100

    fix build with poppler-0.21.1
    
    heh, they put back UTF8.h
    
    Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 7adc487..765d0be 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -34,7 +34,12 @@
 #pragma warning(push, 1)
 #endif
 
-#if POPPLER_CHECK_VERSION(0, 21, 0)
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+//        because the internal poppler does not provide poppler-version.h and the macro always returns 0
+#if POPPLER_CHECK_VERSION(0, 21, 1)
+#include "UTF8.h"
+#elif POPPLER_CHECK_VERSION(0, 21, 0)
 #include "UTF.h"
 #else
 #include "UTF8.h"