[Libreoffice-commits] core.git: framework/source

[Thorsten Behrens (via logerrit)]

 framework/source/services/autorecovery.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f363ca0c0b949b60b8bb2dd43025082e4609c3f0
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sun Feb 9 11:36:16 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Feb 10 11:09:19 2020 +0100

    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 at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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;
 }