diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-08 11:24:40 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-30 23:31:53 +0200 |
| commit | 54c01f3702bbef07b7e06f802f806897e50aca32 (patch) | |
| tree | cd7ca74dfcb8a28fd14d8634da60f6a0b5644995 | |
| parent | a9f310532652eb05feaa0e02f6ea240e05aa4c20 (diff) | |
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/66376
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a5a188d5bbb99f6e305dad6f81b9e3760aa32676)
| -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 1054d8ce49d3..0ef950e6869b 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -575,7 +575,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) ); @@ -777,7 +781,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, |