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

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit f5976846c02cd9c0d25e2d53dd9520500360542d
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Dec 9 12:48:08 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Dec 13 12:41:19 2019 +0100

    Release LibreOffice 6.3.0.4.1 with crypto changes
    
    Builds are here:
        https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x64_en-US_it_de_es_ru_build-9.msi
        https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x64_sdk_build-9.msi
        https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x86_en-US_it_de_es_ru_build-9.msi
        https://download.cib.de/ShareSoft/anon/2019-12-13/CIB-RMS-Milestone-5/LibreOffice_6.3.0.4.1_Win_x86_sdk_build-9.msi
    
    Change-Id: I3c3cad95f810fa3c2cbcfe7fb2f425096eb752d1

diff --git a/configure.ac b/configure.ac
index 1511013e9bd7..98671a75b4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[6.3.0.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.0.4.1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
commit aaf91e7c4833689dc11d0b7f3e9f707a9ce206d5
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 12:41:19 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;
 }