remove boilerplate in UNO Exception constructor calls

Now that we have default values for Exception constructor params,
remove lots of boilerplate code.

Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74

20 files changed, 92 insertions, 195 deletions

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 1ab474212989..875baa346867 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -310,8 +310,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -341,8 +340,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -353,9 +351,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -373,9 +369,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index c79d8d4aacc1..a7234c2968d8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -254,40 +254,38 @@ namespace CPPU_CURRENT_NAMESPACE
             {
                 throw RuntimeException(
                     OUString("cannot get typedescription for type ") +
-                    *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                    Reference< XInterface >() );
+                    *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
             }
 
             pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
             ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
 
-        // destruct uno exception
-        ::uno_any_destruct( pUnoExc, 0 );
-        // avoiding locked counts
-        static RTTI * s_rtti = 0;
-        if (! s_rtti)
-        {
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if (! s_rtti)
-            {
+            // destruct uno exception
+           ::uno_any_destruct( pUnoExc, 0 );
+           // avoiding locked counts
+           static RTTI * s_rtti = 0;
+           if (! s_rtti)
+           {
+               MutexGuard guard( Mutex::getGlobalMutex() );
+               if (! s_rtti)
+               {
 #ifdef LEAK_STATIC_DATA
-                s_rtti = new RTTI();
+                   s_rtti = new RTTI();
 #else
-                static RTTI rtti_data;
-                s_rtti = &rtti_data;
+                   static RTTI rtti_data;
+                   s_rtti = &rtti_data;
 #endif
-            }
-        }
-        rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-        TYPELIB_DANGER_RELEASE( pTypeDescr );
-        OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-        if (! rtti)
-        {
-            throw RuntimeException(
-                OUString("no rtti for type ") +
-                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                Reference< XInterface >() );
-        }
+               }
+           }
+           rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
+           TYPELIB_DANGER_RELEASE( pTypeDescr );
+           OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+           if (! rtti)
+           {
+               throw RuntimeException(
+                   OUString("no rtti for type ") +
+                   *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
+           }
         }
 
         __cxa_throw( pCppExc, rtti, deleteException );
@@ -309,9 +307,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
         if (! header)
         {
-            RuntimeException aRE(
-                OUString("no exception header!"),
-                Reference< XInterface >() );
+            RuntimeException aRE( "no exception header!" );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -330,9 +326,7 @@ namespace CPPU_CURRENT_NAMESPACE
         typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
         if (0 == pExcTypeDescr)
         {
-            RuntimeException aRE(
-                OUString("exception type not found: ") + unoName,
-                Reference< XInterface >() );
+            RuntimeException aRE( OUString("exception type not found: ") + unoName );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 754117dd94d5..73d0b7132f05 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -230,8 +230,7 @@ namespace CPPU_CURRENT_NAMESPACE
         {
             throw RuntimeException(
                 OUString("cannot get typedescription for type ") +
-                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                Reference< XInterface >() );
+                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
         }
 
         pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ namespace CPPU_CURRENT_NAMESPACE
         {
             throw RuntimeException(
                 OUString("no rtti for type ") +
-                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                Reference< XInterface >() );
+                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
         }
         }
 
@@ -279,9 +277,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
         if (! header)
         {
-            RuntimeException aRE(
-                OUString("no exception header!"),
-                Reference< XInterface >() );
+            RuntimeException aRE( "no exception header!" );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -301,8 +297,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (0 == pExcTypeDescr)
         {
             RuntimeException aRE(
-                OUString("exception type not found: ") + unoName,
-                Reference< XInterface >() );
+                OUString("exception type not found: ") + unoName );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 8dadc79e1954..165704d1b441 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -236,8 +236,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
@@ -267,8 +266,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -279,9 +277,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -300,9 +296,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 754117dd94d5..289a0200bb9e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -230,8 +230,7 @@ namespace CPPU_CURRENT_NAMESPACE
         {
             throw RuntimeException(
                 OUString("cannot get typedescription for type ") +
-                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                Reference< XInterface >() );
+                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
         }
 
         pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ namespace CPPU_CURRENT_NAMESPACE
         {
             throw RuntimeException(
                 OUString("no rtti for type ") +
-                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-                Reference< XInterface >() );
+                *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
         }
         }
 
@@ -279,9 +277,7 @@ namespace CPPU_CURRENT_NAMESPACE
     {
         if (! header)
         {
-            RuntimeException aRE(
-                OUString("no exception header!"),
-                Reference< XInterface >() );
+            RuntimeException aRE( "no exception header!" );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -300,9 +296,7 @@ namespace CPPU_CURRENT_NAMESPACE
         typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
         if (0 == pExcTypeDescr)
         {
-            RuntimeException aRE(
-                OUString("exception type not found: ") + unoName,
-                Reference< XInterface >() );
+            RuntimeException aRE( OUString("exception type not found: ") + unoName );
             Type const & rType = ::getCppuType( &aRE );
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 84b12a35e8e8..0a6a211f272e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -227,8 +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 ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -258,8 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -270,9 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
@@ -291,9 +287,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index d238c94e8c86..78ff54f706b6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -228,8 +228,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -260,7 +259,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         throw RuntimeException(
             OUString("no rtti for type ") +
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+             );
     }
     }
 
@@ -271,9 +270,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
@@ -292,9 +289,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
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 08063a674bef..c2f1a146f3de 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -243,8 +243,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -273,9 +271,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -294,9 +290,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
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 d460180eb5b6..b5200544b764 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -242,13 +242,9 @@ static void cpp_call(
             appendCString(buf, typeid(e).name());
             buf.append(": ");
             appendCString(buf, e.what());
-            throw RuntimeException(
-                buf.makeStringAndClear(), Reference< XInterface >());
+            throw RuntimeException(buf.makeStringAndClear());
         } catch (...) {
-            throw RuntimeException(
-                OUString(
-                        "C++ code threw unknown exception"),
-                Reference< XInterface >());
+            throw RuntimeException("C++ code threw unknown exception");
         }
 
         *ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 6988dcb42e64..2368541c654e 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -305,8 +305,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -336,8 +335,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -348,9 +346,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -369,9 +365,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
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 664a5c09d8d3..8ba8688b6d0f 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -315,8 +315,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -346,8 +345,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -358,9 +356,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -379,9 +375,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index e35493e199cc..11a8cd4242dc 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -243,12 +243,9 @@ static void cpp_call(
             buf.append(": ");
             appendCString(buf, e.what());
             throw RuntimeException(
-                buf.makeStringAndClear(), Reference< XInterface >());
+                buf.makeStringAndClear());
         } catch (...) {
-            throw RuntimeException(
-                OUString(
-                        "C++ code threw unknown exception"),
-                Reference< XInterface >());
+            throw RuntimeException("C++ code threw unknown exception");
         }
 
         *ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 25d4c2bf4c93..71502dbc3d7d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -230,8 +230,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -273,9 +271,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -294,9 +290,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index f0447a16580c..16e13c9b3182 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -227,8 +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 ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -258,8 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -270,9 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
@@ -291,9 +287,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 3091dc56758d..ea75423f5167 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -221,8 +221,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -252,8 +251,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -264,9 +262,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -285,9 +281,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index 3091dc56758d..ea75423f5167 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -221,8 +221,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("cannot get typedescription for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
 
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -252,8 +251,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     {
         throw RuntimeException(
             OUString("no rtti for type ") +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
+            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
     }
     }
 
@@ -264,9 +262,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 {
     if (! header)
     {
-        RuntimeException aRE(
-            OUString("no exception header!"),
-            Reference< XInterface >() );
+        RuntimeException aRE( "no exception header!" );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
@@ -285,9 +281,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,
-            Reference< XInterface >() );
+        RuntimeException aRE( OUString("exception type not found: ") + unoName );
         Type const & rType = ::getCppuType( &aRE );
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
index 0ff2880e46cc..6684de9e0dbd 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
@@ -238,13 +238,9 @@ static void cpp_call(
             appendCString(buf, typeid(e).name());
             buf.append(": ");
             appendCString(buf, e.what());
-            throw RuntimeException(
-                buf.makeStringAndClear(), Reference< XInterface >());
+            throw RuntimeException(buf.makeStringAndClear());
         } catch (...) {
-            throw RuntimeException(
-                OUString(
-                        "C++ code threw unknown exception"),
-                Reference< XInterface >());
+            throw RuntimeException("C++ code threw unknown exception");
         }
 
         *ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 04f6d0b7ac7d..d5637e79cb37 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -539,8 +539,7 @@ int msci_filterCppException(
                     buf.append( "\", RTTI-name=\"" );
                     buf.append( aRTTIname );
                     buf.append( "\"!" );
-                    RuntimeException exc(
-                        buf.makeStringAndClear(), Reference< XInterface >() );
+                    RuntimeException exc( buf.makeStringAndClear() );
                     uno_type_any_constructAndConvert(
                         pUnoExc, &exc,
                         ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
@@ -565,10 +564,8 @@ int msci_filterCppException(
     }
     // though this unknown exception leaks now, no user-defined exception
     // is ever thrown thru the binary C-UNO dispatcher call stack.
-    RuntimeException exc(
-        OUString( "[msci_uno bridge error] unexpected "
-                  "C++ exception occurred!" ),
-        Reference< XInterface >() );
+    RuntimeException exc( "[msci_uno bridge error] unexpected "
+                  "C++ exception occurred!" );
     uno_type_any_constructAndConvert(
         pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
     return EXCEPTION_EXECUTE_HANDLER;
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 26688aa29d96..b449a28e20ee 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -783,8 +783,7 @@ int mscx_filterCppException(
                     buf.append( "\", RTTI-name=\"" );
                     buf.append( aRTTIname );
                     buf.append( "\"!" );
-                    RuntimeException exc(
-                        buf.makeStringAndClear(), Reference< XInterface >() );
+                    RuntimeException exc( buf.makeStringAndClear() );
                     uno_type_any_constructAndConvert(
                         pUnoExc, &exc,
                         ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
@@ -804,10 +803,8 @@ int mscx_filterCppException(
     }
     // though this unknown exception leaks now, no user-defined exception
     // is ever thrown thru the binary C-UNO dispatcher call stack.
-    RuntimeException exc(
-        OUString( "[mscx_uno bridge error] unexpected "
-                  "C++ exception occurred!" ),
-        Reference< XInterface >() );
+    RuntimeException exc( "[mscx_uno bridge error] unexpected "
+                  "C++ exception occurred!" );
     uno_type_any_constructAndConvert(
         pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
     return EXCEPTION_EXECUTE_HANDLER;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 67f2a0df99ce..7acf4505c489 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -411,9 +411,7 @@ void unoInterfaceProxyDispatch(
                      ((typelib_InterfaceMethodTypeDescription *)pMemberTD)->pParams,
                      pReturn, pArgs, ppException ) )
             {
-                RuntimeException aExc(
-                    OUString("Too many parameters!"),
-                    Reference< XInterface >() );
+                RuntimeException aExc( "Too many parameters!" );
 
                 Type const & rExcType = ::getCppuType( &aExc );
                 ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
@@ -423,9 +421,7 @@ void unoInterfaceProxyDispatch(
     }
     default:
     {
-        RuntimeException aExc(
-            OUString("Illegal member type description!"),
-            Reference< XInterface >() );
+        RuntimeException aExc( "Illegal member type description!" );
 
         Type const & rExcType = ::getCppuType( &aExc );
         // Binary identical null reference (whatever that comment means...)