On Mon, May 14, 2012 at 03:44:23PM +0200, Petr Mladek wrote: > David Tardon píše v Po 14. 05. 2012 v 10:14 +0200: > > On Mon, May 14, 2012 at 01:06:56AM -0700, Fridrich Strba wrote: > > > Author: Ionut Biru <ib...@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(); > > > > Is it not a bit pointless to call the same function again, if the first > > call did not produce any result? > > Great catch! Heh, I wonder if getOrigName() ever returned any different > value than getName(). > > Anyway, it does not make sense to call getName() twice for poppler >= > 0.20, so I have put #if !POPPLER_CHECK_VERSION(0, 20, 0) around it, see > http://cgit.freedesktop.org/libreoffice/core/commit/?id=cf7f6ba13f2824ca21baee59f6f25f0ee671cd54 > > Unfortunately, I have already cherry-picked Ionut's patch to 3-5 branch. > Could you please approve also this incremental fix for that branch?
Sure. D. _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice