diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-19 17:17:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-19 17:32:34 +0100 |
| commit | 8b8b5e21b03387d482ead79afe250cc7fe6e78f7 (patch) | |
| tree | 536fcad05d72c8938c1b51a5558fdefe1842d117 | |
| parent | ac699587dc30f005f5e4657e95b0dbf6a9deebc3 (diff) | |
xmlsecurity: handle OOXML signatures in ImplGetSignatureInformations()
With this, DigitalSignaturesDialog correctly shows the "Signed by" field
when reading a single valid OOXML signature.
Change-Id: Ic52a56767f65ab30924b07073d31677cb3a27de5
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index bb93298a0d30..ea2430b8d7df 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -24,6 +24,7 @@ #include <sax/tools/converter.hxx> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XTruncate.hpp> @@ -744,6 +745,8 @@ void DigitalSignaturesDialog::ImplGetSignatureInformations(bool bUseTempStream) uno::Reference< io::XInputStream > xInputStream( aStreamHelper.xSignatureStream, uno::UNO_QUERY ); maSignatureHelper.ReadAndVerifySignature( xInputStream ); } + else if (aStreamHelper.nStorageFormat == embed::StorageFormats::OFOPXML && aStreamHelper.xSignatureStorage.is()) + maSignatureHelper.ReadAndVerifySignatureStorage(aStreamHelper.xSignatureStorage); maSignatureHelper.EndMission(); maCurrentSignatureInformations = maSignatureHelper.GetSignatureInformations(); |