diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-17 18:19:08 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:46 +0100 |
commit | dbdb81950112475cd5b0585eaa8b7d97b94e7d36 (patch) | |
tree | adff0d0cfc780f27db79892e83968b675949fcf3 /cppuhelper | |
parent | 9193a15fc55b24e9f463838fd2981ddb84dca227 (diff) |
Some more loplugin:cstylecast: cppuhelper
Change-Id: Ifc11a0ea20a4eec40544cd931d0f94e0db3e3288
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/source/implbase_ex.cxx | 4 | ||||
-rw-r--r-- | cppuhelper/source/tdmgr.cxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/typeprovider.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 1c85b1c81585..8e3fe2afec6d 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -66,7 +66,7 @@ static inline void checkInterface( Type const & rType ) static inline bool isXInterface( rtl_uString * pStr ) { - return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface"); + return OUString::unacquired(&pStr) == "com.sun.star.uno.XInterface"; } static inline void * makeInterface( sal_IntPtr nOffset, void * that ) @@ -79,7 +79,7 @@ static inline bool __td_equals( typelib_TypeDescriptionReference const * pTDR2 ) { return ((pTDR1 == pTDR2) || - ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName )); + OUString::unacquired(&pTDR1->pTypeName) == OUString::unacquired(&pTDR2->pTypeName)); } static inline type_entry * __getTypeEntries( class_data * cd ) diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index e25325a2a65a..abd2865dc722 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -224,7 +224,7 @@ inline static typelib_TypeDescription * createCTD( setExc.push_back( setExcs[i]->getName().pData ); } typelib_typedescription_newExtendedInterfaceAttribute( - (typelib_InterfaceAttributeTypeDescription **)&pRet, + reinterpret_cast<typelib_InterfaceAttributeTypeDescription **>(&pRet), xAttribute->getPosition(), aMemberName.pData, // name (typelib_TypeClass)xType->getTypeClass(), @@ -285,7 +285,7 @@ static typelib_TypeDescription * createCTD( OUString aReturnTypeName( xReturnType->getName() ); typelib_typedescription_newInterfaceMethod( - (typelib_InterfaceMethodTypeDescription **)&pRet, + reinterpret_cast<typelib_InterfaceMethodTypeDescription **>(&pRet), xMethod->getPosition(), xMethod->isOneway(), aTypeName.pData, @@ -354,7 +354,7 @@ inline static typelib_TypeDescription * createCTD( } typelib_typedescription_newMIInterface( - (typelib_InterfaceTypeDescription **)&pRet, + reinterpret_cast<typelib_InterfaceTypeDescription **>(&pRet), aTypeName.pData, 0, 0, 0, 0, 0, nBases, pBaseTypeRefs, @@ -386,7 +386,7 @@ inline static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDes typelib_typedescription_newEnum( &pRet, aTypeName.pData, xType->getDefaultEnumValue(), aNames.getLength(), - (rtl_uString **)aNames.getConstArray(), + const_cast<rtl_uString **>(reinterpret_cast<rtl_uString * const *>(aNames.getConstArray())), const_cast< sal_Int32 * >( aValues.getConstArray() ) ); } return pRet; diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index e56ebead1cbe..80715f3bc5e6 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -42,7 +42,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const if (! _pSeq) { Sequence< sal_Int8 > * pSeq = new Sequence< sal_Int8 >( 16 ); - ::rtl_createUuid( (sal_uInt8 *)pSeq->getArray(), 0, _bUseEthernetAddress ); + ::rtl_createUuid( reinterpret_cast<sal_uInt8 *>(pSeq->getArray()), 0, _bUseEthernetAddress ); _pSeq = pSeq; } } |