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

[Miklos Vajna]

 xmlsecurity/inc/xsecctl.hxx              |    5 +----
 xmlsecurity/source/helper/xsecctl.cxx    |   16 ++++------------
 xmlsecurity/source/helper/xsecverify.cxx |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit f1ad49892d983e67244b9d65033dcecda6c28e19
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 6 09:19:04 2017 +0200

    xmlsecurity: last 2 params of setSAXChainConnector() is always nullptr
    
    So remove them.
    
    Change-Id: Iec2430af6634608bdc8c4beff6078ccceb7a2391
    Reviewed-on: https://gerrit.libreoffice.org/43182
    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 5e8cdb6ccfe7..3abd31d9d75d 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -339,10 +339,7 @@ public:
         const css::uno::Reference<
             css::xml::crypto::XXMLSecurityContext >& xSecurityContext );
 
-    void setSAXChainConnector(
-        const css::uno::Reference< css::lang::XInitialization >& xInitialization,
-        const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler,
-        const css::uno::Reference< css::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper);
+    void setSAXChainConnector(const css::uno::Reference< css::lang::XInitialization >& xInitialization);
 
     void clearSAXChainConnector();
     void endMission();
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 616ffcfb2ae4..767c55fe1e87 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -474,10 +474,7 @@ void XSecController::startMission(
     m_bVerifyCurrentSignature = false;
 }
 
-void XSecController::setSAXChainConnector(
-    const cssu::Reference< cssl::XInitialization >& xInitialization,
-    const cssu::Reference< cssxs::XDocumentHandler >& xDocumentHandler,
-    const cssu::Reference< cssxc::sax::XElementStackKeeper >& xElementStackKeeper)
+void XSecController::setSAXChainConnector(const cssu::Reference< cssl::XInitialization >& xInitialization)
 /****** XSecController/setSAXChainConnector ***********************************
  *
  *   NAME
@@ -485,21 +482,16 @@ void XSecController::setSAXChainConnector(
  *  collaborate with the SAXEventKeeper on the SAX chain.
  *
  *   SYNOPSIS
- *  setSAXChainConnector( xInitialization,
- *                        xDocumentHandler,
- *                        xElementStackKeeper );
+ *  setSAXChainConnector(xInitialization);
  *
  *   INPUTS
  *  xInitialization     - the previous node on the SAX chain
- *  xDocumentHandler    - the next node on the SAX chain
- *  xElementStackKeeper - the ElementStackKeeper component which reserves
- *                        missed key SAX events for the SAXEventKeeper
  ******************************************************************************/
 {
     m_bIsPreviousNodeInitializable = true;
     m_xPreviousNodeOnSAXChain = xInitialization;
-    m_xNextNodeOnSAXChain = xDocumentHandler;
-    m_xElementStackKeeper = xElementStackKeeper;
+    m_xNextNodeOnSAXChain.clear();
+    m_xElementStackKeeper.clear();
 
     initializeSAXChain( );
 }
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 3ec123bc4029..b4f8158b7c6c 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -466,7 +466,7 @@ cssu::Reference< cssxs::XDocumentHandler > const & XSecController::createSignatu
         m_xSecParser = new XSecParser(rXMLSignatureHelper, this);
     cssu::Reference< cssl::XInitialization > xInitialization(m_xSecParser, uno::UNO_QUERY);
 
-    setSAXChainConnector(xInitialization, nullptr, nullptr);
+    setSAXChainConnector(xInitialization);
 
     return m_xSecParser;
 }