diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 6e6dd2f57178..217192bbb1a7 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -35,9 +35,7 @@ using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::xml::crypto::XXMLSecurityContext ; XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl() - ://i39448 : m_pKeysMngr( NULL ) , - m_nDefaultEnvIndex(-1) - //m_xSecurityEnvironment( NULL ) + : m_nDefaultEnvIndex(-1) { //Init xmlsec library if( xmlSecInit() < 0 ) { @@ -58,15 +56,13 @@ XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl() } } -XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() { - //i39448 - +XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() +{ xmlDisableStreamInputCallbacks() ; xmlSecCryptoShutdown() ; xmlSecShutdown() ; } -//i39448 : new methods sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception) @@ -126,9 +122,6 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa m_nDefaultEnvIndex = nDefaultEnvIndex; } -//i39448 : old methods deleted - - /* XServiceInfo */ OUString SAL_CALL XMLSecurityContext_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; |