Fixed konqueror crash related to pdf files. This resolves bug 2974.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit deb3e1e0eb)
r14.0.x
Michele Calgaro 6 years ago committed by Slávek Banko
parent 13633ade23
commit 66b6d940d9
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -169,13 +169,12 @@ TQString Document::getInfo( const TQString & type ) const
int i; int i;
Dict *infoDict = info.getDict(); Dict *infoDict = info.getDict();
if ( #if defined(HAVE_POPPLER_058)
# if defined(HAVE_POPPLER_058) obj = infoDict->lookup( (char*)type.latin1() );
infoDict->lookup( (char*)type.latin1() ).isString() #else
# else infoDict->lookup( (char*)type.latin1(), &obj );
infoDict->lookup( (char*)type.latin1(), &obj )->isString() #endif
# endif if (!obj.isNull() && obj.isString())
)
{ {
s1 = obj.getString(); s1 = obj.getString();
if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff ) if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff )
@ -241,13 +240,12 @@ TQDateTime Document::getDate( const TQString & type ) const
Dict *infoDict = info.getDict(); Dict *infoDict = info.getDict();
TQString result; TQString result;
if ( #if defined(HAVE_POPPLER_058)
# if defined(HAVE_POPPLER_058) obj = infoDict->lookup( (char*)type.latin1() );
infoDict->lookup( (char*)type.latin1() ).isString() #else
# else infoDict->lookup( (char*)type.latin1(), &obj );
infoDict->lookup( (char*)type.latin1(), &obj )->isString() #endif
# endif if (!obj.isNull() && obj.isString())
)
{ {
TQString s = UnicodeParsedString(obj.getString()); TQString s = UnicodeParsedString(obj.getString());
// TODO do something with the timezone information // TODO do something with the timezone information

Loading…
Cancel
Save