mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce to static_cast any reinterpret_cast from void pointers

Browse Source 
Change-Id: Iad5d2858976ed789823aaac3aa7f2937233f1dfc
This commit is contained in:
Stephan Bergmann
2015-03-31 13:13:53 +02:00
parent b06866b648
commit 91261d6da0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
embeddedobj/source/commonembedding/register.cxx
View File

@@ -42,21 +42,21 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
{ {
if ( aImplName.equals( OOoEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) 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_staticGetImplementationName(),
OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance, OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
} }
else if ( aImplName.equals( OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) 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_staticGetImplementationName(),
OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance, OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
} }
else if ( aImplName.equals( UNOEmbeddedObjectCreator::impl_staticGetImplementationName() ) ) 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_staticGetImplementationName(),
UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance, UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance,
UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() ); UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() );

2
embeddedobj/source/msole/oleregister.cxx
View File

@@ -45,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
{ {
if ( aImplName.equals( OleEmbeddedObjectFactory::impl_staticGetImplementationName() ) ) 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_staticGetImplementationName(),
OleEmbeddedObjectFactory::impl_staticCreateSelfInstance, OleEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() ); OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );