[Libreoffice-commits] core.git: sdext/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Jul 18 14:48:04 UTC 2021


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

New commits:
commit c85557c924ee83f9a29c07520c83d308ff5a4c79
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 18 14:35:58 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jul 18 16:47:29 2021 +0200

    poppler 0.73 doesn't have GooString::append(const std::string&)
    
    don't know what version is appeared in
    
    Change-Id: Ia1fff05aa58990e631d63a2e694be47a4b74e24c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119126
    Tested-by: Jenkins
    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 bc313f76ecc4..9ffece584347 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -444,7 +444,11 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
     if( familyName != "" )
     {
         aNewFont.familyName.clear();
+#if POPPLER_CHECK_VERSION(0, 74, 0) // at least 0.73 doesn't have GooString::append(const std::string&)
         aNewFont.familyName.append( familyName );
+#else
+        aNewFont.familyName.append( familyName.c_str() );
+#endif
     }
     else
     {


More information about the Libreoffice-commits mailing list