commit 792c730f3cda4f5c312921a62ecae3d322ad9b72
author Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tue Apr 07 09:05:05 2020 +0200
committer Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Wed Apr 08 12:11:20 2020 +0200
tree 30752f3029c7ae420d5abe33f96edf09f9150798
parent 738a563a0512bf7f28f15160f0be271bcef4f59e

Related tdf#97694 Fix macro preservation on Windows

Change-Id: Ief183c75e0c3ce6c42868b7c60c5f66f9684d743
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91795
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

dbaccess/source/core/dataaccess/databasedocument.cxx

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index fd93feb..415d4a5 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1084,17 +1084,20 @@

        // store to current storage
        Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW );
        OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
        Sequence< PropertyValue > aMediaDescriptor( lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
        impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard );

        // Preserve script signature if the script has not changed
        if (bTryToPreserveScriptSignature)
        {
            // Need to close this storage, otherwise we can't open it for signing below
            // (Windows needs exclusive file access)
            uno::Reference < lang::XComponent > xComp = xCurrentStorage;
            xComp->dispose();
            uno::Reference<security::XDocumentDigitalSignatures> xDDSigns;
            try
            {
                OUString aODFVersion(
                    comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
                xDDSigns = security::DocumentDigitalSignatures::createWithVersion(
                    comphelper::getProcessComponentContext(), aODFVersion);

@@ -1152,7 +1155,7 @@
            }
            catch (uno::Exception&)
            {
                SAL_WARN("dbaccess", "Preserving macro signature failed!");
                TOOLS_WARN_EXCEPTION("dbaccess", "");
            }
        }