diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-18 17:17:24 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-22 09:43:22 +0200 |
| commit | 090e243c401fdb73a917a5deb36279c445cfcbb9 (patch) | |
| tree | 1c5e9e1710e648b9eac664b8d23cc485cbdaf233 /sfx2 | |
| parent | 6499ea2ff45fa42094d41c5c417f66a3ae5a22ae (diff) | |
tdf#83877 Use Signer comments as signature description
Change-Id: Ia9f18addeee9cf86989c873419113ddbd07c219f
Reviewed-on: https://gerrit.libreoffice.org/54551
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c56be8e20329..72a6c131fc41 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3668,7 +3668,8 @@ bool SfxMedium::SignContents_Impl(bool bSignScriptingContent, const OUString& aSignatureLineId, const Reference<XCertificate> xCert, const Reference<XGraphic> xValidGraphic, - const Reference<XGraphic> xInvalidGraphic) + const Reference<XGraphic> xInvalidGraphic, + const OUString& aComment) { bool bChanges = false; @@ -3759,7 +3760,8 @@ bool SfxMedium::SignContents_Impl(bool bSignScriptingContent, bool bSuccess = false; if (xCert.is()) bSuccess = xSigner->signSignatureLine( - GetZipStorageToSign_Impl(), xStream, aSignatureLineId, xCert, xValidGraphic, xInvalidGraphic); + GetZipStorageToSign_Impl(), xStream, aSignatureLineId, xCert, + xValidGraphic, xInvalidGraphic, aComment); else bSuccess = xSigner->signDocumentContent(GetZipStorageToSign_Impl(), xStream); @@ -3785,7 +3787,8 @@ bool SfxMedium::SignContents_Impl(bool bSignScriptingContent, if (xCert.is()) { bSuccess = xSigner->signSignatureLine( - GetZipStorageToSign_Impl(/*bReadOnly=*/false), xStream, aSignatureLineId, xCert, xValidGraphic, xInvalidGraphic); + GetZipStorageToSign_Impl(/*bReadOnly=*/false), xStream, aSignatureLineId, + xCert, xValidGraphic, xInvalidGraphic, aComment); } else { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8a259909c534..29a398c92f8c 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1565,7 +1565,8 @@ void SfxObjectShell::SignDocumentContent() void SfxObjectShell::SignSignatureLine(const OUString& aSignatureLineId, const Reference<XCertificate> xCert, const Reference<XGraphic> xValidGraphic, - const Reference<XGraphic> xInvalidGraphic) + const Reference<XGraphic> xInvalidGraphic, + const OUString& aComment) { if (!PrepareForSigning()) return; @@ -1574,7 +1575,7 @@ void SfxObjectShell::SignSignatureLine(const OUString& aSignatureLineId, return; bool bSignSuccess = GetMedium()->SignContents_Impl( - false, HasValidSignatures(), aSignatureLineId, xCert, xValidGraphic, xInvalidGraphic); + false, HasValidSignatures(), aSignatureLineId, xCert, xValidGraphic, xInvalidGraphic, aComment); AfterSigning(bSignSuccess, false); } |