diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 09:28:59 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-17 09:28:59 +0000 |
commit | 71c4729ab96862397979280114e694a2bd016fed (patch) | |
tree | 1a5bd1453e16f25c3f56a11874b9173527e739d0 /xmlsecurity | |
parent | 3f4959127d2e2962d6eb6a593e9f3f2fa670fd24 (diff) |
INTEGRATION: CWS jl51 (1.7.30); FILE MERGED
2007/02/05 13:54:23 jl 1.7.30.1: #i69228 warning free code
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 32 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 26 |
2 files changed, 41 insertions, 17 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 3f58202e0db8..7b5681b0aa7d 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlencryption_nssimpl.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:46:24 $ + * last change: $Author: ihi $ $Date: 2007-04-17 10:28:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( xmlSecKeysMngrPtr pMngr = NULL ; xmlSecEncCtxPtr pEncCtx = NULL ; xmlNodePtr pEncryptedData = NULL ; - xmlNodePtr pEncryptedKey = NULL ; xmlNodePtr pContent = NULL ; if( !aTemplate.is() ) @@ -126,7 +125,9 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( throw RuntimeException() ; #endif - SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ; + SecurityEnvironment_NssImpl* pSecEnv = + reinterpret_cast<SecurityEnvironment_NssImpl*>( + sal::static_int_cast<sal_uIntPtr>(xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ; if( pSecEnv == NULL ) throw RuntimeException() ; @@ -141,7 +142,10 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( throw RuntimeException() ; } - XMLElementWrapper_XmlSecImpl* pTemplate = ( XMLElementWrapper_XmlSecImpl* )xTplTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ) ; + XMLElementWrapper_XmlSecImpl* pTemplate = + reinterpret_cast<XMLElementWrapper_XmlSecImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xTplTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))); if( pTemplate == NULL ) { throw RuntimeException() ; } @@ -157,7 +161,10 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( throw XMLEncryptionException() ; } - XMLElementWrapper_XmlSecImpl* pTarget = ( XMLElementWrapper_XmlSecImpl* )xTgtTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ) ; + XMLElementWrapper_XmlSecImpl* pTarget = + reinterpret_cast<XMLElementWrapper_XmlSecImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xTgtTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))); if( pTarget == NULL ) { throw RuntimeException() ; } @@ -273,7 +280,6 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( xmlSecKeysMngrPtr pMngr = NULL ; xmlSecEncCtxPtr pEncCtx = NULL ; xmlNodePtr pEncryptedData = NULL ; - xmlNodePtr pContent = NULL ; if( !aTemplate.is() ) throw RuntimeException() ; @@ -292,7 +298,10 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( throw RuntimeException() ; } - XMLElementWrapper_XmlSecImpl* pTemplate = ( XMLElementWrapper_XmlSecImpl* )xTplTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ) ; + XMLElementWrapper_XmlSecImpl* pTemplate = + reinterpret_cast<XMLElementWrapper_XmlSecImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xTplTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))); if( pTemplate == NULL ) { throw RuntimeException() ; } @@ -329,7 +338,10 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( throw RuntimeException() ; } - SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ; + SecurityEnvironment_NssImpl* pSecEnv = + reinterpret_cast<SecurityEnvironment_NssImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))); if( pSecEnv == NULL ) throw RuntimeException() ; @@ -378,7 +390,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( } /* XInitialization */ -void SAL_CALL XMLEncryption_NssImpl :: initialize( const Sequence< Any >& aArguments ) throw( Exception, RuntimeException ) { +void SAL_CALL XMLEncryption_NssImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) { // TBD } ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index a7dff27977cd..39c093fc63f5 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlsignature_nssimpl.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:46:52 $ + * last change: $Author: ihi $ $Date: 2007-04-17 10:28:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,7 +127,10 @@ SAL_CALL XMLSignature_NssImpl :: generate( throw RuntimeException() ; } - XMLElementWrapper_XmlSecImpl* pElement = ( XMLElementWrapper_XmlSecImpl* )xNodTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ) ; + XMLElementWrapper_XmlSecImpl* pElement = + reinterpret_cast<XMLElementWrapper_XmlSecImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xNodTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))); if( pElement == NULL ) { throw RuntimeException() ; } @@ -154,7 +157,10 @@ SAL_CALL XMLSignature_NssImpl :: generate( throw RuntimeException() ; #endif - SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ; + SecurityEnvironment_NssImpl* pSecEnv = + reinterpret_cast<SecurityEnvironment_NssImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))); if( pSecEnv == NULL ) throw RuntimeException() ; @@ -229,7 +235,10 @@ SAL_CALL XMLSignature_NssImpl :: validate( throw RuntimeException() ; } - XMLElementWrapper_XmlSecImpl* pElement = ( XMLElementWrapper_XmlSecImpl* )xNodTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ) ; + XMLElementWrapper_XmlSecImpl* pElement = + reinterpret_cast<XMLElementWrapper_XmlSecImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xNodTunnel->getSomething( XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))); if( pElement == NULL ) throw RuntimeException() ; @@ -258,7 +267,10 @@ SAL_CALL XMLSignature_NssImpl :: validate( throw RuntimeException() ; } - SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ; + SecurityEnvironment_NssImpl* pSecEnv = + reinterpret_cast<SecurityEnvironment_NssImpl*>( + sal::static_int_cast<sal_uIntPtr>( + xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))); if( pSecEnv == NULL ) throw RuntimeException() ; @@ -309,7 +321,7 @@ SAL_CALL XMLSignature_NssImpl :: validate( } /* XInitialization */ -void SAL_CALL XMLSignature_NssImpl :: initialize( const Sequence< Any >& aArguments ) throw( Exception, RuntimeException ) { +void SAL_CALL XMLSignature_NssImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) { // TBD } ; |