diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-17 18:14:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:45 +0100 |
| commit | 93afb9ad7f42b9789b1a84281f434f0a8098c063 (patch) | |
| tree | c769de04bca4661ccaaabac6ef5347c8978f7e17 /bridges/source/jni_uno/jni_uno2java.cxx | |
| parent | 4130c64355e08efb84ef1f7e304c01849c2529c6 (diff) | |
Some more loplugin:cstylecast: bridges
Change-Id: Ic224abf67acb212ee20ccf9eb81b5ed5edf851b9
Diffstat (limited to 'bridges/source/jni_uno/jni_uno2java.cxx')
| -rw-r--r-- | bridges/source/jni_uno/jni_uno2java.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 29ef813367da..c36e8a12e9b8 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -462,8 +462,8 @@ inline void UNO_proxy::acquire() const (*m_bridge->m_uno_env->registerProxyInterface)( m_bridge->m_uno_env, &that, UNO_proxy_free, m_oid.pData, - (typelib_InterfaceTypeDescription *)m_type_info->m_td.get() ); - assert( this == (void const * const)that ); + reinterpret_cast<typelib_InterfaceTypeDescription *>(m_type_info->m_td.get()) ); + assert( this == that ); } } @@ -490,7 +490,7 @@ uno_Interface * Bridge::map_to_uno( uno_Interface * pUnoI = 0; (*m_uno_env->getRegisteredInterface)( m_uno_env, (void **)&pUnoI, - oid.pData, (typelib_InterfaceTypeDescription *)info->m_td.get() ); + oid.pData, reinterpret_cast<typelib_InterfaceTypeDescription *>(info->m_td.get()) ); if (0 == pUnoI) // no existing interface, register new proxy { @@ -502,7 +502,7 @@ uno_Interface * Bridge::map_to_uno( (*m_uno_env->registerProxyInterface)( m_uno_env, (void **)&pUnoI, UNO_proxy_free, - oid.pData, (typelib_InterfaceTypeDescription *)info->m_td.get() ); + oid.pData, reinterpret_cast<typelib_InterfaceTypeDescription *>(info->m_td.get()) ); } return pUnoI; } @@ -520,7 +520,7 @@ extern "C" void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C() { - UNO_proxy const * that = reinterpret_cast< UNO_proxy const * >( proxy ); + UNO_proxy * that = reinterpret_cast< UNO_proxy * >( proxy ); Bridge const * bridge = that->m_bridge; assert(env == bridge->m_uno_env); (void) env; @@ -549,7 +549,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) bridge->release(); #if OSL_DEBUG_LEVEL > 0 - *(int *)that = 0xdeadcafe; + *reinterpret_cast<int *>(that) = 0xdeadcafe; #endif delete that; } @@ -668,7 +668,7 @@ void SAL_CALL UNO_proxy_dispatch( (*bridge->m_uno_env->getRegisteredInterface)( bridge->m_uno_env, (void **) &pInterface, that->m_oid.pData, - (typelib_InterfaceTypeDescription *)demanded_td.get() ); + reinterpret_cast<typelib_InterfaceTypeDescription *>(demanded_td.get()) ); if (0 == pInterface) { |