Merge remote-tracking branch 'origin/Applications/18.04'

This commit is contained in:
Albert Astals Cid 2018-07-10 00:51:34 +02:00
commit 6d3837e6f4

View file

@ -2965,7 +2965,7 @@ const QList<EmbeddedFile*> *Document::embeddedFiles() const
const Page * Document::page( int n ) const
{
return ( n < d->m_pagesVector.count() ) ? d->m_pagesVector.at(n) : 0;
return ( n >= 0 && n < d->m_pagesVector.count() ) ? d->m_pagesVector.at(n) : nullptr;
}
const DocumentViewport & Document::viewport() const