[Libreoffice-commits] .: sdext/source

Fridrich Strba fridrich at kemper.freedesktop.org
Mon May 14 01:06:56 PDT 2012


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

New commits:
commit 704f3155cca2e1fb5ad071539b7f8b5e5522dd97
Author: Ionut Biru <ibiru at archlinux.org>
Date:   Sun May 13 23:57:46 2012 +0000

    poppler 0.20 changed its api
    
    Modification introduced in
    http://cgit.freedesktop.org/poppler/poppler/commit/?id=c0affb1845c339f89ca67608cb9fd9134ff902f5
    
    Signed-off-by: Ionut Biru <ibiru at archlinux.org>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 77e5896..c9ffed3 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -407,7 +407,11 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
 
     GooString* pFamily = gfxFont->getName();
     if( ! pFamily )
+#if POPPLER_CHECK_VERSION(0, 20, 0)
+        pFamily = gfxFont->getName();
+#else
         pFamily = gfxFont->getOrigName();
+#endif
     if( pFamily )
     {
         aNewFont.familyName.clear();


More information about the Libreoffice-commits mailing list