diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-13 16:10:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-13 16:04:01 +0000 |
| commit | 4eed1d85339f7f7572d5ddff543df447d4411e49 (patch) | |
| tree | fa1bea34b4a1b4a7cb568b21b2de3ae477178efe /sfx2/source/doc/objserv.cxx | |
| parent | f8857f30cbf7124ca01355f32998c11cb1843950 (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 'sfx2/source/doc/objserv.cxx')
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f6243ccf5cf4..9e1d8ef978af 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1371,7 +1371,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) && GetMedium()->GetFilter() && !GetMedium()->GetName().isEmpty() && ( (!GetMedium()->GetFilter()->IsOwnFormat() && !GetMedium()->GetFilter()->GetSupportsSigning()) - || !GetMedium()->HasStorage_Impl() + || (GetMedium()->GetFilter()->IsOwnFormat() && !GetMedium()->HasStorage_Impl()) ) ) { @@ -1382,7 +1382,8 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) // check whether the document is signed ImplGetSignatureState(); // document signature - ImplGetSignatureState( true ); // script signature + if (GetMedium() && GetMedium()->GetFilter() && GetMedium()->GetFilter()->IsOwnFormat()) + ImplGetSignatureState( true ); // script signature bool bHasSign = ( pImpl->nScriptingSignatureState != SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != SignatureState::NOSIGNATURES ); // the target ODF version on saving |