summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-02-10 17:34:21 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-02-10 17:53:06 +0100
commit600a7a79ecffc47a68438d308f5829868c2f37e6 (patch)
tree450d9cf8c636cb16741997164c349377b3b1c15e /xmlsecurity
parentf4b2e2362513e4442fe1d133302bd9b487866c6a (diff)
xmlsecurity: handle creation of OOXML _xmlsignatures sub-storage
Previously this code worked only for reading, as we assumed if it doesn't exist, then the storage is not OOXML, either. With this, DigitalSignaturesDialog::OKButtonHdl() gets a valid storage, where it'll be able to write the actual signatures. Change-Id: Iadf63a88c962386abc31225c02398761aea818cb
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/helper/documentsignaturehelper.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 1249a8ae335d..46b270e80d90 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -382,7 +382,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
DBG_ASSERT( nOpenMode == css::embed::ElementModes::READ, "Error creating signature stream..." );
}
}
- else if(xNameAccess->hasByName("_xmlsignatures"))
+ else if(xNameAccess->hasByName("[Content_Types].xml"))
{
try
{
@@ -391,7 +391,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
}
catch (const io::IOException& rException)
{
- SAL_WARN("xmlsecurity.helper", "DocumentSignatureHelper::OpenSignatureStream: " << rException.Message);
+ SAL_WARN_IF(nOpenMode != css::embed::ElementModes::READ, "xmlsecurity.helper", "DocumentSignatureHelper::OpenSignatureStream: " << rException.Message);
}
}