Get --with-pdfimport to compile and link, given the API breaking

changes made in poppler's commits 664865a2ddca9c20ac36a41aef52ebf12eab838d
and c0affb1845c339f89ca67608cb9fd9134ff902f5 in 2011. Also ports unit tests
from cppunit to Google Test, but they all fail due to UNO bootstrapping errors.

sdext/source/pdfimport/test/export.map

-#**************************************************************
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**************************************************************
-
-
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};

sdext/source/pdfimport/test/makefile.mk

@@ -31,6 +31,12 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+    @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
 # --- test lib ------------------------------------------------------
 
 .IF "$(ENABLE_PDFIMPORT)" == "NO"
@@ -38,16 +44,14 @@ ENABLE_EXCEPTIONS=TRUE
         @echo "PDF Import extension disabled."
 .ENDIF
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
 .IF "$(SYSTEM_ZLIB)" == "YES"
 CFLAGS+=-DSYSTEM_ZLIB
 .ENDIF
 
-SHL1OBJS=  \
+APP1OBJS=  \
     $(SLO)$/tests.obj
 
-SHL1LIBS=\
+APP1LIBS=\
     $(SLB)$/pdfmisc.lib \
     $(SLB)$/pdfparse.lib \
     $(SLB)$/pdfsax.lib \
@@ -56,33 +60,33 @@ SHL1LIBS=\
     $(SLB)$/xpdfwrapper.lib \
     $(SLB)$/pdfimport.lib
 
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
+APP1TARGET=$(TARGET)
+APP1STDLIBS=\
     $(BASEGFXLIB)		\
     $(UNOTOOLSLIB)		\
     $(CANVASTOOLSLIB)	\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
-    $(CPPUNITLIB)		\
+    $(GTESTLIB)		\
         $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
     $(SALLIB)
 
 
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+APP1RPATH = NONE
+# Run explicitly below:
+APP1TEST = disabled
 
 # --- pdf2xml binary ------------------------------------------------------
 
 TARGET2=pdf2xml
 
-APP1TARGET=$(TARGET2)
-APP1LIBSALCPPRT=
-APP1OBJS=$(SLO)$/pdf2xml.obj
+APP2TARGET=$(TARGET2)
+APP2LIBSALCPPRT=
+APP2OBJS=$(SLO)$/pdf2xml.obj
 
-APP1LIBS=\
+APP2LIBS=\
     $(SLB)$/pdfmisc.lib \
     $(SLB)$/pdfparse.lib \
     $(SLB)$/pdfsax.lib \
@@ -91,13 +95,13 @@ APP1LIBS=\
     $(SLB)$/xpdfwrapper.lib \
     $(SLB)$/pdfimport.lib
 
-APP1STDLIBS=\
+APP2STDLIBS=\
     $(BASEGFXLIB)		\
     $(UNOTOOLSLIB)		\
     $(CANVASTOOLSLIB)	\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
-    $(CPPUNITLIB)		\
+    $(GTESTLIB)		\
         $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
@@ -107,11 +111,11 @@ APP1STDLIBS=\
 
 TARGET3=pdfunzip
 
-APP2TARGET=$(TARGET3)
-APP2LIBSALCPPRT=
-APP2OBJS=$(SLO)$/pdfunzip.obj
+APP3TARGET=$(TARGET3)
+APP3LIBSALCPPRT=
+APP3OBJS=$(SLO)$/pdfunzip.obj
 
-APP2LIBS=\
+APP3LIBS=\
     $(SLB)$/pdfmisc.lib \
     $(SLB)$/pdfparse.lib \
     $(SLB)$/pdfsax.lib \
@@ -120,13 +124,13 @@ APP2LIBS=\
     $(SLB)$/xpdfwrapper.lib \
     $(SLB)$/pdfimport.lib
 
-APP2STDLIBS=\
+APP3STDLIBS=\
     $(BASEGFXLIB)		\
       $(UNOTOOLSLIB)		\
       $(CANVASTOOLSLIB)	\
       $(COMPHELPERLIB)	\
       $(CPPUHELPERLIB)	\
-      $(CPPUNITLIB)		\
+      $(GTESTLIB)		\
         $(TESTSHL2LIB)           \
       $(ZLIB3RDLIB)	    \
       $(CPPULIB)			\
@@ -135,28 +139,30 @@ APP2STDLIBS=\
 # --- Targets ------------------------------------------------------
 
   .INCLUDE : target.mk
-  .INCLUDE : _cppunit.mk
 
 # --- Fake uno bootstrap & copy testfile ------------------------
 
-  $(BIN)$/pdfi_unittest_test.pdf : testinput.pdf
-      rm -f $@
-      $(GNUCOPY) testinput.pdf $@
+$(BIN)$/pdfi_unittest_test.pdf : testinput.pdf
+    rm -f $@
+    $(GNUCOPY) testinput.pdf $@
 
-  $(BIN)$/pdfi_unittest_test.ini : makefile.mk
-      rm -f $@
-      @echo UNO_SERVICES= > $@
-      @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@
+$(BIN)$/pdfi_unittest_test.ini : makefile.mk
+    rm -f $@
+    @echo UNO_SERVICES= > $@
+    @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@
 
 # --- Enable testshl2 execution in normal build ------------------------
 
-  $(MISC)$/pdfi_unittest_succeeded : $(SHL1TARGETN) $(BIN)$/pdfi_unittest_test.pdf $(BIN)$/pdfi_unittest_test.ini
-          rm -f $(BIN)$/pdfi_unittest_draw.xml
-          rm -f $(BIN)$/pdfi_unittest_writer.xml
-          @echo ----------------------------------------------------------
-          @echo - start unit test on library $(SHL1TARGETN)
-          @echo ----------------------------------------------------------
-          testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
-           $(TOUCH) $@
+$(MISC)$/pdfi_unittest_succeeded : $(APP1TARGETN) $(BIN)$/pdfi_unittest_test.pdf $(BIN)$/pdfi_unittest_test.ini
+    rm -f $(BIN)$/pdfi_unittest_draw.xml
+    rm -f $(BIN)$/pdfi_unittest_writer.xml
+    @echo ----------------------------------------------------------
+    @echo - start unit test on $(APP1TARGETN)
+    @echo ----------------------------------------------------------
+    $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) TESTS_FORWARD_STRING=$(BIN)$/ \
+        $(APP1TARGETN) --gtest_output="xml:$(BIN)/$(APP1TARGET)_result.xml"
+    $(TOUCH) $@
+
+ALLTAR : $(MISC)$/pdfi_unittest_succeeded
 
-#ALLTAR : $(MISC)$/pdfi_unittest_succeeded
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"

sdext/source/pdfimport/tree/style.cxx

@@ -203,7 +203,7 @@ void StyleContainer::impl_emitStyle( sal_Int32           nStyleId,
 
         for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n )
             impl_emitStyle( rStyle.SubStyles[n], rContext, rContainedElemVisitor );
-        if( rStyle.Contents )
+        if( !rStyle.Contents.isEmpty() )
             rContext.rEmitter.write( rStyle.Contents );
         if( rStyle.ContainedElement )
             rStyle.ContainedElement->visitedBy( rContainedElemVisitor,

sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx

@@ -140,7 +140,6 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
 void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
 {
     // dump JPEG file as-is
-    str = ((DCTStream *)str)->getRawStream();
     str->reset();
 
     int c;
@@ -388,8 +387,6 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
     int nSize = 0;
 
     GooString* pFamily = gfxFont->getName();
-    if( ! pFamily )
-        pFamily = gfxFont->getOrigName();
     if( pFamily )
     {
         aNewFont.familyName.clear();
@@ -479,7 +476,7 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-void PDFOutDev::processLink(Link* link, Catalog*)
+void PDFOutDev::processLink(AnnotLink* link, Catalog*)
 {
     assert(link);
 

sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

@@ -36,6 +36,7 @@
 #include "Link.h"
 #include "Object.h"
 #include "OutputDev.h"
+#include "Stream.h"
 #ifndef SYSTEM_POPPLER
 #  include "parseargs.h"
 #endif
@@ -185,7 +186,7 @@ namespace pdfi
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
 
         //----- link borders
-        virtual void processLink(Link *link, Catalog *catalog);
+        virtual void processLink(AnnotLink *link, Catalog *catalog);
 
         //----- save/restore graphics state
         virtual void saveState(GfxState *state);