svn commit: r1711511 - in /openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper: pdfioutdev_gpl.cxx pdfioutdev_gpl.hxx

[pfg]

Author: pfg
Date: Fri Oct 30 17:15:46 2015
New Revision: 1711511

URL: http://svn.apache.org/viewvc?rev=1711511&view=rev
Log:
Update some poppler APIs.

This lets the pdfimport extension work at a basic level.
Unfortunately there' still a long way to go to get this functional.

Tested by:      Don Lewis

Modified:
    openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
    openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

Modified: 
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx?rev=1711511&r1=1711510&r2=1711511&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
(original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
Fri Oct 30 17:15:46 2015
@@ -463,7 +463,7 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
 {
 }
 
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state, XRef* /*xref*/)
 {
     assert(state);
     printf("startPage %f %f\n",
@@ -476,7 +476,7 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-void PDFOutDev::processLink(AnnotLink* link, Catalog*)
+void PDFOutDev::processLink(AnnotLink* link)
 {
     assert(link);
 

Modified: 
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx?rev=1711511&r1=1711510&r2=1711511&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
(original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
Fri Oct 30 17:15:46 2015
@@ -171,7 +171,7 @@ namespace pdfi
         virtual void setDefaultCTM(double *ctm);
         
         // Start a page.
-        virtual void startPage(int pageNum, GfxState *state);
+        virtual void startPage(int pageNum, GfxState *state, XRef *xref);
         
         // End a page.
         virtual void endPage();
@@ -186,7 +186,7 @@ namespace pdfi
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
         
         //----- link borders
-        virtual void processLink(AnnotLink *link, Catalog *catalog);
+        virtual void processLink(AnnotLink *link);
         
         //----- save/restore graphics state
         virtual void saveState(GfxState *state);