[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sdext/source

[Pedro Giffuni]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    4 ++--
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 87635e134467062b63b94b7e42d96bcbf323bc27
Author: Pedro Giffuni <pfg at apache.org>
Date:   Fri Oct 30 17:15:46 2015 +0000

    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

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index ce89e33..94d242c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -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);
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d86f402..d3e8025 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -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);