[Libreoffice-commits] core.git: bridges/inc bridges/source cppu/source sal/rtl stoc/source
Stephan Bergmann
sbergman at redhat.com
Tue Mar 31 08:46:10 PDT 2015
bridges/inc/bridges/cpp_uno/bridge.hxx | 2 +-
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 6 +++---
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 6 +++---
bridges/source/cpp_uno/mingw_intel/except.cxx | 6 +++---
bridges/source/cpp_uno/mingw_x86-64/except.cxx | 6 +++---
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 2 +-
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2 +-
cppu/source/typelib/typelib.cxx | 2 +-
sal/rtl/bootstrap.cxx | 2 +-
stoc/source/invocation_adapterfactory/iafactory.cxx | 2 +-
stoc/source/security/access_controller.cxx | 2 +-
20 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 96f5b780f083ff97af5f570836267565d963e742
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Mar 31 17:43:43 2015 +0200
Use OUString::unacquired
found with
git grep -E '\* *\<reinterpret_cast\>[^>]+\<OUString\>'
Change-Id: I9306d4ad8e3b1664f54cb7df86f2d79bfd3c6cb9
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 6f43694..37ba95d 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 9af0e32..c4befc9 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 520c49f..bccc2ce 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 57808f9..833a415 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 9ccdd35..c36e1d9 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 13a8b8f..176d4e0 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 419cae7..7f9cd88 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 cb50f35..5d3233e 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 338fcb9..10530d8c 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 34ab8fe..0fd9d6a 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 946f105..6415c5b 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 20a4907..0e7bb8a 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 aabc8a0..4b49119 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 aabc8a0..4b49119 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 903346a0..8c24c0d 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 28cab11..6c23788 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 f0a31d2..4ae1957 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 e2ff943..715555a 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 b8d4682..6fb7c6f 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 e772b9f..82767f1 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 >(
More information about the Libreoffice-commits
mailing list