diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-16 16:34:35 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-11-08 13:55:14 +0100 |
| commit | f6c5c8b14bd47aa31a37801ca27294e156d92dbb (patch) | |
| tree | 2149451da6153cc792c1b8293753db85ec7009fe /include | |
| parent | a797afa58cd441cb7de5e1fe2845c3eff2e9001b (diff) | |
tdf#83877 Write SignatureLineId to ODF & OOXML signatures
Reviewed-on: https://gerrit.libreoffice.org/54432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 201321f648e82ecc610e7a3324a46248a19c1704)
Conflicts:
cui/source/dialogs/SignSignatureLineDialog.cxx
xmlsecurity/source/component/documentdigitalsignatures.cxx
xmlsecurity/source/helper/documentsignaturemanager.cxx
Change-Id: I483a3b7895cdcb10ef9d6dacf167ed0f8db7e723
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/docfile.hxx | 1 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 57c52b81cb95..4eb3357fa6d5 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -265,6 +265,7 @@ public: SAL_DLLPRIVATE bool SignContents_Impl(const css::uno::Reference<css::security::XCertificate> xCert, + const OUString& aSignatureLineId, bool bScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7263e78bdcbc..5208e1a58184 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -359,7 +359,8 @@ public: // xmlsec05, check with SFX team SignatureState GetDocumentSignatureState(); void SignDocumentContent(); - void SignDocumentContent(css::uno::Reference<css::security::XCertificate> xCert); + void SignDocumentContent(css::uno::Reference<css::security::XCertificate> xCert, + const OUString& aSignatureLineId); SignatureState GetScriptingSignatureState(); void SignScriptingContent(); DECL_LINK(SignDocumentHandler, Button*, void); @@ -742,9 +743,9 @@ public: const css::uno::Reference< css::security::XDocumentDigitalSignatures >& xSigner = css::uno::Reference< css::security::XDocumentDigitalSignatures >() ); - SAL_DLLPRIVATE void - ImplSign(const css::uno::Reference<css::security::XCertificate> xCert, - bool bScriptingContent = false); + SAL_DLLPRIVATE void ImplSign(const css::uno::Reference<css::security::XCertificate> xCert + = css::uno::Reference<css::security::XCertificate>(), + const OUString& aSignatureLineId = OUString(), bool bScriptingContent = false); SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); SAL_DLLPRIVATE bool QueryAllowExoticFormat_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, |