[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Samuel Mehrbrodt]

 include/sfx2/docfile.hxx    |    2 +-
 sfx2/source/doc/docfile.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 99337b029a3f94257160077ecf11ee3c59c77b7c
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu May 17 12:33:30 2018 +0200

    Rename parameter bScriptingContent -> bSignScriptingContent
    
    Change-Id: I227e59417719625a9752e727060f5e4f5094092d
    Reviewed-on: https://gerrit.libreoffice.org/54479
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

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.