From 9193a15fc55b24e9f463838fd2981ddb84dca227 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 17 Jan 2015 18:18:10 +0100 Subject: Some more loplugin:cstylecast: cppu Change-Id: Iec1251648031afa9eddd7445135fb08dc74821bd --- cppu/source/uno/EnvStack.cxx | 4 ++-- cppu/source/uno/assign.hxx | 13 +++++-------- cppu/source/uno/constr.hxx | 8 ++++---- cppu/source/uno/copy.hxx | 44 ++++++++++++++++++++++---------------------- cppu/source/uno/data.cxx | 4 ++-- cppu/source/uno/destr.hxx | 12 ++++++------ cppu/source/uno/eq.hxx | 12 ++++++------ cppu/source/uno/lbenv.cxx | 34 +++++++++++++++------------------- cppu/source/uno/lbmap.cxx | 6 +++--- cppu/source/uno/prim.hxx | 4 ++-- cppu/source/uno/sequence.cxx | 42 +++++++++++++++++++++--------------------- 11 files changed, 88 insertions(+), 95 deletions(-) (limited to 'cppu/source/uno') diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 731ee46de3e8..abc39a5d05f9 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -365,7 +365,7 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea { cppu::Enterable * pEnterable = reinterpret_cast(pEnv->pReserved); if (pEnterable) - result = pEnterable->isValid((rtl::OUString *)pReason); + result = pEnterable->isValid(reinterpret_cast(pReason)); } else { @@ -374,7 +374,7 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea uno::Environment env(envDcp); - result = env.isValid((rtl::OUString *)pReason); + result = env.isValid(reinterpret_cast(pReason)); } return result; diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 28a4917b46b1..473cd8659071 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -356,10 +356,9 @@ inline bool _assignData( if (pSourceTypeDescr) { typelib_CompoundTypeDescription * pTypeDescr = - (typelib_CompoundTypeDescription *)pSourceTypeDescr; + reinterpret_cast(pSourceTypeDescr); while (pTypeDescr && - !_type_equals( - ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + !_type_equals(pTypeDescr->aBase.pWeakRef, pDestType)) { pTypeDescr = pTypeDescr->pBaseTypeDescription; } @@ -373,10 +372,9 @@ inline bool _assignData( { TYPELIB_DANGER_GET( &pSourceTypeDescr, pSourceType ); typelib_CompoundTypeDescription * pTypeDescr = - (typelib_CompoundTypeDescription *)pSourceTypeDescr; + reinterpret_cast(pSourceTypeDescr); while (pTypeDescr && - !_type_equals( - ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + !_type_equals(pTypeDescr->aBase.pWeakRef, pDestType)) { pTypeDescr = pTypeDescr->pBaseTypeDescription; } @@ -429,8 +427,7 @@ inline bool _assignData( typelib_TypeDescription * pTD = pSourceTypeDescr; while (pTD && !_type_equals( pTD->pWeakRef, pDestType )) { - pTD = (typelib_TypeDescription *) - ((typelib_InterfaceTypeDescription *)pTD)->pBaseTypeDescription; + pTD = &(reinterpret_cast(pTD))->pBaseTypeDescription->aBase; } if (pTD) // is base of dest { diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index a174b805f749..10e12a933b83 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -101,12 +101,12 @@ inline void _defaultConstructData( case typelib_TypeClass_ENUM: if (pTypeDescr) { - *(sal_Int32 *)pMem = ((typelib_EnumTypeDescription *)pTypeDescr)->nDefaultEnumValue; + *(sal_Int32 *)pMem = reinterpret_cast(pTypeDescr)->nDefaultEnumValue; } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - *(sal_Int32 *)pMem = ((typelib_EnumTypeDescription *)pTypeDescr)->nDefaultEnumValue; + *(sal_Int32 *)pMem = reinterpret_cast(pTypeDescr)->nDefaultEnumValue; TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; @@ -114,12 +114,12 @@ inline void _defaultConstructData( case typelib_TypeClass_EXCEPTION: if (pTypeDescr) { - _defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); + _defaultConstructStruct( pMem, reinterpret_cast(pTypeDescr) ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); + _defaultConstructStruct( pMem, reinterpret_cast(pTypeDescr) ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 591f437b9551..fc2ca00ceeb2 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -180,7 +180,7 @@ inline void _copyConstructAnyFromData( pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); _copyConstructStruct( pDestAny->pData, pSource, - (typelib_CompoundTypeDescription *)pTypeDescr, + reinterpret_cast(pTypeDescr), acquire, mapping ); } else @@ -189,7 +189,7 @@ inline void _copyConstructAnyFromData( pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); _copyConstructStruct( pDestAny->pData, pSource, - (typelib_CompoundTypeDescription *)pTypeDescr, + reinterpret_cast(pTypeDescr), acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -200,7 +200,7 @@ inline void _copyConstructAnyFromData( { *(uno_Sequence **)pDestAny->pData = copyConstructSequence( *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, acquire, mapping ); } else @@ -208,7 +208,7 @@ inline void _copyConstructAnyFromData( TYPELIB_DANGER_GET( &pTypeDescr, pType ); *(uno_Sequence **)pDestAny->pData = copyConstructSequence( *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -327,12 +327,12 @@ inline void _copyConstructAny( pDestAny->pData = &pDestAny->pReserved; if (pTypeDescr) { - *(sal_Int32 *)pDestAny->pData = ((typelib_EnumTypeDescription *)pTypeDescr)->nDefaultEnumValue; + *(sal_Int32 *)pDestAny->pData = reinterpret_cast(pTypeDescr)->nDefaultEnumValue; } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - *(sal_Int32 *)pDestAny->pData = ((typelib_EnumTypeDescription *)pTypeDescr)->nDefaultEnumValue; + *(sal_Int32 *)pDestAny->pData = reinterpret_cast(pTypeDescr)->nDefaultEnumValue; TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; @@ -342,14 +342,14 @@ inline void _copyConstructAny( { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); _defaultConstructStruct( - pDestAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr ); + pDestAny->pData, reinterpret_cast(pTypeDescr) ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); _defaultConstructStruct( - pDestAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr ); + pDestAny->pData, reinterpret_cast(pTypeDescr) ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; @@ -395,8 +395,8 @@ inline uno_Sequence * icopyConstructSequence( pDest = allocSeq( sizeof (uno_Any), nElements ); if (pDest != 0) { - uno_Any * pDestElements = (uno_Any *)pDest->elements; - uno_Any * pSourceElements = (uno_Any *)pSource->elements; + uno_Any * pDestElements = reinterpret_cast(pDest->elements); + uno_Any * pSourceElements = reinterpret_cast(pSource->elements); for ( sal_Int32 nPos = nElements; nPos--; ) { typelib_TypeDescriptionReference * pType = @@ -433,8 +433,8 @@ inline uno_Sequence * icopyConstructSequence( _copyConstructStruct( pElements + (nPos * nElementSize), pSourceElements + (nPos * nElementSize), - (typelib_CompoundTypeDescription *) - pElementTypeDescr, + reinterpret_cast( + pElementTypeDescr), acquire, mapping ); } } @@ -450,13 +450,13 @@ inline uno_Sequence * icopyConstructSequence( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); typelib_TypeDescriptionReference * pSeqElementType = - ((typelib_IndirectTypeDescription *) - pElementTypeDescr)->pType; + reinterpret_cast( + pElementTypeDescr)->pType; uno_Sequence ** pDestElements = - (uno_Sequence **) pDest->elements; + reinterpret_cast(pDest->elements); uno_Sequence ** pSourceElements = - (uno_Sequence **) pSource->elements; + reinterpret_cast(pSource->elements); for ( sal_Int32 nPos = nElements; nPos--; ) { uno_Sequence * pNew = copyConstructSequence( @@ -490,8 +490,8 @@ inline uno_Sequence * icopyConstructSequence( (*mapping->mapInterface)( mapping, (void **)pElements + nPos, pSourceElements[nPos], - (typelib_InterfaceTypeDescription *) - pElementTypeDescr ); + reinterpret_cast( + pElementTypeDescr) ); } } TYPELIB_DANGER_RELEASE( pElementTypeDescr ); @@ -571,7 +571,7 @@ inline void _copyConstructData( { _copyConstructStruct( pDest, pSource, - (typelib_CompoundTypeDescription *)pTypeDescr, + reinterpret_cast(pTypeDescr), acquire, mapping ); } else @@ -579,7 +579,7 @@ inline void _copyConstructData( TYPELIB_DANGER_GET( &pTypeDescr, pType ); _copyConstructStruct( pDest, pSource, - (typelib_CompoundTypeDescription *)pTypeDescr, + reinterpret_cast(pTypeDescr), acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -591,7 +591,7 @@ inline void _copyConstructData( { *(uno_Sequence **)pDest = icopyConstructSequence( *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, acquire, mapping ); } else @@ -599,7 +599,7 @@ inline void _copyConstructData( TYPELIB_DANGER_GET( &pTypeDescr, pType ); *(uno_Sequence **)pDest = icopyConstructSequence( *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index d69bfb649a09..6b831000a4b8 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -57,11 +57,11 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ); typelib_InterfaceTypeDescription * pTXInterfaceDescr = 0; - TYPELIB_DANGER_GET( (typelib_TypeDescription **) &pTXInterfaceDescr, type_XInterface ); + TYPELIB_DANGER_GET( reinterpret_cast(&pTXInterfaceDescr), type_XInterface ); assert(pTXInterfaceDescr->ppAllMembers); typelib_typedescriptionreference_getDescription( &g_pQITD, pTXInterfaceDescr->ppAllMembers[ 0 ] ); - TYPELIB_DANGER_RELEASE( (typelib_TypeDescription *) pTXInterfaceDescr ); + TYPELIB_DANGER_RELEASE( &pTXInterfaceDescr->aBase ); } } diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 95f496e10c56..89144742d4a0 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -115,7 +115,7 @@ inline void _destructAny( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _destructStruct( pAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pAny->pData, reinterpret_cast(pTypeDescr), release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); ::rtl_freeMemory( pAny->pData ); break; @@ -205,7 +205,7 @@ inline sal_Int32 idestructElements( { _destructStruct( (char *)pElements + (nElementSize * nPos), - (typelib_CompoundTypeDescription *)pElementTypeDescr, + reinterpret_cast(pElementTypeDescr), release ); } sal_Int32 nSize = pElementTypeDescr->nSize; @@ -273,7 +273,7 @@ inline void idestroySequence( { idestructElements( pSeq->elements, - ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0, + reinterpret_cast(pTypeDescr)->pType, 0, pSeq->nElements, release ); } else @@ -281,7 +281,7 @@ inline void idestroySequence( TYPELIB_DANGER_GET( &pTypeDescr, pType ); idestructElements( pSeq->elements, - ((typelib_IndirectTypeDescription *) pTypeDescr)->pType, 0, + reinterpret_cast(pTypeDescr)->pType, 0, pSeq->nElements, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -325,12 +325,12 @@ inline void _destructData( case typelib_TypeClass_EXCEPTION: if (pTypeDescr) { - _destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pValue, reinterpret_cast(pTypeDescr), release ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - _destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pValue, reinterpret_cast(pTypeDescr), release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index dc064bef28b6..5c6a973d05a2 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -211,7 +211,7 @@ inline bool _equalSequence( { if (! _equalStruct( (char *)pDestElements + (nPos * nElementSize), (char *)pSourceElements + (nPos * nElementSize), - (typelib_CompoundTypeDescription *)pElementTypeDescr, + reinterpret_cast(pElementTypeDescr), queryInterface, release )) { TYPELIB_DANGER_RELEASE( pElementTypeDescr ); @@ -226,7 +226,7 @@ inline bool _equalSequence( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); typelib_TypeDescriptionReference * pSeqElementType = - ((typelib_IndirectTypeDescription *)pElementTypeDescr)->pType; + reinterpret_cast(pElementTypeDescr)->pType; for ( sal_Int32 nPos = nElements; nPos--; ) { if (! equalSequence( ((uno_Sequence **)pDestElements)[nPos], @@ -541,7 +541,7 @@ inline bool _equalData( { return _equalStruct( pDest, pSource, - (typelib_CompoundTypeDescription *)pDestTypeDescr, + reinterpret_cast(pDestTypeDescr), queryInterface, release ); } else @@ -549,7 +549,7 @@ inline bool _equalData( TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); bool bRet = _equalStruct( pDest, pSource, - (typelib_CompoundTypeDescription *)pDestTypeDescr, + reinterpret_cast(pDestTypeDescr), queryInterface, release ); TYPELIB_DANGER_RELEASE( pDestTypeDescr ); return bRet; @@ -561,7 +561,7 @@ inline bool _equalData( { return _equalSequence( *(uno_Sequence **)pDest, *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pDestTypeDescr)->pType, + reinterpret_cast(pDestTypeDescr)->pType, queryInterface, release ); } else @@ -569,7 +569,7 @@ inline bool _equalData( TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); bool bRet = _equalSequence( *(uno_Sequence **)pDest, *(uno_Sequence **)pSource, - ((typelib_IndirectTypeDescription *)pDestTypeDescr)->pType, + reinterpret_cast(pDestTypeDescr)->pType, queryInterface, release ); TYPELIB_DANGER_RELEASE( pDestTypeDescr ); return bRet; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 721005d6a5ed..5cba0fcf4184 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -57,11 +57,10 @@ inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1, typelib_InterfaceTypeDescription * pTD2 ) { return (pTD1 == pTD2 || - (((typelib_TypeDescription *)pTD1)->pTypeName->length == - ((typelib_TypeDescription *)pTD2)->pTypeName->length && + (pTD1->aBase.pTypeName->length == pTD2->aBase.pTypeName->length && ::rtl_ustr_compare( - ((typelib_TypeDescription *) pTD1)->pTypeName->buffer, - ((typelib_TypeDescription *) pTD2)->pTypeName->buffer ) == 0)); + pTD1->aBase.pTypeName->buffer, + pTD2->aBase.pTypeName->buffer ) == 0)); } struct ObjectEntry; @@ -170,7 +169,7 @@ inline void ObjectEntry::append( aNewEntry.refCount = 1; aNewEntry.pInterface = pInterface; aNewEntry.fpFreeProxy = fpFreeProxy; - typelib_typedescription_acquire( (typelib_TypeDescription *) pTypeDescr ); + typelib_typedescription_acquire( &pTypeDescr->aBase ); aNewEntry.pTypeDescr = pTypeDescr; ::std::pair< Ptr2ObjectMap::iterator, bool > i( @@ -194,8 +193,7 @@ inline InterfaceEntry * ObjectEntry::find( // shortcut common case: OUString const & type_name = - OUString::unacquired( - &((typelib_TypeDescription *) pTypeDescr_)->pTypeName ); + OUString::unacquired( &pTypeDescr_->aBase.pTypeName ); if ( type_name == "com.sun.star.uno.XInterface" ) { return &aInterfaces[ 0 ]; @@ -370,8 +368,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) for ( nPos = pOEntry->aInterfaces.size(); nPos--; ) { InterfaceEntry const & rEntry = pOEntry->aInterfaces[nPos]; - typelib_typedescription_release( - (typelib_TypeDescription *) rEntry.pTypeDescr ); + typelib_typedescription_release( &rEntry.pTypeDescr->aBase ); if (rEntry.fpFreeProxy) // is proxy or used interface? { (*rEntry.fpFreeProxy)( pEnv, rEntry.pInterface ); @@ -522,7 +519,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces( static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) { - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); osl_atomic_increment( &that->nWeakRef ); osl_atomic_increment( &that->nRef ); } @@ -530,7 +527,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) static void SAL_CALL defenv_release( uno_Environment * pEnv ) { - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); if (! osl_atomic_decrement( &that->nRef )) { // invoke dispose callback @@ -551,14 +548,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv ) static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv ) { - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); osl_atomic_increment( &that->nWeakRef ); } static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) { - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); if (! osl_atomic_decrement( &that->nWeakRef )) { delete that; @@ -580,7 +577,7 @@ static void SAL_CALL defenv_harden( if (rData.isDisposing) return; - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); { ::osl::MutexGuard guard( rData.mutex ); if (1 == osl_atomic_increment( &that->nRef )) // is dead @@ -636,7 +633,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment( uno_DefaultEnvironment::~uno_DefaultEnvironment() { - ::rtl_uString_release( ((uno_Environment *) this)->pTypeName ); + ::rtl_uString_release( aBase.pTypeName ); } @@ -744,8 +741,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( const InterfaceEntry & rIEntry = pOEntry->aInterfaces[nPos]; buf.append( " - " ); - buf.append( - ((typelib_TypeDescription *) rIEntry.pTypeDescr)->pTypeName ); + buf.append( rIEntry.pTypeDescr->aBase.pTypeName ); if (rIEntry.fpFreeProxy) { buf.append( "; proxy free=0x" ); @@ -870,7 +866,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( oid.append( reinterpret_cast< sal_Int64 >(pUnoI), 16 ); oid.append( ';' ); // environment[context] - oid.append( ((uno_Environment *) pEnv)->pTypeName ); + oid.append( pEnv->aBase.pTypeName ); oid.append( '[' ); oid.append( reinterpret_cast< sal_Int64 >( reinterpret_cast< @@ -1091,7 +1087,7 @@ static uno_Environment * initDefaultEnvironment( // create default environment if ( envTypeName == UNO_LB_UNO ) { - uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; + uno_DefaultEnvironment * that = reinterpret_cast(pEnv); that->computeObjectIdentifier = unoenv_computeObjectIdentifier; that->acquireInterface = unoenv_acquireInterface; that->releaseInterface = unoenv_releaseInterface; diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 454653b6e4d0..aa6587f74237 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -426,7 +426,7 @@ static Mapping loadExternalMapping( if (fpGetMapFunc) { Mapping aExt; - (*fpGetMapFunc)( (uno_Mapping **)&aExt, rFrom.get(), rTo.get() ); + (*fpGetMapFunc)( reinterpret_cast(&aExt), rFrom.get(), rTo.get() ); OSL_ASSERT( aExt.is() ); if (aExt.is()) { @@ -503,7 +503,7 @@ static Mapping getMediateMapping( else { // get registered uno env - ::uno_getEnvironment( (uno_Environment **)&aUno, aUnoEnvTypeName.pData, 0 ); + ::uno_getEnvironment( reinterpret_cast(&aUno), aUnoEnvTypeName.pData, 0 ); aUno2To = getDirectMapping( aUno, rTo ); // : uno <-> to @@ -516,7 +516,7 @@ static Mapping getMediateMapping( { // create anonymous uno env Environment aAnUno; - ::uno_createEnvironment( (uno_Environment **)&aAnUno, aUnoEnvTypeName.pData, 0 ); + ::uno_createEnvironment( reinterpret_cast(&aAnUno), aUnoEnvTypeName.pData, 0 ); Mapping aAnUno2Uno( getDirectMapping( aAnUno, aUno, rAddPurpose ) ); if (! aAnUno2Uno.is()) diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index 545f239ecaa2..6f50f9282ce7 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -57,13 +57,13 @@ inline void * _map( if (pTypeDescr) { (*mapping->mapInterface)( - mapping, &pRet, p, (typelib_InterfaceTypeDescription *)pTypeDescr ); + mapping, &pRet, p, reinterpret_cast(pTypeDescr) ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); (*mapping->mapInterface)( - mapping, &pRet, p, (typelib_InterfaceTypeDescription *)pTypeDescr ); + mapping, &pRet, p, reinterpret_cast(pTypeDescr) ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } } diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 2d2a894b36e9..9575fcc7c05b 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -152,7 +152,7 @@ static inline bool idefaultConstructElements( pSeq = reallocSeq( pSeq, sizeof(float), nAlloc ); if (pSeq != 0) { - float * pElements = (float *) pSeq->elements; + float * pElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = 0.0; @@ -166,7 +166,7 @@ static inline bool idefaultConstructElements( pSeq = reallocSeq( pSeq, sizeof(double), nAlloc ); if (pSeq != 0) { - double * pElements = (double *) pSeq->elements; + double * pElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = 0.0; @@ -180,7 +180,7 @@ static inline bool idefaultConstructElements( pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc ); if (pSeq != 0) { - rtl_uString ** pElements = (rtl_uString **) pSeq->elements; + rtl_uString ** pElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = 0; @@ -199,7 +199,7 @@ static inline bool idefaultConstructElements( if (pSeq != 0) { typelib_TypeDescriptionReference ** pElements = - (typelib_TypeDescriptionReference **) pSeq->elements; + reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = _getVoidType(); @@ -213,7 +213,7 @@ static inline bool idefaultConstructElements( pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc ); if (pSeq != 0) { - uno_Any * pElements = (uno_Any *) pSeq->elements; + uno_Any * pElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { CONSTRUCT_EMPTY_ANY( &pElements[nPos] ); @@ -230,11 +230,11 @@ static inline bool idefaultConstructElements( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); sal_Int32 eEnum = - ((typelib_EnumTypeDescription *) + reinterpret_cast( pElementTypeDescr)->nDefaultEnumValue; TYPELIB_DANGER_RELEASE( pElementTypeDescr ); - sal_Int32 * pElements = (sal_Int32 *) pSeq->elements; + sal_Int32 * pElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = eEnum; @@ -258,7 +258,7 @@ static inline bool idefaultConstructElements( { _defaultConstructStruct( pElements + (nElementSize * nPos), - (typelib_CompoundTypeDescription *)pElementTypeDescr ); + reinterpret_cast(pElementTypeDescr) ); } } @@ -275,7 +275,7 @@ static inline bool idefaultConstructElements( if (pSeq != 0) { uno_Sequence ** pElements = - (uno_Sequence **) pSeq->elements; + reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { pElements[nPos] = createEmptySequence(); @@ -431,7 +431,7 @@ static inline bool icopyConstructFromElements( pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc ); if (pSeq != 0) { - rtl_uString ** pDestElements = (rtl_uString **) pSeq->elements; + rtl_uString ** pDestElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { // This code tends to trigger coverity's overrun-buffer-arg warning @@ -453,7 +453,7 @@ static inline bool icopyConstructFromElements( if (pSeq != 0) { typelib_TypeDescriptionReference ** pDestElements = - (typelib_TypeDescriptionReference **) pSeq->elements; + reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { TYPE_ACQUIRE( @@ -472,7 +472,7 @@ static inline bool icopyConstructFromElements( pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc ); if (pSeq != 0) { - uno_Any * pDestElements = (uno_Any *) pSeq->elements; + uno_Any * pDestElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { uno_Any * pSource = (uno_Any *)pSourceElements + nPos; @@ -499,7 +499,7 @@ static inline bool icopyConstructFromElements( char * pDestElements = pSeq->elements; typelib_CompoundTypeDescription * pTypeDescr = - (typelib_CompoundTypeDescription *)pElementTypeDescr; + reinterpret_cast(pElementTypeDescr); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { char * pDest = @@ -546,8 +546,8 @@ static inline bool icopyConstructFromElements( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); typelib_TypeDescriptionReference * pSeqElementType = - ((typelib_IndirectTypeDescription *) pElementTypeDescr)->pType; - uno_Sequence ** pDestElements = (uno_Sequence **) pSeq->elements; + reinterpret_cast(pElementTypeDescr)->pType; + uno_Sequence ** pDestElements = reinterpret_cast(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { uno_Sequence * pNew = icopyConstructSequence( @@ -695,7 +695,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( TYPELIB_DANGER_GET( &pTypeDescr, pType ); typelib_TypeDescriptionReference * pElementType = - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType; + reinterpret_cast(pTypeDescr)->pType; *ppSequence = 0; if (pElements == 0) @@ -736,7 +736,7 @@ sal_Bool SAL_CALL uno_sequence_construct( if (len > 0) { typelib_TypeDescriptionReference * pElementType = - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType; + reinterpret_cast(pTypeDescr)->pType; *ppSequence = 0; if (pElements == 0) @@ -779,7 +779,7 @@ sal_Bool SAL_CALL uno_type_sequence_realloc( typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); ret = ireallocSequence( - ppSequence, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + ppSequence, reinterpret_cast(pTypeDescr)->pType, nSize, acquire, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -799,7 +799,7 @@ sal_Bool SAL_CALL uno_sequence_realloc( if (nSize != (*ppSequence)->nElements) { ret = ireallocSequence( - ppSequence, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + ppSequence, reinterpret_cast(pTypeDescr)->pType, nSize, acquire, release ); } return ret; @@ -825,7 +825,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( ret = icopyConstructFromElements( &pNew, pSequence->elements, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, 0, pSequence->nElements, acquire, pSequence->nElements ); // alloc nElements if (ret) @@ -869,7 +869,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One( { ret = icopyConstructFromElements( &pNew, pSequence->elements, - ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, + reinterpret_cast(pTypeDescr)->pType, 0, pSequence->nElements, acquire, pSequence->nElements ); // alloc nElements if (ret) -- cgit