sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0a74847e5d533ea2e5773387a171b96e5885c51e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Aug 20 17:14:50 2013 +0200
also adjust for poppler 0.24
Change-Id: I177cc28ec357ec5f88bb1efae1928eb120dcd9f2
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 9d9b841..a840f03 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -492,7 +492,7 @@ PDFOutDev::~PDFOutDev()
}
void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
-#if POPPLER_CHECK_VERSION(0, 23, 0)
+#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
, XRef* /*xref*/
#endif
)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 4fff4b9..6088387 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -171,7 +171,7 @@ namespace pdfi
// Start a page.
virtual void startPage(int pageNum, GfxState *state
-#if POPPLER_CHECK_VERSION(0, 23, 0)
+#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
, XRef *xref
#endif
) SAL_OVERRIDE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
