From 91261d6da08c5efae2a8ddcdd1711528718975cc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 31 Mar 2015 13:13:53 +0200 Subject: Reduce to static_cast any reinterpret_cast from void pointers Change-Id: Iad5d2858976ed789823aaac3aa7f2937233f1dfc --- embeddedobj/source/commonembedding/register.cxx | 6 +++--- embeddedobj/source/msole/oleregister.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'embeddedobj') diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index d21480694389..e1321f49c898 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -42,21 +42,21 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( { if ( aImplName.equals( OOoEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) { - xFactory= ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ), + xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ), OOoEmbeddedObjectFactory::impl_staticGetImplementationName(), OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance, OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); } else if ( aImplName.equals( OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) { - xFactory= ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ), + xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ), OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName(), OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance, OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); } else if ( aImplName.equals( UNOEmbeddedObjectCreator::impl_staticGetImplementationName() ) ) { - xFactory= ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ), + xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ), UNOEmbeddedObjectCreator::impl_staticGetImplementationName(), UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance, UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() ); diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index b82aa32b6523..4ccdbdbc79e0 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -45,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( { if ( aImplName.equals( OleEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) { - xFactory= ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ), + xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ), OleEmbeddedObjectFactory::impl_staticGetImplementationName(), OleEmbeddedObjectFactory::impl_staticCreateSelfInstance, OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); -- cgit