diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-02-09 11:36:16 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-02-10 11:09:19 +0100 |
| commit | f363ca0c0b949b60b8bb2dd43025082e4609c3f0 (patch) | |
| tree | 0a9e25ebaa8fda3ebbc86230e40459b8470d17ef /framework | |
| parent | 24ae47e808f471d1ad2d019d50cc1c2a47762dbf (diff) | |
Revert "tdf#129096 Don't autosave encrypted documents"
This reverts commit 15664830235fd3d34dc633affa87824e5c10cb79.
Reason for revert: this was fixed meanwhile via
https://gerrit.libreoffice.org/c/core/+/86201
Change-Id: Id264bc09445cc00e059a243b8ccc53d9364c3ca9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88287
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 3dcdfa540e49..0bcd2c6befaf 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2389,10 +2389,7 @@ 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) - || lDescriptor.getValue( - utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue(); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false); if (bNoAutoSave) return; @@ -2810,10 +2807,7 @@ bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInf return true; utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); - bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_NOAUTOSAVE(), false) - || lDescriptor.getValue( - utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue(); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false); return bNoAutoSave; } |