summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-31 13:13:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 13:13:53 +0200
commit91261d6da08c5efae2a8ddcdd1711528718975cc (patch)
tree0a491a068b0a2d42b9a6a78579caad38f622e453 /embeddedobj
parentb06866b648aed78264654d20de28846d0754ac32 (diff)
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: Iad5d2858976ed789823aaac3aa7f2937233f1dfc
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/register.cxx6
-rw-r--r--embeddedobj/source/msole/oleregister.cxx2
2 files changed, 4 insertions, 4 deletions
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() );