mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 11:40:07 +00:00
Merge remote-tracking branch 'origin/Applications/17.12'
This commit is contained in:
commit
5acb6d06f0
|
@ -2414,6 +2414,8 @@ Document::OpenResult Document::openDocument(const QString & docFile, const QUrl
|
|||
// 2. load Additional Data (bookmarks, local annotations and metadata) about the document
|
||||
if ( d->m_archiveData )
|
||||
{
|
||||
// QTemporaryFile is weird and will return false in exists if fileName wasn't called before
|
||||
d->m_archiveData->metadataFile.fileName();
|
||||
d->loadDocumentInfo( d->m_archiveData->metadataFile, LoadPageInfo );
|
||||
d->loadDocumentInfo( LoadGeneralInfo );
|
||||
}
|
||||
|
@ -4726,12 +4728,14 @@ bool Document::saveDocumentArchive( const QString &fileName )
|
|||
if ( !modifiedFile.open() )
|
||||
return false;
|
||||
|
||||
const QString modifiedFileName = modifiedFile.fileName();
|
||||
|
||||
modifiedFile.close(); // We're only interested in the file name
|
||||
|
||||
QString errorText;
|
||||
if ( saveChanges( modifiedFile.fileName(), &errorText ) )
|
||||
if ( saveChanges( modifiedFileName, &errorText ) )
|
||||
{
|
||||
docPath = modifiedFile.fileName(); // Save this instead of the original file
|
||||
docPath = modifiedFileName; // Save this instead of the original file
|
||||
annotationsSavedNatively = d->canAddAnnotationsNatively();
|
||||
formsSavedNatively = canSaveChanges( SaveFormsCapability );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue