mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-13 05:01:30 +00:00
Merge remote-tracking branch 'origin/Applications/18.12'
This commit is contained in:
commit
cbae44467a
|
@ -125,7 +125,7 @@ QTextDocument* Converter::convert( const QString &fileName )
|
|||
return nullptr;
|
||||
}
|
||||
} else if ( element.tagName() == QLatin1String( "body" ) ) {
|
||||
if ( !mTitleInfo->mCoverPage.isNull() ) {
|
||||
if ( mTitleInfo && !mTitleInfo->mCoverPage.isNull() ) {
|
||||
convertCover( mTitleInfo->mCoverPage );
|
||||
mCursor->insertBlock();
|
||||
}
|
||||
|
@ -137,7 +137,7 @@ QTextDocument* Converter::convert( const QString &fileName )
|
|||
frameFormat.setPadding( 8 );
|
||||
frameFormat.setBackground( Qt::lightGray );
|
||||
|
||||
if ( !mTitleInfo->mTitle.isEmpty() ) {
|
||||
if ( mTitleInfo && !mTitleInfo->mTitle.isEmpty() ) {
|
||||
mCursor->insertFrame( frameFormat );
|
||||
|
||||
QTextCharFormat charFormat;
|
||||
|
@ -148,7 +148,7 @@ QTextDocument* Converter::convert( const QString &fileName )
|
|||
mCursor->setPosition( topFrame->lastPosition() );
|
||||
}
|
||||
|
||||
if ( !mTitleInfo->mAuthor.isEmpty() ) {
|
||||
if ( mTitleInfo && !mTitleInfo->mAuthor.isEmpty() ) {
|
||||
frameFormat.setBorder( 1 );
|
||||
mCursor->insertFrame( frameFormat );
|
||||
|
||||
|
|
Loading…
Reference in a new issue