diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:18:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:18:04 +0200 |
commit | 698a6d4ab6e2f8485ed4e1d8322ac74c7087d621 (patch) | |
tree | 136124a3e3c0a49b4766bffb00133f63da4c9132 /xmlsecurity/source | |
parent | 6485183373a5b42c1741a9a51ac9d318b895c6dd (diff) |
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I374bfba6ee7470044a677b7351cd59aac2e1b042
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r-- | xmlsecurity/source/component/registerservices.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/framework/xsec_framework.cxx | 14 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 8eb5d6a8f85c..722c29172297 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -50,7 +50,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ { // CertificateContainer xFactory = cppu::createOneInstanceFactory( - reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ), + static_cast< lang::XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), CertificateContainer::impl_createInstance, CertificateContainer::impl_getStaticSupportedServiceNames() ); diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index 75f64b72b26b..8174a50a6cf1 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -49,7 +49,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals(DecryptorImpl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), DecryptorImpl_createInstance, DecryptorImpl_getSupportedServiceNames() ) ); @@ -64,7 +64,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals(EncryptorImpl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), EncryptorImpl_createInstance, EncryptorImpl_getSupportedServiceNames() ) ); @@ -79,7 +79,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals(SignatureCreatorImpl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), SignatureCreatorImpl_createInstance, SignatureCreatorImpl_getSupportedServiceNames() ) ); @@ -94,7 +94,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals(SignatureVerifierImpl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), SignatureVerifierImpl_createInstance, SignatureVerifierImpl_getSupportedServiceNames() ) ); @@ -109,7 +109,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals(SAXEventKeeperImpl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), SAXEventKeeperImpl_createInstance, SAXEventKeeperImpl_getSupportedServiceNames() ) ); @@ -124,7 +124,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals( XMLSignatureTemplateImpl::impl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory = XMLSignatureTemplateImpl::impl_createFactory( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; if (xFactory.is()) { @@ -137,7 +137,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( if ( pServiceManager && implName.equals( XMLEncryptionTemplateImpl::impl_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory = XMLEncryptionTemplateImpl::impl_createFactory( - reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; if (xFactory.is()) { diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index e88678bdcca8..840c6b961485 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -52,25 +52,25 @@ void* SAL_CALL nss_component_getFactory( const sal_Char* pImplName , void* pServ if( SEInitializer_NssImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { xFactory = Reference< XSingleServiceFactory >( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), SEInitializer_NssImpl_createInstance, SEInitializer_NssImpl_getSupportedServiceNames() ) ); } else if( XMLSignature_NssImpl::impl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = XMLSignature_NssImpl::impl_createFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + xFactory = XMLSignature_NssImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; } else if( XMLSecurityContext_NssImpl::impl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = XMLSecurityContext_NssImpl::impl_createFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + xFactory = XMLSecurityContext_NssImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; } else if( SecurityEnvironment_NssImpl::impl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = SecurityEnvironment_NssImpl::impl_createFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + xFactory = SecurityEnvironment_NssImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; } else if( XMLEncryption_NssImpl::impl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = XMLEncryption_NssImpl::impl_createFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; + xFactory = XMLEncryption_NssImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; } #else if( ONSSInitializer_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) |