[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sdext/source

[Petr Mladek]

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

New commits:
commit ac68934592ec7d838cf5c22744be8d97aa4a1a47
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>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 3f1261c..7f0968b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -403,7 +403,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();