diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-04-20 16:43:31 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-04-21 17:18:00 +0200 |
commit | a041ba8fae1204a043c026a97e2dd51879654e22 (patch) | |
tree | 32fe78dbefc94acb83abe35cc3aac7e059e30caf | |
parent | a5a603aa83fbc6604952bd6bf9795ceed61978e9 (diff) |
Revert "Related tdf#97694 Fix macro preservation on Windows"
This reverts commit 984a240975b87eff10ccda394de9e7ea0078ed30.
Change-Id: I31cca20301c34b23c7116fb7ea18c537e07fbc83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92578
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f76104e93aa9..cc571a0a6457 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1093,21 +1093,18 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph } // store to current storage - Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW ); - OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage)); + Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_QUERY_THROW ); 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); |