mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix storage access after saving

Browse Source 
Change-Id: I2cd664ac2ca5e80c566efee35bd34e7223501d75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92605
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2020-04-21 07:43:26 +02:00
parent fd200917c3
commit 7dbff6fa55
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dbaccess/source/core/dataaccess/ModelImpl.cxx
View File

@@ -873,10 +873,6 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
// Preserve script signature if the script has not changed // Preserve script signature if the script has not changed
if (bTryToPreserveScriptSignature) 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();
OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(_rxStorage)); OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(_rxStorage));
uno::Reference<security::XDocumentDigitalSignatures> xDDSigns; uno::Reference<security::XDocumentDigitalSignatures> xDDSigns;
try try
@@ -897,15 +893,8 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
uno::Reference<embed::XStorage> xMetaInf uno::Reference<embed::XStorage> xMetaInf
= xReadOrig->openStorageElement("META-INF", embed::ElementModes::READ); = xReadOrig->openStorageElement("META-INF", embed::ElementModes::READ);
OUString aURL = getDocFileLocation();
Reference<XStorage> xTarget
= comphelper::OStorageHelper::GetStorageOfFormatFromURL(
ZIP_STORAGE_FORMAT_STRING, aURL, ElementModes::READWRITE);
if (!xTarget.is())
throw uno::RuntimeException("Could not read " + aURL);
uno::Reference<embed::XStorage> xTargetMetaInf uno::Reference<embed::XStorage> xTargetMetaInf
= xTarget->openStorageElement("META-INF", embed::ElementModes::READWRITE); = _rxStorage->openStorageElement("META-INF", embed::ElementModes::READWRITE);
if (xMetaInf.is() && xTargetMetaInf.is()) if (xMetaInf.is() && xTargetMetaInf.is())
{ {
xMetaInf->copyElementTo(aScriptSignName, xTargetMetaInf, aScriptSignName); xMetaInf->copyElementTo(aScriptSignName, xTargetMetaInf, aScriptSignName);
@@ -920,13 +909,13 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
// now check the copied signature // now check the copied signature
uno::Sequence<security::DocumentSignatureInformation> aInfos uno::Sequence<security::DocumentSignatureInformation> aInfos
= xDDSigns->verifyScriptingContentSignatures( = xDDSigns->verifyScriptingContentSignatures(
xTarget, uno::Reference<io::XInputStream>()); _rxStorage, uno::Reference<io::XInputStream>());
SignatureState nState = DocumentSignatures::getSignatureState(aInfos); SignatureState nState = DocumentSignatures::getSignatureState(aInfos);
if (nState == SignatureState::OK || nState == SignatureState::NOTVALIDATED if (nState == SignatureState::OK || nState == SignatureState::NOTVALIDATED
|| nState == SignatureState::PARTIAL_OK) || nState == SignatureState::PARTIAL_OK)
{ {
// commit the ZipStorage from target medium // commit the ZipStorage from target medium
xTransact.set(xTarget, uno::UNO_QUERY); xTransact.set(_rxStorage, uno::UNO_QUERY);
if (xTransact.is()) if (xTransact.is())
xTransact->commit(); xTransact->commit();
} }