sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commits: commit 68ffcfada1da8db584f0e45c6756eac89bbbbca9 Author: Petr Mladek <pmla...@suse.cz> Date: Mon May 14 15:35:05 2012 +0200 better fix for poppler 0.20 Do not call gfxFont->getName() twice; Thanks David Tardon for catching this. Heh, I wonder if gfxFont->getOrigName() ever given any different value than getName() ;-) Change-Id: Idaf95a6a024076c6d450519923b6129166a5f8bd (cherry picked from commit cf7f6ba13f2824ca21baee59f6f25f0ee671cd54) Signed-off-by: David Tardon <dtar...@redhat.com> diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 7f0968b..48e89df 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -402,10 +402,8 @@ 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 ) -#if POPPLER_CHECK_VERSION(0, 20, 0) - pFamily = gfxFont->getName(); -#else pFamily = gfxFont->getOrigName(); #endif if( pFamily ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits