diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-09-14 10:30:36 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-09-17 10:05:37 +0200 |
commit | 9b4c6892630a98c1218aca72827f718184a4b5f0 (patch) | |
tree | 5ab551bb7d931de723de93e89afbfab799fd6d7b /offapi | |
parent | 2419fa71d8b2223a50f596d5db7721f6213d4f87 (diff) |
tdf#118569 Signature Line: When signing ooxml, only show X.509 certificates
Also fixes a bug where signing was aborted after saving as docx.
Change-Id: Ic42b7de2400be0bc55da03b017a545ceaedef9f9
Reviewed-on: https://gerrit.libreoffice.org/60480
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/com/sun/star/security/CertificateKind.idl | 8 | ||||
-rw-r--r-- | offapi/com/sun/star/security/XDocumentDigitalSignatures.idl | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/offapi/com/sun/star/security/CertificateKind.idl b/offapi/com/sun/star/security/CertificateKind.idl index 9f6230452c4b..111591866875 100644 --- a/offapi/com/sun/star/security/CertificateKind.idl +++ b/offapi/com/sun/star/security/CertificateKind.idl @@ -25,7 +25,13 @@ enum CertificateKind /** OpenPGP format of a certificate */ - OPENPGP + OPENPGP, + + /** No format specified + * + * @since LibreOffice 6.2 + */ + NONE }; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl index 0e4d6c82d553..ebd42c6ecef6 100644 --- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl +++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl @@ -168,6 +168,15 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface */ com::sun::star::security::XCertificate selectSigningCertificate( [out] string Description ); + /** This shows the certificate selection dialog and allows to only select the certificate + without actually signing the document. Only certificates of the given type will be shown. + + @since LibreOffice 6.2 + */ + com::sun::star::security::XCertificate selectSigningCertificateWithType( + [in] CertificateKind certificateKind, + [out] string Description); + /** This method shows the CertificateChooser dialog with all certificates, private and other people's. Useful when choosing certificate/key for encryption |