diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-04 17:57:31 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-06 13:43:35 +0100 |
commit | 50c26300e5b5ae9671f18a9e449516604d16105f (patch) | |
tree | e4f0cf83c41bbd70bbe6021f85b8e97815134f42 /xmlsecurity | |
parent | e78706a8bf35d8471982e36c4543f2db8a35f1c2 (diff) |
Remove lots of dead code
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx | 5 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 5 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/saxhelper.cxx | 15 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6 |
5 files changed, 0 insertions, 37 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx index d8ec2db95384..09c2365bb642 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx @@ -62,7 +62,6 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLSignature_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_MSCryptImpl::impl_getImplementationName() ; @@ -124,10 +123,6 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* } return sal_True; - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; } diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index c71adbbe20d5..93beee5ba058 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -206,9 +206,6 @@ Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl :: impl_createInsta } Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) { - //Reference< XSingleServiceFactory > xFactory ; - //xFactory = ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName , impl_createInstance , impl_getSupportedServiceNames ) ; - //return xFactory ; return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ; } @@ -794,7 +791,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, int ncvinCount=0; #if ( NSS_VMAJOR > 3 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR > 12 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH > 0 ) - // cert_pi_useAIACertFetch was added in NSS 3.12.1 cvin[ncvinCount].type = cert_pi_useAIACertFetch; cvin[ncvinCount].value.scalar.b = PR_TRUE; ncvinCount++; @@ -828,7 +824,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, rev.leafTests.preferred_methods = NULL; rev.leafTests.cert_rev_method_independent_flags = CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST; -// | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE; rev.chainTests.number_of_defined_methods = 2; rev.chainTests.cert_rev_flags_per_method = revFlagsChain; @@ -842,7 +837,6 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, rev.chainTests.preferred_methods = NULL; rev.chainTests.cert_rev_method_independent_flags = CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST; -// | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE; cvin[ncvinCount].type = cert_pi_revocationFlags; diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index f661d7e8decf..40051977b560 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -62,7 +62,6 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLSignature_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_NssImpl::impl_getImplementationName() ; @@ -124,10 +123,6 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe } return sal_True; - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; } diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 7384c6f310a7..6b09fea26718 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -432,21 +432,6 @@ void SAXHelper::setDocumentLocator( const cssu::Reference< cssxs::XLocator > &) throw( cssxs::SAXException , cssu::RuntimeException ) { - //--Pseudo code if necessary - //--m_pSaxLocator is a member defined as xmlSAXHabdlerPtr - //--m_pSaxLocatorHdl is a member defined as Sax_Locator - - //if( m_pSaxLocator != NULL ) { - // //Deallocate the memory - //} - //if( m_pSaxLocatorHdl != NULL ) { - // //Deallocate the memory - //} - - //m_pSaxLocatorHdl = new Sax_Locator( xLocator ) ; - //m_pSaxLocator = { m_pSaxLocatorHdl->getPublicId , m_pSaxLocatorHdl->getSystemId , m_pSaxLocatorHdl->getLineNumber , m_pSaxLocatorHdl->getColumnNumber } ; - - //m_pSaxHandler->setDocumentLocator( m_pParserCtxt , m_pSaxLocator ) ; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index cfac243a851c..a0320d59ce48 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -121,7 +121,6 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; if( xKey.is() ) { - // try { // XMLElementWrapper_XmlSecImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ; @@ -169,11 +168,6 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe if( !result ) return sal_False ; #endif - - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} } return result; |