diff options
20 files changed, 46 insertions, 46 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 6f436941a18a..37ba95d7acc1 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -432,7 +432,7 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier( oid.append( (sal_Unicode)';' ); // ;environment[context] oid.append( - *reinterpret_cast< OUString const * >( + OUString::unacquired( &((uno_Environment *) pEnv)->pTypeName ) ); oid.append( (sal_Unicode)'[' ); oid.append( (sal_Int64)((uno_Environment *)pEnv)->pContext, 16 ); diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx index 9af0e321992c..c4befc9026f6 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -269,7 +269,7 @@ static void deleteException( void * pExc ) void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { - SAL_INFO( "bridges.ios", "raiseException: " << *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + SAL_INFO( "bridges.ios", "raiseException: " << OUString::unacquired( &pUnoExc->pType->pTypeName ) ); void * pCppExc; std::type_info * rtti; @@ -283,7 +283,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -313,7 +313,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index 520c49f7f884..bccc2ceb348f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -235,7 +235,7 @@ namespace CPPU_CURRENT_NAMESPACE #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -251,7 +251,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -281,7 +281,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index 57808f9e3dbd..833a41548d18 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -211,7 +211,7 @@ namespace CPPU_CURRENT_NAMESPACE #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -227,7 +227,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -257,7 +257,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 9ccdd35364e4..c36e1d9d2dfe 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -218,7 +218,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -234,7 +234,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "cannot get typedescription for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize ); @@ -264,7 +264,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "no rtti for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 13a8b8f3477c..176d4e0b5ec1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -211,7 +211,7 @@ namespace CPPU_CURRENT_NAMESPACE #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -227,7 +227,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -257,7 +257,7 @@ namespace CPPU_CURRENT_NAMESPACE { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index 419cae761915..7f9cd88c4392 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -208,7 +208,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if defined BRIDGES_DEBUG OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -224,7 +224,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -254,7 +254,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index cb50f3536ce2..5d3233e23f6e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -209,7 +209,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if defined BRIDGES_DEBUG OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -225,7 +225,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -255,7 +255,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } 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 338fcb9caf98..10530d8caea9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -99,7 +99,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -115,7 +115,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "cannot get typedescription for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize ); @@ -131,7 +131,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "no rtti for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 34ab8fea2c50..0fd9d6af1407 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -271,7 +271,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -287,7 +287,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "cannot get typedescription for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -317,7 +317,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( "no rtti for type " + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 946f105711da..6415c5b75639 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -211,7 +211,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -227,7 +227,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -257,7 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 20a4907aa617..0e7bb8ad6502 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -208,7 +208,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if defined BRIDGES_DEBUG OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -224,7 +224,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -254,7 +254,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index aabc8a05ad69..4b4911991331 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -202,7 +202,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -218,7 +218,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -248,7 +248,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx index aabc8a05ad69..4b4911991331 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx @@ -202,7 +202,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) #if OSL_DEBUG_LEVEL > 1 OString cstr( OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + OUString::unacquired( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif @@ -218,7 +218,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("cannot get typedescription for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); @@ -248,7 +248,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) { throw RuntimeException( OUString("no rtti for type ") + - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) ); + OUString::unacquired( &pUnoExc->pType->pTypeName ) ); } } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 903346a0450e..8c24c0d9e941 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -396,7 +396,7 @@ void * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTypeDescr ) thro void * pRaiseInfo; - OUString const & rTypeName = *reinterpret_cast< OUString * >( &pTypeDescr->pTypeName ); + OUString const & rTypeName = OUString::acquire( &pTypeDescr->pTypeName ); MutexGuard aGuard( s_pInfos->_aMutex ); t_string2PtrMap::const_iterator const iFind( s_pInfos->_allRaiseInfos.find( rTypeName ) ); diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 28cab11777ad..6c23788f6fb0 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -755,7 +755,7 @@ RaiseInfo * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTD ) throw RaiseInfo * pRaiseInfo; - OUString const & rTypeName = *reinterpret_cast< OUString * >( &pTD->pTypeName ); + OUString const & rTypeName = OUString::acquire( &pTD->pTypeName ); MutexGuard aGuard( s_pInfos->_aMutex ); t_string2PtrMap::const_iterator const iFind( s_pInfos->_allRaiseInfos.find( rTypeName ) ); diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index f0a31d29f94c..4ae195745b41 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1957,7 +1957,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName( if (0 == *ppRet) { // check for sequence - OUString const & name = *reinterpret_cast< OUString const * >( &pName ); + OUString const & name = OUString::unacquired( &pName ); if (2 < name.getLength() && '[' == name[ 0 ]) { OUString element_name( name.copy( 2 ) ); diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index e2ff943afe3a..715555a64a13 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -816,7 +816,7 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle( handle = get_static_bootstrap_handle(); } OUString expanded( expandMacros( static_cast< Bootstrap_Impl * >( handle ), - * reinterpret_cast< OUString const * >( macro ), + OUString::unacquired( macro ), LOOKUP_MODE_NORMAL, NULL ) ); rtl_uString_assign( macro, expanded.pData ); } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index b8d4682b92b3..6fb7c6fd5a73 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -324,7 +324,7 @@ inline bool AdapterImpl::coerce_construct( static void handleInvokExc( uno_Any * pDest, uno_Any * pSource ) { OUString const & name = - *reinterpret_cast< OUString const * >( &pSource->pType->pTypeName ); + OUString::unacquired( &pSource->pType->pTypeName ); if ( name == "com.sun.star.reflection.InvocationTargetException" ) { diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index e772b9f161e1..82767f1b57ae 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -272,7 +272,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction { // avoid ref-counting OUString const & typeName = - *reinterpret_cast< OUString const * >( &acc.pType->pTypeName ); + OUString::unacquired( &acc.pType->pTypeName ); if ( typeName == "com.sun.star.security.XAccessControlContext" ) { return Reference< security::XAccessControlContext >( |