diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /bridges | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'bridges')
65 files changed, 187 insertions, 189 deletions
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index dc2151409ddb..5c0db33946b8 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -471,7 +471,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx index 2441d6dfd024..41af149ebcc2 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -223,7 +223,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -255,7 +255,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -270,7 +270,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -290,7 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx index 3a20ed84fd91..7d85b1a3746a 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -661,7 +661,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx index 0ef3a6362dfc..366c18eab6f4 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -467,7 +467,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index 765a9efe64db..be610bbd2a4d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index e902036317e5..fa9eccbc70ba 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -508,7 +508,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index f42ab848a8aa..61d0fe5795a8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -317,7 +317,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -416,7 +416,7 @@ namespace default: { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index f09e43df7334..1e8917e0fba5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -256,7 +256,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -287,7 +287,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -314,7 +314,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -335,7 +335,7 @@ namespace CPPU_CURRENT_NAMESPACE if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index b8b7d84961a5..66d43bbd8704 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -720,7 +720,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index b9cdedf7591f..0befa137b699 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -423,7 +423,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -522,7 +522,7 @@ namespace default: { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index 5d20e79e6939..73124c4afe63 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -232,7 +232,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -263,7 +263,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -284,7 +284,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -305,7 +305,7 @@ namespace CPPU_CURRENT_NAMESPACE if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index c0aa204a925a..4efc23488fad 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -498,7 +498,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 55cff3530184..635c7e74c53b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index 7b3dd8407d71..a0212286ad6d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -666,7 +666,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index e9958f56a5b4..0bf81064a588 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index c945c1a0ff43..95259f9dcb32 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -243,7 +243,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -274,7 +274,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -289,7 +289,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -310,7 +310,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index ade3a0be45b8..4e3f7db4c811 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -365,7 +365,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index e4c5be1e46ce..8d0ee8cfd10b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -291,7 +291,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -390,7 +390,7 @@ namespace default: { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 5d20e79e6939..73124c4afe63 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -232,7 +232,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -263,7 +263,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -284,7 +284,7 @@ namespace CPPU_CURRENT_NAMESPACE if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -305,7 +305,7 @@ namespace CPPU_CURRENT_NAMESPACE if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index 47b22ad0541f..312744065023 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -470,7 +470,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 18430dd623b5..335e05fad1fc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -425,7 +425,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -538,7 +538,7 @@ namespace fprintf(stderr,"cpp_mediate6\n"); #endif throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index dc698eacae77..3014c1306c41 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -260,7 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -275,7 +275,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -296,7 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index 6b1f930e8551..e14e86f09d6e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index 6c10b0c96a16..6d57c134f63a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index 70d170fd5261..5d1c47ca6d6d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -659,7 +659,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 9b292b7e406d..9404471a1474 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index a5f44250608c..03dbd00c2184 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 3fe5adea020e..ba384f74472d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 240a9825f866..7b5c99e7268b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -610,7 +610,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index f9b05ab12aa1..e571bd2a555c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index 6cb75b6b995a..ac7607ad8b3f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -513,7 +513,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 1ee71c7e405f..2870b38aca14 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -230,7 +230,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -261,7 +261,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -276,7 +276,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -297,7 +297,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index b16dfc41a30a..fc92e3922e70 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index f069fdf307f3..be946383d975 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -281,7 +281,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex ) { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")), + throw RuntimeException( OUString("illegal vtable index!"), reinterpret_cast<XInterface *>( pCppI ) ); } @@ -378,7 +378,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")), + throw RuntimeException( OUString("no member description found!"), reinterpret_cast<XInterface *>( pCppI ) ); } } 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 1468267c3f63..6991d5becfc1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -250,7 +250,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -268,7 +268,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -283,7 +283,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -304,7 +304,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); 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 1872f31bfed2..7be37bbe18c0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -248,8 +248,7 @@ static void cpp_call( } catch (...) { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "C++ code threw unknown exception")), + "C++ code threw unknown exception"), Reference< XInterface >()); } @@ -435,7 +434,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index 2b55304ae1c5..c5dd24630ff3 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -298,7 +298,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -329,7 +329,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -344,7 +344,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -365,7 +365,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx index 3d327c66adec..0bef4f8f1182 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx @@ -470,7 +470,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx index 47175358931d..7fb88fe723be 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx @@ -333,7 +333,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -425,7 +425,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx index 7a4856ac045f..8e63487af658 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx @@ -621,7 +621,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 89faee199c54..ffdf38f92084 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -281,7 +281,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex ) { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")), + throw RuntimeException( OUString("illegal vtable index!"), reinterpret_cast<XInterface *>( pCppI ) ); } @@ -378,7 +378,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")), + throw RuntimeException( OUString("no member description found!"), reinterpret_cast<XInterface *>( pCppI ) ); } } 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 cd2d69805a0d..1c2c54c69a8e 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -309,7 +309,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -341,7 +341,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -356,7 +356,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -377,7 +377,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); 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 1872f31bfed2..7be37bbe18c0 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -248,8 +248,7 @@ static void cpp_call( } catch (...) { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "C++ code threw unknown exception")), + "C++ code threw unknown exception"), Reference< XInterface >()); } @@ -435,7 +434,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index 5e0d19025da4..ea0d05a50c92 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 7fba31a03018..d3058e4b3e49 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -232,7 +232,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -263,7 +263,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -278,7 +278,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -299,7 +299,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index 21b1dc7fd2c9..be63fdb0ccb1 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -404,7 +404,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 66d11c5350a2..95acfac20aa5 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI ); + throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } // determine called method @@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI ); + throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); } } return eRet; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 68f43fe61d94..5bce4876d3d5 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -260,7 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -275,7 +275,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -296,7 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index d59c0357aad3..d91d49039472 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -575,7 +575,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index d8b8bf2094ba..b29e3a7dce26 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), + rtl::OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), + rtl::OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index 9037c9f7e6c3..e86ab574a862 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -223,7 +223,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! pTypeDescr) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) + + OUString("cannot get typedescription for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -254,7 +254,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) if (! rtti) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) + + OUString("no rtti for type ") + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), Reference< XInterface >() ); } @@ -269,7 +269,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ), + OUString("no exception header!"), Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); @@ -290,7 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName, + OUString("exception type not found: ") + unoName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx index 6b6652d8e47f..dd26e389c280 100644 --- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx @@ -364,7 +364,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 374f3b943c91..7859fb505092 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ), + throw RuntimeException( rtl::OUString("illegal vtable index!"), (XInterface *)pThis ); } @@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate( default: { throw RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ), + rtl::OUString("no member description found!"), (XInterface *)pThis ); } } @@ -446,8 +446,8 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XInterface")))) + rtl::OUString( + "com.sun.star.uno.XInterface"))) {} }; static Rtti rtti; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 5ccc72a9de12..47e96d0b8aa3 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -442,7 +442,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 150d6bc82e0f..32c0109757a0 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex ) - throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal vtable index!")), + throw RuntimeException( rtl::OUString("Illegal vtable index!"), reinterpret_cast<XInterface *>( pCppI ) ); // Determine called method @@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No member description found!")), + throw RuntimeException( rtl::OUString("No member description found!"), reinterpret_cast<XInterface *>( pCppI ) ); } } @@ -456,8 +456,8 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XInterface")))) + rtl::OUString( + "com.sun.star.uno.XInterface"))) {} }; static Rtti rtti; 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 6040c3309273..6062332a75b9 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -412,7 +412,7 @@ void unoInterfaceProxyDispatch( pReturn, pArgs, ppException ) ) { RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("Too many parameters!") ), + OUString("Too many parameters!"), Reference< XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); @@ -424,7 +424,7 @@ void unoInterfaceProxyDispatch( default: { RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal member type description!") ), + OUString("Illegal member type description!"), Reference< XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index fddc097edb42..47a2a0bd0767 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -478,12 +478,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) } rtl::OUString Service::getImplementationName_static() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire.impl" )); + return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" ); } css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() { css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire" )); + names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" ); return names; } @@ -519,7 +519,7 @@ bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); keyName += implementationName; - keyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); + keyName += rtl::OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 106e0a318c48..dc3936f77f80 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -110,7 +110,7 @@ void Service::connect(rtl::OUString const & rConnection, css::connection::Connector::create(m_xContext)->connect(rConnection)); css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory( m_xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )), + rtl::OUString( "com.sun.star.bridge.BridgeFactory" ), m_xContext), css::uno::UNO_QUERY); m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol, @@ -126,7 +126,7 @@ Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException) css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() { css::uno::Sequence< rtl::OUString > aNames(1); - aNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testequals" )); + aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" ); return aNames; } @@ -179,7 +179,7 @@ bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, { rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); aKeyName += rtl::OUString::createFromAscii(pImplementationName); - aKeyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); + aKeyName += rtl::OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > xKey; try { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index df0991c245ac..907b4b41f2bd 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -75,27 +75,27 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )), + rtl::OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; try { relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >( factory->createInstanceWithContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.Relay" )), + rtl::OUString( "test.javauno.nativethreadpool.Relay" ), context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { throw; } catch (css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "creating test.javauno.nativethreadpool.Relay service" )), + rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } relay->start(this); if (!data.setData(reinterpret_cast< void * >(12345))) { throw new css::uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )), + rtl::OUString( "osl::ThreadData::setData failed" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=localhost,port=3830;urp;test" ))), + rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } bool success = source->get() == 12345; @@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( } rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.client" )); + return rtl::OUString( "test.javauno.nativethreadpool.client" ); } css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 607a05414c2e..6b7490b7732a 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )), + rtl::OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=127.0.0.1,port=3831;urp;test" ))), + rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )), + rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } return source->get(); @@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( } rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.server" )); + return rtl::OUString( "test.javauno.nativethreadpool.server" ); } css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx index e7c29c9402a4..052f598ba5e2 100644 --- a/bridges/test/testclient.cxx +++ b/bridges/test/testclient.cxx @@ -127,11 +127,11 @@ int main( int argc, char *argv[] ) { Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("client.rdb")) ); + OUString("client.rdb") ); Reference < XConnector > rConnector( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")), + createComponent( OUString("com.sun.star.connection.Connector"), OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); @@ -154,12 +154,12 @@ int main( int argc, char *argv[] ) else { // just ensure that it is registered - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")), + createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), rSMgr ); Reference < XBridgeFactory > rFactory( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")), + createComponent( OUString("com.sun.star.bridge.BridgeFactory"), OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); @@ -168,13 +168,13 @@ int main( int argc, char *argv[] ) { Reference < XBridge > rBridge = rFactory->createBridge( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")), + OUString("bla blub"), sProtocol, rConnection, new OInstanceProvider ); { // test the factory - Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); + Reference < XBridge > rBridge2 = rFactory->getBridge( OUString("bla blub") ); OSL_ASSERT( rBridge2.is() ); OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) ); OSL_ASSERT( rBridge2->getName() == rBridge->getName() ); @@ -183,7 +183,7 @@ int main( int argc, char *argv[] ) Reference < XInterface > rInitialObject = rBridge->getInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("bridges-testobject")) ); + OUString("bridges-testobject") ); if( rInitialObject.is() ) { @@ -211,7 +211,7 @@ int main( int argc, char *argv[] ) printf( "Closing...\n" ); } - Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); + Reference < XBridge > rBridge = rFactory->getBridge( OUString("bla blub") ); // OSL_ASSERT( ! rBridge.is() ); } diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 053772b0d051..21eadd91b100 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -71,7 +71,7 @@ void parseCommandLine( char *argv[] , if( -1 == nIndex ) { *pConnection = sTemp; - *pProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) ); + *pProtocol = OUString( "iiop" ); } else { @@ -97,10 +97,10 @@ Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeExce ::com::sun::star::uno::RuntimeException) { // Tries to get the PerformanceTestObject - if( sObjectName == OUString( RTL_CONSTASCII_USTRINGPARAM( "TestRemoteObject" ) ) ) + if( sObjectName == OUString( "TestRemoteObject" ) ) { return m_rSMgr->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.performance.PerformanceTestObject") ) ); + OUString("com.sun.star.test.performance.PerformanceTestObject") ); } return Reference < XInterface > ( (::cppu::OWeakObject * ) new OTestFactory() ); } @@ -421,7 +421,7 @@ void OInterfaceTest::call() { if( m_rCallMe.is() ) { - m_rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM("This is my String during a callback!")) , 5); + m_rCallMe->call( OUString("This is my String during a callback!") , 5); } } @@ -487,7 +487,7 @@ double getCallsPerSec( const Reference < XCallMe > &rCall , int nLoops, int nToD osl_getSystemTime( &aStartTime ); for( sal_Int32 i = 0; i < nLoops; i ++ ) { - rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo ); + rCall->call( OUString("Performance test string") , nToDo ); } osl_getSystemTime( &aEndTime ); @@ -506,12 +506,12 @@ double getCallsPerSecOneway( const Reference < XCallMe > &rCall , osl_getSystemTime( &aStartTime ); for( sal_Int32 i = 0; i < nLoops; i ++ ) { -// rCall->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string" )), 0 ); +// rCall->callOneway( OUString("Performance test string" ), 0 ); rCall->drawLine( 0 , 0 , 500 , 123 ); } osl_getSystemTime( &aEndTime ); - rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo ); + rCall->call( OUString("Performance test string") , nToDo ); osl_getSystemTime( &aAfterExecution ); double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0); @@ -577,7 +577,7 @@ void testPerformance( const Reference < XCallMe > &rRemote, void testException( const Reference < XCallMe > &r ) { try { - r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 ); + r->call( OUString("dummy") , -1 ); OSL_ASSERT( ! "no exception flown !" ); } catch( TestBridgeException & e ) @@ -599,7 +599,7 @@ void testSequenceOfCalls( const Reference< XCallMe > & rRCallMe ) printf( "Testing sequence of calls\n" ); for( sal_Int32 i = 0 ; i < 800 ; i ++ ) { - rRCallMe->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("hifuj" )), 0 ); + rRCallMe->callOneway( OUString("hifuj" ), 0 ); } } @@ -622,7 +622,7 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe ) types.UHyper = 1 << i*2; types.Float = (float)123.239; types.Double = 1279.12490012; - types.String = OUString( RTL_CONSTASCII_USTRINGPARAM("abcdefghijklmnopqrstuvwxyz")); + types.String = OUString("abcdefghijklmnopqrstuvwxyz"); types.Interface = Reference< XInterface >( rRCallMe , UNO_QUERY); types.Any <<= types.Double; @@ -761,7 +761,7 @@ Reference <XInterface > createComponent( const OUString &sService , // erst registrieren Reference < XImplementationRegistration > rReg ( rSMgr->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" ))), + OUString( "com.sun.star.registry.ImplementationRegistration" )), UNO_QUERY ); OSL_ASSERT( rReg.is() ); @@ -770,7 +770,7 @@ Reference <XInterface > createComponent( const OUString &sService , try { rReg->registerImplementation( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )), + OUString( "com.sun.star.loader.SharedLibrary" ), aDllName, Reference< XSimpleRegistry > () ); rInterface = rSMgr->createInstance( sService ); diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx index 55c28f4d1b0d..3f9157d01c3b 100644 --- a/bridges/test/testoffice.cxx +++ b/bridges/test/testoffice.cxx @@ -156,7 +156,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr ) Reference< XComponent > rComponent = rLoader->loadComponentFromURL( OUString::createFromAscii( urls[i] ) , - OUString( RTL_CONSTASCII_USTRINGPARAM("_blank")), + OUString("_blank"), 0 , Sequence < ::com::sun::star::beans::PropertyValue >() ); @@ -175,7 +175,7 @@ void doSomething( const Reference < XInterface > &r ) { printf( "got the remote naming service !\n" ); Reference < XInterface > rXsmgr = rName->getRegisteredObject( - OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )) ); + OUString( "StarOffice.ServiceManager" ) ); Reference < XMultiServiceFactory > rSmgr( rXsmgr , UNO_QUERY ); if( rSmgr.is() ) @@ -203,22 +203,22 @@ int main( int argc, char *argv[] ) parseCommandLine( argv , &sConnectionString , &sProtocol , &bLatency , &bReverse ); { Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" ) ) ); + OUString( "client.rdb" ) ); // just ensure that it is registered Reference < XConnector > rConnector( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")), + createComponent( OUString("com.sun.star.connection.Connector"), OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")), + createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), rSMgr ); Reference < XBridgeFactory > rFactory( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")), + createComponent( OUString("com.sun.star.bridge.BridgeFactory"), OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); @@ -231,13 +231,13 @@ int main( int argc, char *argv[] ) rConnector->connect( sConnectionString ); Reference < XBridge > rBridge = rFactory->createBridge( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")), + OUString("bla blub"), sProtocol, rConnection, Reference < XInstanceProvider > () ); Reference < XInterface > rInitialObject - = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("NamingService")) ); + = rBridge->getInstance( OUString("NamingService") ); if( rInitialObject.is() ) { diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx index 33781aaab08d..00d399b25400 100644 --- a/bridges/test/testsameprocess.cxx +++ b/bridges/test/testsameprocess.cxx @@ -94,7 +94,7 @@ void MyThread::run() Reference < XBridge > rBridge = m_rBridgeFactory->createBridge( OUString() , - OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")) , + OUString("iiop") , rConnection , (XInstanceProvider * ) new OInstanceProvider ); @@ -119,27 +119,27 @@ int main( int argc, char *argv[] ) { Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" ) ) ); + OUString( "client.rdb" ) ); Reference < XConnector > rConnector( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")), + createComponent( OUString("com.sun.star.connection.Connector"), OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); Reference < XAcceptor > rAcceptor( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")), + createComponent( OUString("com.sun.star.connection.Acceptor"), OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); // just ensure that it is registered -// createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")), +// createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), // OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)), // rSMgr ); Reference < XBridgeFactory > rFactory( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")), + createComponent( OUString("com.sun.star.bridge.BridgeFactory"), OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), rSMgr ), UNO_QUERY ); @@ -163,13 +163,13 @@ int main( int argc, char *argv[] ) { Reference < XBridge > rBridge = rFactory->createBridge( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")), - OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")), + OUString("bla blub"), + OUString("iiop"), rConnection, Reference < XInstanceProvider > () ); Reference < XInterface > rInitialObject - = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("bla")) ); + = rBridge->getInstance( OUString("bla") ); if( rInitialObject.is() ) { @@ -182,7 +182,7 @@ int main( int argc, char *argv[] ) } Reference < XBridge > rBridge = rFactory->getBridge( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); + OUString("bla blub") ); OSL_ASSERT( ! rBridge.is() ); } diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx index d021294da6b0..4617b2350739 100644 --- a/bridges/test/testserver.cxx +++ b/bridges/test/testserver.cxx @@ -139,17 +139,17 @@ void MyThread::run() { printf( "doing reverse callme test (test is ok, when on each line a +- appears\n" ); Reference < XInterface > r = rBridge->getInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("blubber" ))); + OUString("blubber" )); Reference < XTestFactory > rFactory( r , UNO_QUERY ); Reference < XCallMe > rCallMe = rFactory->createCallMe(); for( sal_Int32 i = 0 ; i < 1 ; i ++ ) { rCallMe->callOneway( - OUString( RTL_CONSTASCII_USTRINGPARAM("my test string")) , 2 ); + OUString("my test string") , 2 ); } printf( "all oneway are send\n" ); - rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM( "reverse call me test finished" )) , 0 ); + rCallMe->call( OUString( "reverse call me test finished" ) , 0 ); printf( "revers callme test finished\n" ); } } @@ -190,22 +190,22 @@ int main( int argc, char *argv[] ) { Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( "server.rdb" ) ) ); + OUString( "server.rdb" ) ); Reference < XBridgeFactory > rBridgeFactory ( createComponent( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")), + OUString("com.sun.star.bridge.BridgeFactory"), OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )), rSMgr ), UNO_QUERY ); - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")), + createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), rSMgr ); Reference < XAcceptor > rAcceptor( - createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")), + createComponent( OUString("com.sun.star.connection.Acceptor"), OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)), rSMgr ) , UNO_QUERY ); |