summaryrefslogtreecommitdiff
path: root/include/uno
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-17 18:18:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-20 09:06:46 +0100
commit9193a15fc55b24e9f463838fd2981ddb84dca227 (patch)
tree55f1a5b401e65bcc7cd52c87def321f15a3b1f72 /include/uno
parent141b01ac65d5922aacdf6010043eadc7c28304a5 (diff)
Some more loplugin:cstylecast: cppu
Change-Id: Iec1251648031afa9eddd7445135fb08dc74821bd
Diffstat (limited to 'include/uno')
-rw-r--r--include/uno/environment.hxx2
-rw-r--r--include/uno/mapping.hxx6
2 files changed, 4 insertions, 4 deletions
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 );
}
}