[Libreoffice-commits] .: sdext/source

[Tomáš Chvátal]

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

New commits:
commit 516f81a17619a993694c08b024f0c1a6b11dceb5
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue May 15 15:05:38 2012 +0200

    Do not call getOrigName ever
    
    When one take look on what the code did:
    
       name = nameA;
       origName = nameA;
    
       GooString *getOrigName() { return origName; }
       GooString *getName() { return name; }
    
    This code is used even with poppler 10 which was branched 4 years ago.
    So simply do not bother with this code at all.
    
    Change-Id: Iba877e765fb763878f5ccd3e1fa62c29cadc9085

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 46ac1c6..c8c7f20 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -406,10 +406,6 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
     int nSize = 0;
 
     GooString* pFamily = gfxFont->getName();
-#if !POPPLER_CHECK_VERSION(0, 20, 0)
-    if( ! pFamily )
-        pFamily = gfxFont->getOrigName();
-#endif
     if( pFamily )
     {
         aNewFont.familyName.clear();