File libreoffice-poppler-0.17.0-reject-fix.diff of Package libreoffice-branding-upstream

Overview Repositories Revisions Requests Users Attributes Meta

File libreoffice-poppler-0.17.0-reject-fix.diff of Package libreoffice-branding-upstream (Revision 41e0a698f9542528af8b88c754e91298)

Currently displaying revision 41e0a698f9542528af8b88c754e91298 , Show latest

--- configure.in.old	2012-03-01 14:58:45.000000000 +0100
+++ configure.in	2012-03-01 16:20:38.000000000 +0100
@@ -7259,16 +7259,6 @@ if test "x$enable_ext_pdfimport" != "xno
       AC_MSG_RESULT([external])
       SYSTEM_POPPLER=YES
       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-      AC_LANG_PUSH([C++])
-      save_CXXFLAGS=$CXXFLAGS
-      save_CPPFLAGS=$CPPFLAGS
-      CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
-      CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
-      AC_CHECK_HEADER([cpp/poppler-version.h], [],
-                   [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
-      CXXFLAGS=$save_CXXFLAGS
-      CPPFLAGS=$save_CPPFLAGS
-      AC_LANG_POP([C++])
   else
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old	2012-02-24 16:34:51.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2012-03-01 16:20:38.000000000 +0100
@@ -150,11 +150,7 @@ void writeBinaryBuffer( const OutputBuff
 void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
 {
     // dump JPEG file as-is
-#if POPPLER_CHECK_VERSION(0, 17, 3)
-    str = str->getBaseStream();
-#else
     str = ((DCTStream *)str)->getRawStream();
-#endif
     str->reset();
 
     int c;
@@ -398,10 +398,8 @@ int PDFOutDev::parseFont( long long nNew
     int nSize = 0;
 
     GooString* pFamily = gfxFont->getName();
-#if !POPPLER_CHECK_VERSION(0, 20, 0)
     if( ! pFamily )
         pFamily = gfxFont->getOrigName();
-#endif
     if( pFamily )
     {
         aNewFont.familyName.clear();
@@ -493,11 +489,7 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-#if POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *)
-#else
 void PDFOutDev::processLink(Link* link, Catalog*)
-#endif
 {
     assert(link);
 
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old	2012-02-24 16:34:51.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2012-03-01 16:20:38.000000000 +0100
@@ -65,14 +65,7 @@ class GfxPath;
 class GfxFont;
 class PDFDoc;
 #ifndef SYSTEM_POPPLER
-#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
 typedef GString GooString;
-#else
-#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
@@ -201,12 +194,8 @@ 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
         virtual void processLink(Link *link, Catalog *catalog);
-        #endif
 
         //----- save/restore graphics state
         virtual void saveState(GfxState *state);

Places

File libreoffice-poppler-0.17.0-reject-fix.diff of Package libreoffice-branding-upstream (Revision 41e0a698f9542528af8b88c754e91298)

Places