diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-13 03:01:28 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-02-08 18:34:27 +0100 |
| commit | 15664830235fd3d34dc633affa87824e5c10cb79 (patch) | |
| tree | ee9bdaaeb8ec7968bbb520e16a1bbe769c04c13e | |
| parent | 153c4c7e6ab066c6b1c06704e08e5be815cfc024 (diff) | |
tdf#129096 Don't autosave encrypted documents
As we cannot generally make sure they stay encrypted.
Change-Id: I15ed41fabcc553608e418608ad1166a951daa4b6
(cherry picked from commit aaf91e7c4833689dc11d0b7f3e9f707a9ce206d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88209
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 0bcd2c6befaf..3dcdfa540e49 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2389,7 +2389,10 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame // check if this document must be ignored for recovery ! // Some use cases don't wish support for AutoSave/Recovery ... as e.g. OLE-Server / ActiveX Control etcpp. - bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault( + utl::MediaDescriptor::PROP_NOAUTOSAVE(), false) + || lDescriptor.getValue( + utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue(); if (bNoAutoSave) return; @@ -2807,7 +2810,10 @@ bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInf return true; utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); - bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault( + utl::MediaDescriptor::PROP_NOAUTOSAVE(), false) + || lDescriptor.getValue( + utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue(); return bNoAutoSave; } |