[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/inc/xsecctl.hxx              |    2 +-
 xmlsecurity/source/helper/xsecctl.cxx    |   10 +++-------
 xmlsecurity/source/helper/xsecsign.cxx   |    4 ++--
 xmlsecurity/source/helper/xsecverify.cxx |    4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 4216d6f590141df7403da65110574c2369b04ed8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 25 09:14:24 2017 +0200

    xmlsecurity: remove unused chainOn() argument
    
    Change-Id: Id4d4ae41eb6d667a96ce5d294dd5bf3fcf4cb686
    Reviewed-on: https://gerrit.libreoffice.org/43801
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index e05ae2e90541..68968a2bb2f0 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -228,7 +228,7 @@ private:
      */
     void createXSecComponent( );
     int findSignatureInfor( sal_Int32 nSecurityId ) const;
-    bool chainOn( bool bRetrievingLastEvent );
+    bool chainOn();
     void chainOff();
     void checkChainingStatus();
     void initializeSAXChain();
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index fe87473f3ff8..301085df668f 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -198,14 +198,14 @@ void XSecController::createXSecComponent( )
     }
 }
 
-bool XSecController::chainOn( bool /*bRetrievingLastEvent*/ )
+bool XSecController::chainOn()
 /****** XSecController/chainOn ************************************************
  *
  *   NAME
  *  chainOn -- tries to connect the SAXEventKeeper with the SAX chain.
  *
  *   SYNOPSIS
- *  bJustChainingOn = chainOn( bRetrievingLastEvent );
+ *  bJustChainingOn = chainOn();
  *
  *   FUNCTION
  *  First, checks whether the SAXEventKeeper is on the SAX chain. If not,
@@ -215,10 +215,6 @@ bool XSecController::chainOn( bool /*bRetrievingLastEvent*/ )
  *  missed key SAX events, which can promise the DOM tree bufferred by the
  *  SAXEventKeeper has the same structure with the original document.
  *
- *   INPUTS
- *  bRetrievingLastEvent - whether to retrieve the last key SAX event from
- *                         the ElementStackKeeper.
- *
  *   RESULT
  *  bJustChainingOn - whether the SAXEventKeeper is just chained into the
  *                    SAX chain.
@@ -349,7 +345,7 @@ void XSecController::checkChainingStatus()
 {
     if ( m_bIsCollectingElement || m_bIsBlocking )
     {
-        chainOn(true);
+        chainOn();
     }
     else
     {
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 65cb3ddac800..b5e50f3c8bf0 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -299,7 +299,7 @@ bool XSecController::WriteSignature(
     /*
      * chain the SAXEventKeeper to the SAX chain
      */
-    chainOn(true);
+    chainOn();
 
     if ( m_eStatusOfSecurityComponents == InitializationState::INITIALIZED )
     /*
@@ -354,7 +354,7 @@ bool XSecController::WriteOOXMLSignature(const uno::Reference<embed::XStorage>&
     SAL_WARN_IF(!xDocumentHandler.is(), "xmlsecurity.helper", "empty xDocumentHandler reference");
 
     // Chain the SAXEventKeeper to the SAX chain.
-    chainOn(/*bRetrievingLastEvent=*/true);
+    chainOn();
 
     if (m_eStatusOfSecurityComponents == InitializationState::INITIALIZED)
     {
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index accb6d9103ae..54987c619edd 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -98,7 +98,7 @@ void XSecController::addSignature()
 
     if (m_bVerifyCurrentSignature)
     {
-        chainOn(true);
+        chainOn();
         xReferenceResolvedListener = prepareSignatureToRead( m_nReservedSignatureId );
         m_bVerifyCurrentSignature = false;
         nSignatureId = m_nReservedSignatureId;
@@ -416,7 +416,7 @@ void XSecController::collectToVerify( const OUString& referenceId )
 
                 if (refInfor.ouURI == referenceId)
                 {
-                    if (chainOn(false))
+                    if (chainOn())
                     {
                         bJustChainingOn = true;
                         xHandler = m_xSAXEventKeeper->setNextHandler(nullptr);