summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-10-13 16:10:18 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-10-13 16:04:01 +0000
commit4eed1d85339f7f7572d5ddff543df447d4411e49 (patch)
treefa1bea34b4a1b4a7cb568b21b2de3ae477178efe /xmlsecurity
parentf8857f30cbf7124ca01355f32998c11cb1843950 (diff)
sfx2: initial PDF document signatures dialog
This just allows the menu entry in Draw to reach SfxMedium::SignContents_Impl(), and then call signDocumentContent(), which shows the dialog (where the signature itself isn't visible yet). Do this by not assuming a ZIP-based storage at various places when we're not working with an "own" format. Change-Id: I030d0f636d1aab98369024f3f10a975ea2786d59 Reviewed-on: https://gerrit.libreoffice.org/29774 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 17b3783c4ce5..5d52098227af 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -228,7 +228,10 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security context!" );
if ( bInit )
{
- aSignaturesDialog->SetStorage( rxStorage );
+ if (rxStorage.is())
+ // Something ZIP based: ODF or OOXML.
+ aSignaturesDialog->SetStorage( rxStorage );
+
aSignaturesDialog->SetSignatureStream( xSignStream );
if ( aSignaturesDialog->Execute() )
{