From 6a6991ed2ea628da2a7bf43a07963803445e85a9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 28 Mar 2015 18:58:23 +0100 Subject: Clean up C-style casts from pointers to void Change-Id: I5c0372bce2564e58c78daf544cfcb106387c6894 --- .../gcc3_linux_x86-64/callvirtualmethod.cxx | 4 +- .../source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 6 +- .../source/cpp_uno/gcc3_linux_x86-64/except.cxx | 2 +- bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 2 +- .../source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 8 +- bridges/source/jni_uno/jni_base.h | 2 +- bridges/source/jni_uno/jni_bridge.cxx | 8 +- bridges/source/jni_uno/jni_data.cxx | 252 ++++++++++----------- bridges/source/jni_uno/jni_java2uno.cxx | 8 +- bridges/source/jni_uno/jni_uno2java.cxx | 20 +- 10 files changed, 156 insertions(+), 156 deletions(-) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx index 295596d154de..81547d7ff7ae 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx @@ -66,7 +66,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( data.pFPR = pFPR; // Get pointer to method - sal_uInt64 pMethod = *((sal_uInt64 *)pThis); + sal_uInt64 pMethod = *static_cast(pThis); pMethod += 8 * nVtableIndex; data.pMethod = *reinterpret_cast(pMethod); @@ -76,7 +76,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( { // 16-bytes aligned sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16; - pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes ); + pCallStack = static_cast(__builtin_alloca( nStackBytes )); std::memcpy( pCallStack, pStack, nStackBytes ); } diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 3903cdadfd4d..3da87f2b91ab 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -95,12 +95,12 @@ static typelib_TypeClass cpp2uno_call( // stack space // parameters - void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); + void ** pUnoArgs = static_cast(alloca( 4 * sizeof(void *) * nParams )); void ** pCppArgs = pUnoArgs + nParams; // indices of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs + (2 * nParams)); + sal_Int32 * pTempIndices = reinterpret_cast(pUnoArgs + (2 * nParams)); // type descriptions for reconversions - typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); + typelib_TypeDescription ** ppTempParamTypeDescr = reinterpret_cast(pUnoArgs + (3 * nParams)); sal_Int32 nTempIndices = 0; diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index fc439a96c951..338fcb9caf98 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -81,7 +81,7 @@ static OUString toUNOname( char const * p ) extern "C" { static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc ) { - __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); + __cxa_exception const * header = (static_cast<__cxa_exception const *>(pExc) - 1); typelib_TypeDescription * pTD = 0; OUString unoName( toUNOname( header->exceptionType->name() ) ); ::typelib_typedescription_getByName( &pTD, unoName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx index df6c4db4d552..08cd765639c9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx @@ -97,7 +97,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr) #if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */ rtti = (std::type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); #else - rtti = (std::type_info *)dlsym( m_hApp, symName.getStr() ); + rtti = static_cast(dlsym( m_hApp, symName.getStr() )); #endif if (rtti) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index fb286db7943f..205d776f3809 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -100,7 +100,7 @@ static void cpp_call( { // Maxium space for [complex ret ptr], values | ptr ... // (but will be used less - some of the values will be in pGPR and pFPR) - sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) ); + sal_uInt64 *pStack = static_cast(__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) )); sal_uInt64 *pStackStart = pStack; sal_uInt64 pGPR[x86_64::MAX_GPR_REGS]; @@ -138,11 +138,11 @@ static void cpp_call( INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack ); // Args - void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); + void ** pCppArgs = static_cast(alloca( 3 * sizeof(void *) * nParams )); // Indices of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndices = (sal_Int32 *)(pCppArgs + nParams); + sal_Int32 * pTempIndices = reinterpret_cast(pCppArgs + nParams); // Type descriptions for reconversions - typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); + typelib_TypeDescription ** ppTempParamTypeDescr = reinterpret_cast(pCppArgs + (2 * nParams)); sal_Int32 nTempIndices = 0; diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 7fe21359bb24..1663eeaecbc4 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -228,7 +228,7 @@ inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) void * p = rtl_allocateMemory( bytes ); if (0 == p) throw BridgeRuntimeError( "out of memory!" ); - return (rtl_mem *)p; + return static_cast(p); } diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 03f0868d4b9b..982f417a01ae 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -60,8 +60,8 @@ void SAL_CALL Mapping_map_to_uno( void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() { - uno_Interface ** ppUnoI = (uno_Interface **)ppOut; - jobject javaI = (jobject) pIn; + uno_Interface ** ppUnoI = reinterpret_cast(ppOut); + jobject javaI = static_cast(pIn); static_assert(sizeof (void *) == sizeof (jobject), "must be the same size"); assert(ppUnoI != 0); @@ -119,8 +119,8 @@ void SAL_CALL Mapping_map_to_java( void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() { - jobject * ppJavaI = (jobject *) ppOut; - uno_Interface * pUnoI = (uno_Interface *)pIn; + jobject * ppJavaI = reinterpret_cast(ppOut); + uno_Interface * pUnoI = static_cast(pIn); static_assert(sizeof (void *) == sizeof (jobject), "must be the same size"); assert(ppJavaI != 0); diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index 67689cee5cd7..829c73063a4f 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -225,54 +225,54 @@ void Bridge::map_to_uno( if (out_param) { jni->GetCharArrayRegion( - static_cast(java_data.l), 0, 1, (jchar *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jchar *) uno_data = jni->CallCharMethodA( + *static_cast(uno_data) = jni->CallCharMethodA( java_data.l, getJniInfo()->m_method_Character_charValue, 0 ); jni.ensure_no_exception(); } else { - *(jchar *) uno_data = java_data.c; + *static_cast(uno_data) = java_data.c; } break; case typelib_TypeClass_BOOLEAN: if (out_param) { jni->GetBooleanArrayRegion( - static_cast(java_data.l), 0, 1, (jboolean *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jboolean *) uno_data = jni->CallBooleanMethodA( + *static_cast(uno_data) = jni->CallBooleanMethodA( java_data.l, getJniInfo()->m_method_Boolean_booleanValue, 0 ); jni.ensure_no_exception(); } else { - *(jboolean *) uno_data = java_data.z; + *static_cast(uno_data) = java_data.z; } break; case typelib_TypeClass_BYTE: if (out_param) { jni->GetByteArrayRegion( - static_cast(java_data.l), 0, 1, (jbyte *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jbyte *) uno_data = jni->CallByteMethodA( + *static_cast(uno_data) = jni->CallByteMethodA( java_data.l, getJniInfo()->m_method_Byte_byteValue, 0 ); jni.ensure_no_exception(); } else { - *(jbyte *) uno_data = java_data.b; + *static_cast(uno_data) = java_data.b; } break; case typelib_TypeClass_SHORT: @@ -280,18 +280,18 @@ void Bridge::map_to_uno( if (out_param) { jni->GetShortArrayRegion( - static_cast(java_data.l), 0, 1, (jshort *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jshort *) uno_data = jni->CallShortMethodA( + *static_cast(uno_data) = jni->CallShortMethodA( java_data.l, getJniInfo()->m_method_Short_shortValue, 0 ); jni.ensure_no_exception(); } else { - *(jshort *) uno_data = java_data.s; + *static_cast(uno_data) = java_data.s; } break; case typelib_TypeClass_LONG: @@ -299,18 +299,18 @@ void Bridge::map_to_uno( if (out_param) { jni->GetIntArrayRegion( - static_cast(java_data.l), 0, 1, (jint *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jint *) uno_data = jni->CallIntMethodA( + *static_cast(uno_data) = jni->CallIntMethodA( java_data.l, getJniInfo()->m_method_Integer_intValue, 0 ); jni.ensure_no_exception(); } else { - *(jint *) uno_data = java_data.i; + *static_cast(uno_data) = java_data.i; } break; case typelib_TypeClass_HYPER: @@ -318,54 +318,54 @@ void Bridge::map_to_uno( if (out_param) { jni->GetLongArrayRegion( - static_cast(java_data.l), 0, 1, (jlong *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jlong *) uno_data = jni->CallLongMethodA( + *static_cast(uno_data) = jni->CallLongMethodA( java_data.l, getJniInfo()->m_method_Long_longValue, 0 ); jni.ensure_no_exception(); } else { - *(jlong *) uno_data = java_data.j; + *static_cast(uno_data) = java_data.j; } break; case typelib_TypeClass_FLOAT: if (out_param) { jni->GetFloatArrayRegion( - static_cast(java_data.l), 0, 1, (jfloat *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jfloat *) uno_data = jni->CallFloatMethodA( + *static_cast(uno_data) = jni->CallFloatMethodA( java_data.l, getJniInfo()->m_method_Float_floatValue, 0 ); jni.ensure_no_exception(); } else { - *(jfloat *) uno_data = java_data.f; + *static_cast(uno_data) = java_data.f; } break; case typelib_TypeClass_DOUBLE: if (out_param) { jni->GetDoubleArrayRegion( - static_cast(java_data.l), 0, 1, (jdouble *) uno_data ); + static_cast(java_data.l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } else if (special_wrapped_integral_types) { - *(jdouble *) uno_data = jni->CallDoubleMethodA( + *static_cast(uno_data) = jni->CallDoubleMethodA( java_data.l, getJniInfo()->m_method_Double_doubleValue, 0 ); jni.ensure_no_exception(); } else { - *(jdouble *) uno_data = java_data.d; + *static_cast(uno_data) = java_data.d; } break; case typelib_TypeClass_STRING: @@ -385,9 +385,9 @@ void Bridge::map_to_uno( + "] null-ref given!" + jni.get_stack_trace() ); } if (! assign) - *(rtl_uString **)uno_data = 0; + *static_cast(uno_data) = 0; jstring_to_ustring( - jni, (rtl_uString **)uno_data, static_cast(java_data.l) ); + jni, static_cast(uno_data), static_cast(java_data.l) ); break; } case typelib_TypeClass_TYPE: @@ -432,9 +432,9 @@ void Bridge::map_to_uno( if (assign) { typelib_typedescriptionreference_release( - *(typelib_TypeDescriptionReference **)uno_data ); + *static_cast(uno_data) ); } - *(typelib_TypeDescriptionReference **)uno_data = td.get()->pWeakRef; + *static_cast(uno_data) = td.get()->pWeakRef; break; } case typelib_TypeClass_ANY: @@ -448,7 +448,7 @@ void Bridge::map_to_uno( java_data.l = jo_out_holder.get(); } - uno_Any * pAny = (uno_Any *)uno_data; + uno_Any * pAny = static_cast(uno_data); if (0 == java_data.l) // null-ref maps to XInterface null-ref { if (assign) @@ -518,33 +518,33 @@ void Bridge::map_to_uno( break; case typelib_TypeClass_CHAR: pAny->pData = &pAny->pReserved; - *(jchar *) pAny->pData = jni->CallCharMethodA( + *static_cast(pAny->pData) = jni->CallCharMethodA( java_data.l, getJniInfo()->m_method_Character_charValue, 0 ); jni.ensure_no_exception(); break; case typelib_TypeClass_BOOLEAN: pAny->pData = &pAny->pReserved; - *(jboolean *) pAny->pData = jni->CallBooleanMethodA( + *static_cast(pAny->pData) = jni->CallBooleanMethodA( java_data.l, getJniInfo()->m_method_Boolean_booleanValue, 0 ); jni.ensure_no_exception(); break; case typelib_TypeClass_BYTE: pAny->pData = &pAny->pReserved; - *(jbyte *) pAny->pData = jni->CallByteMethodA( + *static_cast(pAny->pData) = jni->CallByteMethodA( java_data.l, getJniInfo()->m_method_Byte_byteValue, 0 ); jni.ensure_no_exception(); break; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: pAny->pData = &pAny->pReserved; - *(jshort *) pAny->pData = jni->CallShortMethodA( + *static_cast(pAny->pData) = jni->CallShortMethodA( java_data.l, getJniInfo()->m_method_Short_shortValue, 0 ); jni.ensure_no_exception(); break; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: pAny->pData = &pAny->pReserved; - *(jint *) pAny->pData = jni->CallIntMethodA( + *static_cast(pAny->pData) = jni->CallIntMethodA( java_data.l, getJniInfo()->m_method_Integer_intValue, 0 ); jni.ensure_no_exception(); break; @@ -553,7 +553,7 @@ void Bridge::map_to_uno( if (sizeof (sal_Int64) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(jlong *) pAny->pData = jni->CallLongMethodA( + *static_cast(pAny->pData) = jni->CallLongMethodA( java_data.l, getJniInfo()->m_method_Long_longValue, 0 ); jni.ensure_no_exception(); } @@ -571,7 +571,7 @@ void Bridge::map_to_uno( if (sizeof (float) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(jfloat *) pAny->pData = jni->CallFloatMethodA( + *static_cast(pAny->pData) = jni->CallFloatMethodA( java_data.l, getJniInfo()->m_method_Float_floatValue, 0 ); jni.ensure_no_exception(); } @@ -589,7 +589,7 @@ void Bridge::map_to_uno( if (sizeof (double) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(jdouble *) pAny->pData = + *static_cast(pAny->pData) = jni->CallDoubleMethodA( java_data.l, getJniInfo()->m_method_Double_doubleValue, 0 ); @@ -612,7 +612,7 @@ void Bridge::map_to_uno( pAny->pReserved = 0; pAny->pData = &pAny->pReserved; jstring_to_ustring( - jni, (rtl_uString **)pAny->pData, + jni, static_cast(pAny->pData), static_cast(java_data.l) ); break; case typelib_TypeClass_TYPE: @@ -675,7 +675,7 @@ void Bridge::map_to_uno( + "] null-ref given!" + jni.get_stack_trace() ); } - *(jint *) uno_data = jni->GetIntField( + *static_cast(uno_data) = jni->GetIntField( java_data.l, getJniInfo()->m_field_Enum_m_value ); break; } @@ -724,7 +724,7 @@ void Bridge::map_to_uno( for ( ; nPos < nMembers; ++nPos ) { - void * p = (char *)uno_data + comp_td->pMemberOffsets[ nPos ]; + void * p = static_cast(uno_data) + comp_td->pMemberOffsets[ nPos ]; typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ]; jfieldID field_id = comp_info->m_fields[ nPos ]; @@ -738,7 +738,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jchar *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -747,7 +747,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jchar *) p = jni->GetCharField( + *static_cast(p) = jni->GetCharField( java_data.l, field_id ); } break; @@ -756,7 +756,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jboolean *) p = false; + *static_cast(p) = false; } else { jvalue val; val.l = jo.get(); @@ -765,7 +765,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jboolean *) p = jni->GetBooleanField( + *static_cast(p) = jni->GetBooleanField( java_data.l, field_id ); } break; @@ -774,7 +774,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jbyte *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -783,7 +783,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jbyte *) p = jni->GetByteField( + *static_cast(p) = jni->GetByteField( java_data.l, field_id ); } break; @@ -793,7 +793,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jshort *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -802,7 +802,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jshort *) p = jni->GetShortField( + *static_cast(p) = jni->GetShortField( java_data.l, field_id ); } break; @@ -812,7 +812,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jint *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -821,7 +821,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jint *) p = jni->GetIntField( java_data.l, field_id ); + *static_cast(p) = jni->GetIntField( java_data.l, field_id ); } break; case typelib_TypeClass_HYPER: @@ -830,7 +830,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jlong *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -839,7 +839,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jlong *) p = jni->GetLongField( + *static_cast(p) = jni->GetLongField( java_data.l, field_id ); } break; @@ -848,7 +848,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jfloat *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -857,7 +857,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jfloat *) p = jni->GetFloatField( + *static_cast(p) = jni->GetFloatField( java_data.l, field_id ); } break; @@ -866,7 +866,7 @@ void Bridge::map_to_uno( JLocalAutoRef jo( jni, jni->GetObjectField( java_data.l, field_id ) ); if ( jo.get() == 0 ) { - *(jdouble *) p = 0; + *static_cast(p) = 0; } else { jvalue val; val.l = jo.get(); @@ -875,7 +875,7 @@ void Bridge::map_to_uno( true ); } } else { - *(jdouble *) p = jni->GetDoubleField( + *static_cast(p) = jni->GetDoubleField( java_data.l, field_id ); } break; @@ -932,7 +932,7 @@ void Bridge::map_to_uno( for ( sal_Int32 nCleanup = 0; nCleanup < nPos; ++nCleanup ) { void * p = - (char *)uno_data + comp_td->pMemberOffsets[ nCleanup ]; + static_cast(uno_data) + comp_td->pMemberOffsets[ nCleanup ]; uno_type_destructData( p, comp_td->ppTypeRefs[ nCleanup ], 0 ); } @@ -1101,7 +1101,7 @@ void Bridge::map_to_uno( if (assign) uno_destructData( uno_data, td.get(), 0 ); - *(uno_Sequence **)uno_data = reinterpret_cast(seq.release()); + *static_cast(uno_data) = reinterpret_cast(seq.release()); break; } case typelib_TypeClass_INTERFACE: @@ -1119,11 +1119,11 @@ void Bridge::map_to_uno( { if (assign) { - uno_Interface * p = *(uno_Interface **)uno_data; + uno_Interface * p = *static_cast(uno_data); if (0 != p) (*p->release)( p ); } - *(uno_Interface **)uno_data = 0; + *static_cast(uno_data) = 0; } else { @@ -1134,11 +1134,11 @@ void Bridge::map_to_uno( uno_Interface * pUnoI = map_to_uno( jni, java_data.l, iface_info ); if (assign) { - uno_Interface * p = *(uno_Interface **)uno_data; + uno_Interface * p = *static_cast(uno_data); if (0 != p) (*p->release)( p ); } - *(uno_Interface **)uno_data = pUnoI; + *static_cast(uno_data) = pUnoI; } break; } @@ -1173,7 +1173,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetCharArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jchar *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1183,7 +1183,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetCharArrayRegion( - static_cast(java_data->l), 0, 1, (jchar *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1191,7 +1191,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.c = *(jchar const *) uno_data; + arg.c = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Character, getJniInfo()->m_ctor_Character_with_char, &arg ); @@ -1199,7 +1199,7 @@ void Bridge::map_to_java( } else { - java_data->c = *(jchar const *) uno_data; + java_data->c = *static_cast(uno_data); } break; case typelib_TypeClass_BOOLEAN: @@ -1213,7 +1213,7 @@ void Bridge::map_to_java( { jni->SetBooleanArrayRegion( static_cast(jo_ar.get()), - 0, 1, (jboolean *) uno_data ); + 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1224,7 +1224,7 @@ void Bridge::map_to_java( { jni->SetBooleanArrayRegion( static_cast(java_data->l), - 0, 1, (jboolean *) uno_data ); + 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1232,7 +1232,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.z = *(jboolean const *) uno_data; + arg.z = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Boolean, getJniInfo()->m_ctor_Boolean_with_boolean, &arg ); @@ -1240,7 +1240,7 @@ void Bridge::map_to_java( } else { - java_data->z = *(jboolean const *) uno_data; + java_data->z = *static_cast(uno_data); } break; case typelib_TypeClass_BYTE: @@ -1253,7 +1253,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetByteArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jbyte *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1263,7 +1263,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetByteArrayRegion( - static_cast(java_data->l), 0, 1, (jbyte *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1271,7 +1271,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.b = *(jbyte const *) uno_data; + arg.b = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Byte, getJniInfo()->m_ctor_Byte_with_byte, &arg ); @@ -1279,7 +1279,7 @@ void Bridge::map_to_java( } else { - java_data->b = *(jbyte const *) uno_data; + java_data->b = *static_cast(uno_data); } break; case typelib_TypeClass_SHORT: @@ -1293,7 +1293,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetShortArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jshort *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1303,7 +1303,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetShortArrayRegion( - static_cast(java_data->l), 0, 1, (jshort *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1311,7 +1311,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.s = *(jshort const *) uno_data; + arg.s = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Short, getJniInfo()->m_ctor_Short_with_short, &arg ); @@ -1319,7 +1319,7 @@ void Bridge::map_to_java( } else { - java_data->s = *(jshort const *) uno_data; + java_data->s = *static_cast(uno_data); } break; case typelib_TypeClass_LONG: @@ -1333,7 +1333,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetIntArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jint *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1343,7 +1343,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetIntArrayRegion( - static_cast(java_data->l), 0, 1, (jint *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1351,7 +1351,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.i = *(jint const *) uno_data; + arg.i = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Integer, getJniInfo()->m_ctor_Integer_with_int, &arg ); @@ -1359,7 +1359,7 @@ void Bridge::map_to_java( } else { - java_data->i = *(jint const *) uno_data; + java_data->i = *static_cast(uno_data); } break; case typelib_TypeClass_HYPER: @@ -1373,7 +1373,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetLongArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jlong *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1383,7 +1383,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetLongArrayRegion( - static_cast(java_data->l), 0, 1, (jlong *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1391,7 +1391,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.j = *(jlong const *) uno_data; + arg.j = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Long, getJniInfo()->m_ctor_Long_with_long, &arg ); @@ -1399,7 +1399,7 @@ void Bridge::map_to_java( } else { - java_data->j = *(jlong const *) uno_data; + java_data->j = *static_cast(uno_data); } break; case typelib_TypeClass_FLOAT: @@ -1412,7 +1412,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetFloatArrayRegion( - static_cast(jo_ar.get()), 0, 1, (jfloat *) uno_data ); + static_cast(jo_ar.get()), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1422,7 +1422,7 @@ void Bridge::map_to_java( if (in_param) { jni->SetFloatArrayRegion( - static_cast(java_data->l), 0, 1, (jfloat *) uno_data ); + static_cast(java_data->l), 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1430,7 +1430,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.f = *(jfloat const *) uno_data; + arg.f = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Float, getJniInfo()->m_ctor_Float_with_float, &arg ); @@ -1438,7 +1438,7 @@ void Bridge::map_to_java( } else { - java_data->f = *(jfloat const *) uno_data; + java_data->f = *static_cast(uno_data); } break; case typelib_TypeClass_DOUBLE: @@ -1452,7 +1452,7 @@ void Bridge::map_to_java( { jni->SetDoubleArrayRegion( static_cast(jo_ar.get()), - 0, 1, (jdouble *) uno_data ); + 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } java_data->l = jo_ar.release(); @@ -1463,7 +1463,7 @@ void Bridge::map_to_java( { jni->SetDoubleArrayRegion( static_cast(java_data->l), - 0, 1, (jdouble *) uno_data ); + 0, 1, static_cast(uno_data) ); jni.ensure_no_exception(); } } @@ -1471,7 +1471,7 @@ void Bridge::map_to_java( else if (special_wrapped_integral_types) { jvalue arg; - arg.d = *(double const *)uno_data; + arg.d = *static_cast(uno_data); java_data->l = jni->NewObjectA( getJniInfo()->m_class_Double, getJniInfo()->m_ctor_Double_with_double, &arg ); @@ -1479,7 +1479,7 @@ void Bridge::map_to_java( } else { - java_data->d = *(jdouble const *) uno_data; + java_data->d = *static_cast(uno_data); } break; case typelib_TypeClass_STRING: @@ -1491,7 +1491,7 @@ void Bridge::map_to_java( { jo_in.reset( ustring_to_jstring( - jni, *(rtl_uString * const *) uno_data ) ); + jni, *static_cast(uno_data) ) ); } if (0 == java_data->l) { @@ -1510,7 +1510,7 @@ void Bridge::map_to_java( { assert( in_param ); java_data->l = - ustring_to_jstring( jni, *(rtl_uString * const *) uno_data ); + ustring_to_jstring( jni, *static_cast(uno_data) ); } break; } @@ -1524,7 +1524,7 @@ void Bridge::map_to_java( jo_in.reset( create_type( jni, - *(typelib_TypeDescriptionReference * const *) uno_data ) + *static_cast(uno_data) ) ); } if (0 == java_data->l) @@ -1546,7 +1546,7 @@ void Bridge::map_to_java( java_data->l = create_type( jni, - *(typelib_TypeDescriptionReference * const *) uno_data ); + *static_cast(uno_data) ); } break; } @@ -1555,7 +1555,7 @@ void Bridge::map_to_java( JLocalAutoRef jo_any( jni ); if (in_param) { - uno_Any const * pAny = (uno_Any const *)uno_data; + uno_Any const * pAny = static_cast(uno_data); switch (pAny->pType->eTypeClass) { case typelib_TypeClass_VOID: @@ -1565,7 +1565,7 @@ void Bridge::map_to_java( case typelib_TypeClass_UNSIGNED_SHORT: { jvalue args[ 2 ]; - args[ 0 ].s = *(jshort const *) pAny->pData; + args[ 0 ].s = *static_cast(pAny->pData); JLocalAutoRef jo_val( jni, jni->NewObjectA( getJniInfo()->m_class_Short, @@ -1584,7 +1584,7 @@ void Bridge::map_to_java( case typelib_TypeClass_UNSIGNED_LONG: { jvalue args[ 2 ]; - args[ 0 ].i = *(jint const *) pAny->pData; + args[ 0 ].i = *static_cast(pAny->pData); JLocalAutoRef jo_val( jni, jni->NewObjectA( getJniInfo()->m_class_Integer, @@ -1603,7 +1603,7 @@ void Bridge::map_to_java( case typelib_TypeClass_UNSIGNED_HYPER: { jvalue args[ 2 ]; - args[ 0 ].j = *(jlong const *) pAny->pData; + args[ 0 ].j = *static_cast(pAny->pData); JLocalAutoRef jo_val( jni, jni->NewObjectA( getJniInfo()->m_class_Long, @@ -1621,7 +1621,7 @@ void Bridge::map_to_java( } case typelib_TypeClass_STRING: // opt strings jo_any.reset( ustring_to_jstring( - jni, (rtl_uString *) pAny->pReserved ) ); + jni, static_cast(pAny->pReserved) ) ); break; case typelib_TypeClass_SEQUENCE: { @@ -1673,7 +1673,7 @@ void Bridge::map_to_java( } case typelib_TypeClass_INTERFACE: { - uno_Interface * pUnoI = (uno_Interface *)pAny->pReserved; + uno_Interface * pUnoI = static_cast(pAny->pReserved); if (is_XInterface( pAny->pType )) { if (0 != pUnoI) @@ -1791,7 +1791,7 @@ void Bridge::map_to_java( assert( 0 != method_id ); jvalue arg; - arg.i = *(jint const *) uno_data; + arg.i = *static_cast(uno_data); jo_enum.reset( jni->CallStaticObjectMethodA( static_cast(jo_enum_class.get()), method_id, &arg ) ); @@ -1832,7 +1832,7 @@ void Bridge::map_to_java( if (typelib_TypeClass_EXCEPTION == type->eTypeClass) { JLocalAutoRef jo_message( - jni, ustring_to_jstring( jni, *(rtl_uString **)uno_data ) ); + jni, ustring_to_jstring( jni, *static_cast(uno_data) ) ); jvalue arg; arg.l = jo_message.get(); jo_comp.reset( @@ -1866,7 +1866,7 @@ void Bridge::map_to_java( if (0 != field_id) { void const * p = - (char const *)uno_data + pMemberOffsets[ nPos ]; + static_cast(uno_data) + pMemberOffsets[ nPos ]; typelib_TypeDescriptionReference * member_type = ppMemberTypeRefs[ nPos ]; bool parameterizedType = polymorphic @@ -1878,7 +1878,7 @@ void Bridge::map_to_java( case typelib_TypeClass_CHAR: if (parameterizedType) { jvalue arg; - arg.c = *(jchar const *) p; + arg.c = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1891,13 +1891,13 @@ void Bridge::map_to_java( } else { jni->SetCharField( jo_comp.get(), - field_id, *(jchar const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_BOOLEAN: if (parameterizedType) { jvalue arg; - arg.z = *(jboolean const *) p; + arg.z = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1910,13 +1910,13 @@ void Bridge::map_to_java( } else { jni->SetBooleanField( jo_comp.get(), - field_id, *(jboolean const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_BYTE: if (parameterizedType) { jvalue arg; - arg.b = *(jbyte const *) p; + arg.b = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1929,14 +1929,14 @@ void Bridge::map_to_java( } else { jni->SetByteField( jo_comp.get(), - field_id, *(jbyte const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: if (parameterizedType) { jvalue arg; - arg.s = *(jshort const *) p; + arg.s = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1949,14 +1949,14 @@ void Bridge::map_to_java( } else { jni->SetShortField( jo_comp.get(), - field_id, *(jshort const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: if (parameterizedType) { jvalue arg; - arg.i = *(jint const *) p; + arg.i = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1969,14 +1969,14 @@ void Bridge::map_to_java( } else { jni->SetIntField( jo_comp.get(), - field_id, *(jint const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: if (parameterizedType) { jvalue arg; - arg.j = *(jlong const *) p; + arg.j = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -1989,13 +1989,13 @@ void Bridge::map_to_java( } else { jni->SetLongField( jo_comp.get(), - field_id, *(jlong const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_FLOAT: if (parameterizedType) { jvalue arg; - arg.f = *(jfloat const *) p; + arg.f = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -2008,13 +2008,13 @@ void Bridge::map_to_java( } else { jni->SetFloatField( jo_comp.get(), - field_id, *(jfloat const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_DOUBLE: if (parameterizedType) { jvalue arg; - arg.d = *(jdouble const *) p; + arg.d = *static_cast(p); JLocalAutoRef jo( jni, jni->NewObjectA( @@ -2027,14 +2027,14 @@ void Bridge::map_to_java( } else { jni->SetDoubleField( jo_comp.get(), - field_id, *(jdouble const *) p ); + field_id, *static_cast(p) ); } break; case typelib_TypeClass_STRING: // string opt here { JLocalAutoRef jo_string( jni, ustring_to_jstring( - jni, *(rtl_uString * const *) p ) ); + jni, *static_cast(p) ) ); jni->SetObjectField( jo_comp.get(), field_id, jo_string.get() ); break; @@ -2085,7 +2085,7 @@ void Bridge::map_to_java( uno_Sequence const * seq = 0; if (in_param) { - seq = *(uno_Sequence * const *)uno_data; + seq = *static_cast(uno_data); nElements = seq->nElements; } else @@ -2432,7 +2432,7 @@ void Bridge::map_to_java( JLocalAutoRef jo_iface( jni ); if (in_param) { - uno_Interface * pUnoI = *(uno_Interface * const *)uno_data; + uno_Interface * pUnoI = *static_cast(uno_data); if (0 != pUnoI) { if (0 == info) diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 5c992f167cbb..cde61c4ce8d0 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -180,12 +180,12 @@ jobject Bridge::call_uno( } #ifdef BROKEN_ALLOCA - char * mem = (char *) malloc( + char * mem = static_cast(malloc( #else - char * mem = (char *) alloca( + char * mem = static_cast(alloca( #endif (nParams * sizeof (void *)) + - return_size + (nParams * sizeof (largest)) ); + return_size + (nParams * sizeof (largest)) )); void ** uno_args = reinterpret_cast(mem); void * uno_ret = return_size == 0 ? 0 : (mem + (nParams * sizeof (void *))); largest * uno_args_mem = reinterpret_cast @@ -452,7 +452,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( if (typelib_TypeClass_INTERFACE == uno_ret.pType->eTypeClass) { uno_Interface * pUnoRet = - (uno_Interface *) uno_ret.pReserved; + static_cast(uno_ret.pReserved); if (0 != pUnoRet) { try diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 9336d053496a..7d690da59d07 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -153,7 +153,7 @@ void Bridge::call_java( #ifdef BROKEN_ALLOCA jvalue * java_args = (jvalue *) malloc( sizeof (jvalue) * nParams ); #else - jvalue * java_args = (jvalue *) alloca( sizeof (jvalue) * nParams ); + jvalue * java_args = static_cast(alloca( sizeof (jvalue) * nParams )); #endif sal_Int32 nPos; @@ -248,38 +248,38 @@ void Bridge::call_java( jni->CallVoidMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_CHAR: - *(sal_Unicode *)uno_ret = + *static_cast(uno_ret) = jni->CallCharMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_BOOLEAN: - *(sal_Bool *)uno_ret = + *static_cast(uno_ret) = jni->CallBooleanMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_BYTE: - *(sal_Int8 *)uno_ret = + *static_cast(uno_ret) = jni->CallByteMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: - *(sal_Int16 *)uno_ret = + *static_cast(uno_ret) = jni->CallShortMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: - *(sal_Int32 *)uno_ret = + *static_cast(uno_ret) = jni->CallIntMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: - *(sal_Int64 *)uno_ret = + *static_cast(uno_ret) = jni->CallLongMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_FLOAT: - *(float *)uno_ret = + *static_cast(uno_ret) = jni->CallFloatMethodA( javaI, method_id, java_args ); break; case typelib_TypeClass_DOUBLE: - *(double *)uno_ret = + *static_cast(uno_ret) = jni->CallDoubleMethodA( javaI, method_id, java_args ); break; default: @@ -726,7 +726,7 @@ void SAL_CALL UNO_proxy_dispatch( info->m_td.get() ) ); uno_any_construct( - (uno_Any *)uno_ret, &pUnoI2, + static_cast(uno_ret), &pUnoI2, demanded_td.get(), 0 ); (*pUnoI2->release)( pUnoI2 ); } -- cgit