[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756b' - framework/source

[Thorsten Behrens (via logerrit)]

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

New commits:
commit 8b2e00d1334483ff2fe612c008c77fc3a206b6b4
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Fri Dec 13 03:01:28 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Dec 13 03:01:28 2019 +0100

    Don't autosave encrypted documents
    
    As we cannot generally make sure they stay encrypted.
    
    Change-Id: I15ed41fabcc553608e418608ad1166a951daa4b6

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index d58883e83fe3..056e2bce3f38 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2384,7 +2384,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;
 
@@ -2802,7 +2805,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;
 }