drawinglayer/source/tools/emfpstringformat.cxx | 2 +- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-)
New commits: commit 9065cd8d9a19864f6b618f2dc10daf577badd9ee Author: Martin Milata <[email protected]> AuthorDate: Wed Dec 4 02:37:40 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Dec 4 11:43:12 2019 +0100 Fix build with poppler-0.83 Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 Reviewed-on: https://gerrit.libreoffice.org/84384 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 26048177e87d..e9c2a407c279 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 42178b650cdd..b1a54bd09c5f 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); commit 2c56d8ce717144c8bd9e5774b1b9bbcda6bc9d0e Author: Andrea Gelmini <[email protected]> AuthorDate: Wed Dec 4 10:11:05 2019 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Wed Dec 4 11:43:00 2019 +0100 Fix typo Change-Id: Icd92be2ddc8b6b5d46a6ae04c6af268118f65418 Reviewed-on: https://gerrit.libreoffice.org/84391 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins diff --git a/drawinglayer/source/tools/emfpstringformat.cxx b/drawinglayer/source/tools/emfpstringformat.cxx index f45a3406ac8a..5ff13b4c2d49 100644 --- a/drawinglayer/source/tools/emfpstringformat.cxx +++ b/drawinglayer/source/tools/emfpstringformat.cxx @@ -146,7 +146,7 @@ namespace emfplushelper case StringDigitSubstitution::StringDigitSubstitutionTraditional: return "StringDigitSubstitutionTraditional"; default: - assert(false && nSubst && "invalid string digit subsitution value"); + assert(false && nSubst && "invalid string digit substitution value"); return "INVALID"; } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
