diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-18 09:24:49 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-18 10:25:20 +0200 |
commit | 73ade0b02905785b0a29a3230049a4fe637d34f6 (patch) | |
tree | eb57175bf25b1084cb30ac31ece15e31c6d0587d /xmlsecurity/source | |
parent | 15869ea2dcd8a6b33044d08eef6fcaf8ca54579d (diff) |
xmlsecurity: remove unused m_xElementStackKeeper
Change-Id: Ibd7d39e288a4121428e83408ce67205eab3340c6
Reviewed-on: https://gerrit.libreoffice.org/43479
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r-- | xmlsecurity/source/helper/xsecctl.cxx | 48 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecverify.cxx | 4 |
2 files changed, 1 insertions, 51 deletions
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 536738933f8c..26b29fba6765 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -198,7 +198,7 @@ void XSecController::createXSecComponent( ) } } -bool XSecController::chainOn( bool bRetrievingLastEvent ) +bool XSecController::chainOn( bool /*bRetrievingLastEvent*/ ) /****** XSecController/chainOn ************************************************ * * NAME @@ -281,21 +281,6 @@ bool XSecController::chainOn( bool bRetrievingLastEvent ) } /* - * get missed key SAX events - */ - if (m_xElementStackKeeper.is()) - { - m_xElementStackKeeper->retrieve(xSEKHandler, bRetrievingLastEvent); - - /* - * now the ElementStackKeeper can stop its work, because the - * SAXEventKeeper is on the SAX chain, no SAX events will be - * missed. - */ - m_xElementStackKeeper->stop(); - } - - /* * connects the next document handler on the SAX chain */ m_xSAXEventKeeper->setNextHandler(uno::Reference<xml::sax::XDocumentHandler>()); @@ -340,15 +325,6 @@ void XSecController::chainOff() } } - if (m_xElementStackKeeper.is()) - { - /* - * start the ElementStackKeeper to reserve any possible - * missed key SAX events - */ - m_xElementStackKeeper->start(); - } - m_bIsSAXEventKeeperConnected = false; } } @@ -398,14 +374,6 @@ void XSecController::initializeSAXChain() m_bIsCollectingElement = false; m_bIsBlocking = false; - if (m_xElementStackKeeper.is()) - { - /* - * starts the ElementStackKeeper - */ - m_xElementStackKeeper->start(); - } - chainOff(); } @@ -490,7 +458,6 @@ void XSecController::setSAXChainConnector(const cssu::Reference< cssl::XInitiali { m_bIsPreviousNodeInitializable = true; m_xPreviousNodeOnSAXChain = xInitialization; - m_xElementStackKeeper.clear(); initializeSAXChain( ); } @@ -502,22 +469,9 @@ void XSecController::clearSAXChainConnector() * clearSAXChainConnector -- resets the collaborating components. ******************************************************************************/ { - /* - * before resetting, if the ElementStackKeeper has kept something, then - * those kept key SAX events must be transferred to the SAXEventKeeper - * first. This is to promise the next node to the SAXEventKeeper on the - * SAX chain always receives a complete document. - */ - if (m_xElementStackKeeper.is() && m_xSAXEventKeeper.is()) - { - cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), cssu::UNO_QUERY); - m_xElementStackKeeper->retrieve(xSEKHandler, true); - } - chainOff(); m_xPreviousNodeOnSAXChain = nullptr; - m_xElementStackKeeper = nullptr; } void XSecController::endMission() diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index b4f8158b7c6c..6b2031b82607 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -441,10 +441,6 @@ void XSecController::collectToVerify( const OUString& referenceId ) if ( bJustChainingOn ) { cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), cssu::UNO_QUERY); - if (m_xElementStackKeeper.is()) - { - m_xElementStackKeeper->retrieve(xSEKHandler, true); - } m_xSAXEventKeeper->setNextHandler(xHandler); } } |