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

[Martin Whitaker (via logerrit)]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d40f36bf47814c324a1ec467c566255fb187444b
Author:     Martin Whitaker <foss at martin-whitaker.me.uk>
AuthorDate: Fri May 8 21:47:25 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jun 19 16:12:26 2020 +0200

    tdf#131353: Fix build with poppler 0.86.0
    
    Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789
    Tested-by: René Engelhard <rene at debian.org>
    Tested-by: Jenkins
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    (cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96639
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
     if (!(pAction && pAction->getKind() == actionURI))
         return;
 
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif 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();