Some more loplugin:cstylecast: cppuhelper

Change-Id: Ifc11a0ea20a4eec40544cd931d0f94e0db3e3288
This commit is contained in:
Stephan Bergmann
2015-01-17 18:19:08 +01:00
parent 9193a15fc5
commit dbdb819501
3 changed files with 7 additions and 7 deletions

View File

@@ -66,7 +66,7 @@ static inline void checkInterface( Type const & rType )
static inline bool isXInterface( rtl_uString * pStr ) 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 ) static inline void * makeInterface( sal_IntPtr nOffset, void * that )
@@ -79,7 +79,7 @@ static inline bool __td_equals(
typelib_TypeDescriptionReference const * pTDR2 ) typelib_TypeDescriptionReference const * pTDR2 )
{ {
return ((pTDR1 == 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 ) static inline type_entry * __getTypeEntries( class_data * cd )

View File

@@ -224,7 +224,7 @@ inline static typelib_TypeDescription * createCTD(
setExc.push_back( setExcs[i]->getName().pData ); setExc.push_back( setExcs[i]->getName().pData );
} }
typelib_typedescription_newExtendedInterfaceAttribute( typelib_typedescription_newExtendedInterfaceAttribute(
(typelib_InterfaceAttributeTypeDescription **)&pRet, reinterpret_cast<typelib_InterfaceAttributeTypeDescription **>(&pRet),
xAttribute->getPosition(), xAttribute->getPosition(),
aMemberName.pData, // name aMemberName.pData, // name
(typelib_TypeClass)xType->getTypeClass(), (typelib_TypeClass)xType->getTypeClass(),
@@ -285,7 +285,7 @@ static typelib_TypeDescription * createCTD(
OUString aReturnTypeName( xReturnType->getName() ); OUString aReturnTypeName( xReturnType->getName() );
typelib_typedescription_newInterfaceMethod( typelib_typedescription_newInterfaceMethod(
(typelib_InterfaceMethodTypeDescription **)&pRet, reinterpret_cast<typelib_InterfaceMethodTypeDescription **>(&pRet),
xMethod->getPosition(), xMethod->getPosition(),
xMethod->isOneway(), xMethod->isOneway(),
aTypeName.pData, aTypeName.pData,
@@ -354,7 +354,7 @@ inline static typelib_TypeDescription * createCTD(
} }
typelib_typedescription_newMIInterface( typelib_typedescription_newMIInterface(
(typelib_InterfaceTypeDescription **)&pRet, reinterpret_cast<typelib_InterfaceTypeDescription **>(&pRet),
aTypeName.pData, aTypeName.pData,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
nBases, pBaseTypeRefs, nBases, pBaseTypeRefs,
@@ -386,7 +386,7 @@ inline static typelib_TypeDescription * createCTD( const Reference< XEnumTypeDes
typelib_typedescription_newEnum( typelib_typedescription_newEnum(
&pRet, aTypeName.pData, xType->getDefaultEnumValue(), &pRet, aTypeName.pData, xType->getDefaultEnumValue(),
aNames.getLength(), aNames.getLength(),
(rtl_uString **)aNames.getConstArray(), const_cast<rtl_uString **>(reinterpret_cast<rtl_uString * const *>(aNames.getConstArray())),
const_cast< sal_Int32 * >( aValues.getConstArray() ) ); const_cast< sal_Int32 * >( aValues.getConstArray() ) );
} }
return pRet; return pRet;

View File

@@ -42,7 +42,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const
if (! _pSeq) if (! _pSeq)
{ {
Sequence< sal_Int8 > * pSeq = new Sequence< sal_Int8 >( 16 ); 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; _pSeq = pSeq;
} }
} }