[Libreoffice-commits] core.git: bridges/source

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c85e36bc856f52f7992ef120cb12d02f52ca0419
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 8 14:19:16 2015 +0100

    loplugin:cstylecast,stringconstant
    
    Change-Id: Iffc8cbf108310099318e37378c4b3033ea087cee

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index a6543c5..faabee7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -170,7 +170,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
                     type_info * base_rtti = getRTTI(
                         (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
                     rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
+                        strdup( rttiName ), static_cast<__class_type_info *>(base_rtti) );
                 }
                 else
                 {
@@ -233,7 +233,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     if (! pTypeDescr)
     {
         throw RuntimeException(
-            OUString("cannot get typedescription for type ") +
+            "cannot get typedescription for type " +
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
@@ -263,7 +263,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     if (! rtti)
     {
         throw RuntimeException(
-            OUString("no rtti for type ") +
+            "no rtti for type " +
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
@@ -291,7 +291,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
     {
-        RuntimeException aRE( OUString("exception type not found: ") + unoName );
+        RuntimeException aRE( "exception type not found: " + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);