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

[Miklos Vajna]

 xmlsecurity/inc/xsecctl.hxx           |    6 ------
 xmlsecurity/source/helper/xsecctl.cxx |    8 +++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit d0211e091e42bb85e20090dd25792648a1310751
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 13 00:01:31 2017 +0200

    xmlsecurity: remove unused XSecController::m_xNextNodeOnSAXChain
    
    Change-Id: Ic5fd625afe2ef53968b87d1382b257e3d44ce08b
    Reviewed-on: https://gerrit.libreoffice.org/43354
    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 3abd31d9d75d..e2a571a5a238 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -164,12 +164,6 @@ private:
     bool m_bIsPreviousNodeInitializable;
 
     /*
-     * the next node on the SAX chain.
-     * it can always provide an XDocumentHandler interface.
-     */
-    css::uno::Reference< css::xml::sax::XDocumentHandler > m_xNextNodeOnSAXChain;
-
-    /*
      * the ElementStackKeeper is used to reserve the key SAX events.
      * when the SAXEventKeeper is chained on the SAX chain, it need
      * first get all missed key SAX events in order to make sure the
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 767c55fe1e87..536738933f8c 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -298,7 +298,7 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
             /*
              * connects the next document handler on the SAX chain
              */
-            m_xSAXEventKeeper->setNextHandler( m_xNextNodeOnSAXChain );
+            m_xSAXEventKeeper->setNextHandler(uno::Reference<xml::sax::XDocumentHandler>());
 
             m_bIsSAXEventKeeperConnected = true;
 
@@ -330,13 +330,13 @@ void XSecController::chainOff()
                         (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
 
                     cssu::Sequence<cssu::Any> aArgs( 1 );
-                    aArgs[0] <<= m_xNextNodeOnSAXChain;
+                    aArgs[0] <<= uno::Reference<xml::sax::XDocumentHandler>();
                     xInitialization->initialize(aArgs);
                 }
                 else
                 {
                     cssu::Reference< cssxs::XParser > xParser(m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
-                    xParser->setDocumentHandler( m_xNextNodeOnSAXChain );
+                    xParser->setDocumentHandler(uno::Reference<xml::sax::XDocumentHandler>());
                 }
             }
 
@@ -490,7 +490,6 @@ void XSecController::setSAXChainConnector(const cssu::Reference< cssl::XInitiali
 {
     m_bIsPreviousNodeInitializable = true;
     m_xPreviousNodeOnSAXChain = xInitialization;
-    m_xNextNodeOnSAXChain.clear();
     m_xElementStackKeeper.clear();
 
     initializeSAXChain( );
@@ -518,7 +517,6 @@ void XSecController::clearSAXChainConnector()
     chainOff();
 
     m_xPreviousNodeOnSAXChain = nullptr;
-    m_xNextNodeOnSAXChain = nullptr;
     m_xElementStackKeeper = nullptr;
 }