diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-17 18:18:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:46 +0100 |
| commit | 9193a15fc55b24e9f463838fd2981ddb84dca227 (patch) | |
| tree | 55f1a5b401e65bcc7cd52c87def321f15a3b1f72 /include | |
| parent | 141b01ac65d5922aacdf6010043eadc7c28304a5 (diff) | |
Some more loplugin:cstylecast: cppu
Change-Id: Iec1251648031afa9eddd7445135fb08dc74821bd
Diffstat (limited to 'include')
| -rw-r--r-- | include/cppu/Enterable.hxx | 4 | ||||
| -rw-r--r-- | include/uno/environment.hxx | 2 | ||||
| -rw-r--r-- | include/uno/mapping.hxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx index f855ab70c041..1a5b3c7736eb 100644 --- a/include/cppu/Enterable.hxx +++ b/include/cppu/Enterable.hxx @@ -56,7 +56,7 @@ public: inline void callInto(uno_EnvCallee * pCallee, ...); inline void callOut (uno_EnvCallee * pCallee, ...); - inline int isValid (rtl::OUString * pReason) {return m_isValid(this, (rtl_uString **)pReason);} + inline int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);} private: Enterable(Enterable const &); @@ -70,7 +70,7 @@ extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam) { ((Enterable *)context)->v_callOut_v(pCallee, pParam); } extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** pReason) - {return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);} + {return ((Enterable *)context)->v_isValid(reinterpret_cast<rtl::OUString *>(pReason));} Enterable::Enterable(void) diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index 1878ebcb376e..78cf1634cd41 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -244,7 +244,7 @@ inline void SAL_CALL Environment::enter() const inline int SAL_CALL Environment::isValid(rtl::OUString * pReason) const { - return uno_Environment_isValid(_pEnv, (rtl_uString **)pReason); + return uno_Environment_isValid(_pEnv, &pReason->pData); } inline Environment Environment::getCurrent(rtl::OUString const & typeName) diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 949542f1b9c6..1199c71ff4e3 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -157,7 +157,7 @@ public: @return mapped interface */ inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const - { return mapInterface( pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } + { return mapInterface( pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); } /** Maps an interface from one environment to another. @@ -183,7 +183,7 @@ public: @param pTypeDescr type description of interface */ inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const - { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } + { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); } /** Maps an interface from one environment to another. @@ -261,7 +261,7 @@ inline void Mapping::mapInterface( TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); if (pTD) { - (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTD ); + (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTD) ); TYPELIB_DANGER_RELEASE( pTD ); } } |