[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - configure.in sdext/source

[Libreoffice Gerrit user]

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

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

    fix sdext build with poppler >= 0.19.x
    
    Conflicts:
    
    	configure.ac
    
    Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
    Signed-off-by: Tomas Chvatal <tchvatal at suse.cz>
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 87c0ab2..9d38e9b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -497,7 +497,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 bba8f58..1911d57 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -201,10 +201,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
 
commit 7770ce574efd1f089619fbc2f4b901b64852e197
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 19 12:43:58 2012 +0200

    Detect failing Clang with GCC 4.7 headers and --std=gnu++0x scenarios
    
    Change-Id: I6caa48a428ac7fef23f7c3e6fc7896b7e3a8d0fc
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/configure.in b/configure.in
index 2f01827..cd3c4ca 100644
--- a/configure.in
+++ b/configure.in
@@ -4839,6 +4839,9 @@ if test "$GCC" = "yes"; then
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stddef.h>
 
+#include <vector>
+    // some Clang fail when compiling against GCC 4.7 headers with --std=gnu++0x
+
 template <typename T, size_t S> char (&sal_n_array_size( T(&)[S] ))[S];
 
 namespace