[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sdext/source

[Martin Milata (via logerrit)]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    7 +++++++
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    4 ++++
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    |    4 ++++
 3 files changed, 15 insertions(+)

New commits:
commit 4de88a0f0814d88abe8703936afdc76f8bd3d685
Author:     Martin Milata <martin at martinmilata.cz>
AuthorDate: Wed Dec 4 02:37:40 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 23 09:51:44 2020 +0100

    Fix build with poppler-0.83
    
    Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
    Reviewed-on: https://gerrit.libreoffice.org/84384
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    Tested-by: Tomáš Chvátal <tchvatal at suse.com>
    (cherry picked from commit 035830400393e075fca364a444e04c40516730b2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87204
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 3ae3bdc503e0..36bab70cc6ad 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
     gfree(pBuf);
 }
 
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+void PDFOutDev::printPath( const GfxPath* pPath )
+#else
 void PDFOutDev::printPath( GfxPath* pPath )
+#endif
 {
     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
     for( int i=0; i<nSubPaths; i++ )
     {
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+        const
+#endif
         GfxSubpath* pSub  = pPath->getSubpath( i );
         const int nPoints = pSub->getNumPoints();
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 02f6b59f6f15..2e7d2186f9a1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -149,7 +149,11 @@ namespace pdfi
 
         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
         void writeFontFile( GfxFont* gfxFont ) const;
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+        static void printPath( const GfxPath* pPath );
+#else
         static void printPath( GfxPath* pPath );
+#endif
 
     public:
         explicit PDFOutDev( PDFDoc* pDoc );
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 5b1e13c909c2..8666ab15cfa6 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -68,7 +68,11 @@ int main(int argc, char **argv)
     }
 
     // read config file
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+    globalParams = std::make_unique<GlobalParams>();
+#else
     globalParams = new GlobalParams();
+#endif
     globalParams->setErrQuiet(true);
 #if defined(_MSC_VER)
     globalParams->setupBaseFonts(nullptr);