From 08ae56de57a9bcc49582769fa3b05b6b6fb62dbd Mon Sep 17 00:00:00 2001 From: Catalin Iacob Date: Fri, 10 Feb 2012 23:10:43 +0100 Subject: Remove unused code in XSecController --- xmlsecurity/source/helper/xsecctl.cxx | 64 ---------------------------------- xmlsecurity/source/helper/xsecctl.hxx | 10 ------ xmlsecurity/source/helper/xsecsign.cxx | 30 ---------------- 3 files changed, 104 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index fdec39e41c22..b84fc2a4261f 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -782,44 +782,6 @@ void XSecController::setSAXChainConnector( initializeSAXChain( ); } -void XSecController::setSAXChainConnector( - const cssu::Reference< cssxs::XParser >& xParser, - const cssu::Reference< cssxs::XDocumentHandler >& xDocumentHandler, - const cssu::Reference< cssxc::sax::XElementStackKeeper >& xElementStackKeeper) -/****** XSecController/setSAXChainConnector *********************************** - * - * NAME - * setSAXChainConnector -- configures the components which will - * collaborate with the SAXEventKeeper on the SAX chain. - * - * SYNOPSIS - * setSAXChainConnector( xParser, xDocumentHandler, xElementStackKeeper ); - * - * FUNCTION - * See NAME. - * - * INPUTS - * xParser - 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 - * - * RESULT - * empty - * - * AUTHOR - * Michael Mi - * Email: michael.mi@sun.com - ******************************************************************************/ -{ - m_bIsPreviousNodeInitializable = false; - m_xPreviousNodeOnSAXChain = xParser; - m_xNextNodeOnSAXChain = xDocumentHandler; - m_xElementStackKeeper = xElementStackKeeper; - - initializeSAXChain( ); -} - void XSecController::clearSAXChainConnector() /****** XSecController/clearSAXChainConnector ********************************* * @@ -920,32 +882,6 @@ void XSecController::endMission() } } -const char* XSecController::getErrorMessage() -/****** XSecController/getErrorMessage **************************************** - * - * NAME - * getErrorMessage -- get the last error message - * - * SYNOPSIS - * pErrorMessage = getErrorMessage( ); - * - * FUNCTION - * see NAME. - * - * INPUTS - * empty - * - * RESULT - * empty - * - * AUTHOR - * Michael Mi - * Email: michael.mi@sun.com - ******************************************************************************/ -{ - return m_pErrorMessage; -} - void XSecController::exportSignature( const cssu::Reference& xDocumentHandler, const SignatureInformation& signatureInfo ) diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 37ab6d328fdf..b500ef78b2b3 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -425,17 +425,8 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper); - void setSAXChainConnector( - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XParser >& xParser, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler, - const com::sun::star::uno::Reference< - com::sun::star::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper); - void clearSAXChainConnector(); void endMission(); - const char* getErrorMessage(); SignatureInformation getSignatureInformation( sal_Int32 nSecurityId ) const; SignatureInformations getSignatureInformations() const; @@ -449,7 +440,6 @@ public: /* * For signature generation */ - void collectToSign( sal_Int32 securityId, const rtl::OUString& referenceId ); void signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool isBinary); diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 7e9a93c06fe4..de609f1667b4 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -192,36 +192,6 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar return xReferenceResolvedListener; } -/* public: for signature generation */ -void XSecController::collectToSign( sal_Int32 securityId, const rtl::OUString& referenceId ) -{ - /* DBG_ASSERT( m_xSAXEventKeeper.is(), "the SAXEventKeeper is NULL" ); */ - - chainOn(true); - - if ( m_nStatusOfSecurityComponents == INITIALIZED ) - /* - * if all security components are ready, add a signature. - */ - { - sal_Int32 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector( - cssxc::sax::ElementMarkPriority_AFTERMODIFY, sal_False); - - int index = findSignatureInfor( securityId ); - - if ( index == -1 ) - { - InternalSignatureInformation isi(securityId, NULL); - isi.addReference(TYPE_SAMEDOCUMENT_REFERENCE, referenceId, nKeeperId ); - m_vInternalSignatureInformations.push_back( isi ); - } - else - { - m_vInternalSignatureInformations[index].addReference(TYPE_SAMEDOCUMENT_REFERENCE, referenceId, nKeeperId ); - } - } -} - void XSecController::signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& /*objectURL*/, sal_Bool isBinary) { sal_Int32 type = ((isBinary==sal_True)?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE); -- cgit v1.2.3