diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-08 11:24:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-16 10:22:36 +0100 |
commit | 6382edc2b1d5ae5e6f88a378da0647b890d4c776 (patch) | |
tree | e54a1eea441ab7b18f9beb8a56992d1c0f0fb85c | |
parent | poppler dropped GBool since 0.71 (diff) | |
download | core-6382edc2b1d5ae5e6f88a378da0647b890d4c776.tar.gz core-6382edc2b1d5ae5e6f88a378da0647b890d4c776.zip |
Fix build with poppler-0.72
Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
Reviewed-on: https://gerrit.libreoffice.org/65960
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17)
Reviewed-on: https://gerrit.libreoffice.org/66373
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index a6c4b2e49e5d..9842b9734e8d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*) LinkAction* pAction = link->getAction(); if (pAction && pAction->getKind() == actionURI) { +#if POPPLER_CHECK_VERSION(0, 72, 0) + const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); +#else const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); +#endif std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); @@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state) aFont = it->second; +#if POPPLER_CHECK_VERSION(0, 72, 0) + std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); +#else std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); +#endif printf( " %d %d %d %d %f %d %s", aFont.isEmbedded, aFont.isBold, |