diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-28 12:50:02 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-29 09:01:40 +0200 |
commit | ebc0a15515c2e29259a7e229cfbdfb5d26fc3006 (patch) | |
tree | 2ce9446ed312a1a7aed53183b19ecc9fefabea8a /bridges | |
parent | f0ae48b684e89acd7088c31a8feff5fc03d51105 (diff) |
remove more unnecesary OUString constructor use
when throwing exceptions
Change-Id: I6edfb6b6745499f802b0e3c0e096a36fb7c32aac
Diffstat (limited to 'bridges')
16 files changed, 32 insertions, 95 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index d65d3d1422c4..799676279ed5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -383,9 +383,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -477,9 +475,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index fc25a0daca2f..99147e35bb25 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -315,9 +315,7 @@ namespace "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -414,9 +412,7 @@ namespace } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 06836d656233..bff59bff06f2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -421,9 +421,7 @@ namespace "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -520,9 +518,7 @@ namespace } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 1b1ab8f8689a..b638d6c80544 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -359,9 +359,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -460,9 +458,7 @@ static typelib_TypeClass cpp_mediate( fprintf(stderr, "screwed\n"); #endif - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index b76f9715dbd9..d75b9a1c8bc7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -239,9 +239,7 @@ extern "C" void cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -328,9 +326,7 @@ extern "C" void cpp_vtable_call( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } } diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index cd677d0e36e1..aa78fce4d904 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -289,9 +289,7 @@ namespace "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -388,9 +386,7 @@ namespace } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 7bea1874314e..f54ec5ed3ff5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -422,9 +422,7 @@ namespace OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -535,9 +533,7 @@ namespace #ifdef BRDEBUG fprintf(stderr,"cpp_mediate6\n"); #endif - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index ae844a76e6b7..889046c5f3ad 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -382,9 +382,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -475,9 +473,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 29e134a8b8d1..5d7d9d966dd9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -380,9 +380,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -481,9 +479,7 @@ static typelib_TypeClass cpp_mediate( fprintf(stderr, "screwed\n"); #endif - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 80c07305a3cd..7fcefedaa4cf 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -347,9 +347,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -440,9 +438,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index 901492e4d7e8..35b26d79388e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -368,9 +368,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pCppI ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI ); } // determine called method @@ -461,9 +459,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pCppI ); + throw RuntimeException( "no member description found!", (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx index f98963a2a87d..eafc26c8e900 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx @@ -249,9 +249,7 @@ extern "C" void cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -340,9 +338,7 @@ extern "C" void cpp_vtable_call( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } } diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx index a2020c05023e..f9e1cdeb9f17 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx @@ -359,9 +359,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -452,9 +450,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index 0073b77dea4a..2b3576b15bf2 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -247,9 +247,7 @@ static typelib_TypeClass cpp_mediate( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -340,9 +338,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index 7cc8f956b17d..49b7bd0c2477 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -247,9 +247,7 @@ extern "C" void cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString( "illegal vtable index!" ), - (XInterface *)pThis ); + throw RuntimeException( "illegal vtable index!", (XInterface *)pThis ); } // determine called method @@ -336,9 +334,7 @@ extern "C" void cpp_vtable_call( } default: { - throw RuntimeException( - OUString( "no member description found!" ), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 016f7248f290..58e3fbc96ac2 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -337,9 +337,7 @@ static typelib_TypeClass __cdecl cpp_mediate( } default: { - throw RuntimeException( - OUString("no member description found!"), - (XInterface *)pThis ); + throw RuntimeException( "no member description found!", (XInterface *)pThis ); } } @@ -442,8 +440,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI( - OUString( - "com.sun.star.uno.XInterface"))) + OUString("com.sun.star.uno.XInterface"))) {} }; static Rtti rtti; |