From e60abe659d7448ae6f839740dcfe87fd8b1520d7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 7 Mar 2016 11:10:53 +0100 Subject: xmlsecurity OOXML export: remove signature storage with the last signature So that no empty _xmlsignatures directory is left around after removing signatures. Change-Id: I3af77ba943a483a009a4eebaf40a58404f479e5a --- xmlsecurity/source/helper/documentsignaturemanager.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 8a568bd107d4..505554e89e1f 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -383,6 +383,9 @@ void DocumentSignatureManager::write() { // Removing all signatures: then need to remove the signature relation as well. maSignatureHelper.EnsureSignaturesRelation(mxStore, /*bAdd=*/false); + // Also remove the whole signature sub-storage: release our read-write reference + remove the element. + aStreamHelper = SignatureStreamHelper(); + mxStore->removeElement("_xmlsignatures"); } for (size_t i = 0; i < nSignatureCount; ++i) @@ -390,7 +393,7 @@ void DocumentSignatureManager::write() } // If stream was not provided, we are responsible for committing it.... - if (!mxSignatureStream.is()) + if (!mxSignatureStream.is() && aStreamHelper.xSignatureStorage.is()) { uno::Reference xTrans(aStreamHelper.xSignatureStorage, uno::UNO_QUERY); xTrans->commit(); -- cgit