diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-17 12:33:30 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-22 06:53:08 +0200 |
| commit | 99337b029a3f94257160077ecf11ee3c59c77b7c (patch) | |
| tree | f8b9ff701771835e6eed7e9478fef5078cca43e0 | |
| parent | 039117eb27a11ee61d4f099c8616861cba961702 (diff) | |
Rename parameter bScriptingContent -> bSignScriptingContent
Change-Id: I227e59417719625a9752e727060f5e4f5094092d
Reviewed-on: https://gerrit.libreoffice.org/54479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
| -rw-r--r-- | include/sfx2/docfile.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index f7e34b957766..7fe4911d3c55 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -266,7 +266,7 @@ public: SAL_DLLPRIVATE bool SignContents_Impl(const css::uno::Reference<css::security::XCertificate> xCert, const OUString& aSignatureLineId, - bool bScriptingContent, const OUString& aODFVersion, + bool bSignScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature); // the following two methods must be used and make sense only during saving currently diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9498b287231a..76ca23eb8e1a 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3662,7 +3662,7 @@ void SfxMedium::CreateTempFileNoCopy() } bool SfxMedium::SignContents_Impl(const Reference<XCertificate> xCert, const OUString& aSignatureLineId, - bool bScriptingContent, const OUString& aODFVersion, + bool bSignScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature) { bool bChanges = false; @@ -3715,7 +3715,7 @@ bool SfxMedium::SignContents_Impl(const Reference<XCertificate> xCert, const OUS throw uno::RuntimeException(); } - if ( bScriptingContent ) + if ( bSignScriptingContent ) { // If the signature has already the document signature it will be removed // after the scripting signature is inserted. |