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 | |
| 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>
1024 files changed, 6344 insertions, 6673 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 ); diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index a721f77bf839..1b6a9e426b5d 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -208,10 +208,10 @@ WriterThread::WriterThread( bool WriterThread::iteration() { rtl::OUString options[] = { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fish")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("chips")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("kippers")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bloaters")) }; + rtl::OUString("fish"), + rtl::OUString("chips"), + rtl::OUString("kippers"), + rtl::OUString("bloaters") }; test_.setKey(path_, name_, css::uno::makeAny(options[index_])); index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString)); return true; @@ -259,7 +259,7 @@ void RecursiveTest::test() { "dotuno:WebHtml"))), css::uno::UNO_QUERY_THROW); properties_->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), this); + rtl::OUString("Label"), this); step(); CPPUNIT_ASSERT(count_ == 0); css::uno::Reference< css::lang::XComponent >( @@ -306,8 +306,8 @@ void SimpleRecursiveTest::step() const { RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), - css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("step")))); + rtl::OUString("Label"), + css::uno::makeAny(rtl::OUString("step"))); } class CrossThreadTest: public RecursiveTest { @@ -332,13 +332,13 @@ void CrossThreadTest::step() const { RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))).join(); + rtl::OUString("Label")).join(); test_.resetKey( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))); + rtl::OUString("Label")); } void Test::setUp() { @@ -356,7 +356,7 @@ void Test::setUp() { cppu::createRegistryServiceFactory( rtl::OUString(registry, SAL_NO_ACQUIRE)), css::uno::UNO_QUERY_THROW)->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), + rtl::OUString("DefaultContext")), css::uno::UNO_QUERY_THROW); provider_ = css::configuration::theDefaultProvider::get(context_); } @@ -370,44 +370,40 @@ void Test::testKeyFetch() { rtl::OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale"))) >>= + rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("L10N/ooLocale")) >>= s); CPPUNIT_ASSERT( getKey( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString"))) >>= + rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("Test/AString")) >>= s); } void Test::testKeySet() { setKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString")), - css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baa")))); + rtl::OUString("/org.openoffice.Setup/Test"), + rtl::OUString("AString"), + css::uno::makeAny(rtl::OUString("baa"))); rtl::OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= + rtl::OUString("/org.openoffice.Setup/Test"), + rtl::OUString("AString")) >>= s); CPPUNIT_ASSERT( s == "baa" ); } void Test::testKeyReset() { if (resetKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString")))) + rtl::OUString("/org.openoffice.Setup/Test"), + rtl::OUString("AString"))) { rtl::OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= + rtl::OUString("/org.openoffice.Setup/Test"), + rtl::OUString("AString")) >>= s); CPPUNIT_ASSERT( s == "Foo" ); } @@ -421,7 +417,7 @@ void Test::testSetSetMemberName() { RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" ".uno:FontworkShapeType")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= + rtl::OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Shape" ); @@ -434,13 +430,11 @@ void Test::testSetSetMemberName() { css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNamed > member; access->getByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkGalleryFloater"))) >>= + rtl::OUString(".uno:FontworkGalleryFloater")) >>= member; CPPUNIT_ASSERT(member.is()); member->setName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkShapeType"))); + rtl::OUString(".uno:FontworkShapeType")); css::uno::Reference< css::util::XChangesBatch >( access, css::uno::UNO_QUERY_THROW)->commitChanges(); css::uno::Reference< css::lang::XComponent >( @@ -452,7 +446,7 @@ void Test::testSetSetMemberName() { RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" ".uno:FontworkShapeType")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= + rtl::OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Gallery" ); } @@ -475,11 +469,11 @@ void Test::testReadCommands() { if (access->getByName(names[j]) >>= child) { CPPUNIT_ASSERT(child.is()); child->getByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))); + rtl::OUString("Label")); child->getByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContextLabel"))); + rtl::OUString("ContextLabel")); child->getByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Properties"))); + rtl::OUString("Properties")); } } } @@ -492,32 +486,26 @@ void Test::testReadCommands() { void Test::testThreads() { struct Entry { rtl::OUString path; rtl::OUString relative; }; Entry list[] = { - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) }, + { rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("Test/AString") }, + { rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("Test/AString") }, { rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands")), + "/org.openoffice.UI.GenericCommands"), rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "UserInterface/Commands/dotuno:WebHtml/Label")) }, + "UserInterface/Commands/dotuno:WebHtml/Label") }, { rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands")), + "/org.openoffice.UI.GenericCommands"), rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "UserInterface/Commands/dotuno:NewPresentation/Label")) }, + "UserInterface/Commands/dotuno:NewPresentation/Label") }, { rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands")), + "/org.openoffice.UI.GenericCommands"), rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "UserInterface/Commands/dotuno:RecentFileList/Label")) }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")) }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/ABoolean")) } + "UserInterface/Commands/dotuno:RecentFileList/Label") }, + { rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("L10N/ooLocale") }, + { rtl::OUString("/org.openoffice.Setup"), + rtl::OUString("Test/ABoolean") } }; std::size_t const numReaders = sizeof list / sizeof (Entry); std::size_t const numWriters = numReaders - 2; @@ -619,12 +607,11 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess( css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), + rtl::OUString("nodepath"), css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess")), + "com.sun.star.configuration.ConfigurationAccess"), css::uno::Sequence< css::uno::Any >(&arg, 1)); } @@ -634,12 +621,11 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess( css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), + rtl::OUString("nodepath"), css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationUpdateAccess")), + "com.sun.star.configuration.ConfigurationUpdateAccess"), css::uno::Sequence< css::uno::Any >(&arg, 1)); } diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 3d554bfc4ddd..9f18e8fdb9b9 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -486,7 +486,7 @@ void Access::addContainerListener( checkLocalizedPropertyAccess(); if (!xListener.is()) { throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")), + OUString("null listener"), static_cast< cppu::OWeakObject * >(this)); } if (!disposed_) { diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 58d16efdfe9f..191e45dd9d9e 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -69,8 +69,7 @@ rtl::OString convertToUtf8( RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { throw css::uno::RuntimeException( - OUString( - RTL_CONSTASCII_USTRINGPARAM("cannot convert to UTF-8")), + OUString("cannot convert to UTF-8"), css::uno::Reference< css::uno::XInterface >()); } return s; diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index fbf4082f37d4..7d19e700dfbf 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -106,7 +106,7 @@ OConnectionWrapper::~OConnectionWrapper() // -------------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.drivers.OConnectionWrapper" ) ); + return ::rtl::OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index d15e69c1bfa0..f102744f10f6 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS { // get the null date Date aDate; - xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString("NullDate")) >>= aDate; return aDate; } catch ( const Exception& ) @@ -459,7 +459,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D { Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW ); Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW ); - OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate ); + OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= aFormatterNullDate ); } catch( const Exception& ) { diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 465702193b66..6b8f9c0e7a93 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -666,55 +666,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue() // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("SELECT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("INSERT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DELETE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("UPDATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("CREATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("READ"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("READ")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("ALTER")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DROP"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DROP")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("'")); return aValueRef; } // ----------------------------------------------------------------------------- @@ -818,13 +818,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA //------------------------------------------------------------------------------ rtl::OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet")); + return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); return aSNS; } //------------------------------------------------------------------ diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e41a1a70b510..309ec2fe58c1 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -996,7 +996,7 @@ Any ORowSetValue::makeAny() const case DataType::VARBINARY: case DataType::LONGVARBINARY: { - ::rtl::OUStringBuffer sVal(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0x"))); + ::rtl::OUStringBuffer sVal(::rtl::OUString("0x")); Sequence<sal_Int8> aSeq(getSequence()); const sal_Int8* pBegin = aSeq.getConstArray(); const sal_Int8* pEnd = pBegin + aSeq.getLength(); diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 68f1e163c7be..91fa458de183 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -35,13 +35,13 @@ namespace connectivity ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); uno::Reference< sdbc::XConnection > xConnection; - xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection); + xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),xConnection); m_xConnection = xConnection; } //------------------------------------------------------------------------------ rtl::OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")); + return ::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException) @@ -68,7 +68,7 @@ namespace connectivity Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ParameterSubstitution")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdb.ParameterSubstitution"); return aSNS; } diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 1f2a30a7b308..0f7830fa2692 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -93,7 +93,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it { ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable ); - collectColumnInformation(xConnection,sComposedName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ,m_pImpl->m_aColumnInfo); + collectColumnInformation(xConnection,sComposedName,::rtl::OUString("*") ,m_pImpl->m_aColumnInfo); aFind = m_pImpl->m_aColumnInfo.find(_rName); } if ( aFind != m_pImpl->m_aColumnInfo.end() ) @@ -180,7 +180,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " )); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD ")); + aSql += ::rtl::OUString(" ADD "); aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); @@ -203,7 +203,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP ")); + aSql += ::rtl::OUString(" DROP "); aSql += ::dbtools::quoteName( aQuote,_sElementName); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 02bad07afca8..210b642faac3 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ Reference< XRow > xRow(xRet,UNO_QUERY); ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo); Sequence< Any > aTypeInfoSettings; - aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")),aTypeInfoSettings); + aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString("TypeInfoSettings"),aTypeInfoSettings); if ( xRow.is() ) { diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 629556137b39..ea28c41c451e 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -136,7 +136,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName else { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE "))); + ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE ")); ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." )); @@ -233,7 +233,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions ); aSql += sIndexName - + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON ")) + + ::rtl::OUString(" ON ") + aComposedName; Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 1d020bf2b16d..1c8b6490ab02 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -257,7 +257,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c // ----------------------------------------------------------------------------- ::rtl::OUString OKeysHelper::getDropForeignKey() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP CONSTRAINT ")); + return ::rtl::OUString(" DROP CONSTRAINT "); } // ------------------------------------------------------------------------- // XDrop diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index f911f3e3e298..8a4baa2fa147 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -40,9 +40,9 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& ::rtl::OUString sUserWorkingFor; Sequence< ::rtl::OUString > sTableTypes(3); // we want all catalogues, all schemas, all tables - sTableTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - sTableTypes[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... + sTableTypes[0] = ::rtl::OUString("VIEW"); + sTableTypes[1] = ::rtl::OUString("TABLE"); + sTableTypes[2] = ::rtl::OUString("%"); // just to be sure to include anything else .... try { m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes); @@ -58,7 +58,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& static ODatabaseMetaDataResultSet::ORow aRow(8); aRow[5] = new ORowSetValueDecorator(sUserWorkingFor); aRow[6] = ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[7] = new ORowSetValueDecorator(::rtl::OUString("YES")); aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); aRows.push_back(aRow); @@ -74,7 +74,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getDropValue(); aRows.push_back(aRow); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCE"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("REFERENCE")); aRows.push_back(aRow); setRows(aRows); diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7a85113ad5d0..3822b9af2ecd 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -272,7 +272,7 @@ void OTableHelper::refreshColumns() aCatalog, m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")) + ::rtl::OUString("%") ) ); // collect the column names, together with their ordinal position @@ -476,10 +476,10 @@ void OTableHelper::refreshIndexes() ::rtl::OUString OTableHelper::getRenameStart() const { ::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME ")); - if ( m_Type == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")) ) - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" VIEW ")); + if ( m_Type == ::rtl::OUString("VIEW") ) + sSql += ::rtl::OUString(" VIEW "); else - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TABLE ")); + sSql += ::rtl::OUString(" TABLE "); return sSql; } @@ -512,7 +512,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx ::rtl::OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName - + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO ")); + + ::rtl::OUString(" TO "); sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName; diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 103db51025ed..70dd05740d8d 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -142,7 +142,7 @@ namespace dbtools { Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW ); Reference< XPropertySet > xDataSourceSettings( - xDataSource->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings" ) ) ), + xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ), UNO_QUERY_THROW ); _out_setting = xDataSourceSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _asciiName ) ); diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 8139793f9814..d06ca5e4e276 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, try { // determine the datatype of the column - _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"))) >>= nDataType; + _xColumn->getPropertyValue(::rtl::OUString("Type")) >>= nDataType; if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType) - _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scale"))) >>= nScale; + _xColumn->getPropertyValue(::rtl::OUString("Scale")) >>= nScale; } catch (Exception&) { @@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, } return getDefaultNumberFormat(nDataType, nScale, - ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsCurrency")))), + ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString("IsCurrency"))), _xTypes, _rLocale); } @@ -295,8 +295,8 @@ Reference< XConnection > getConnection_allowException( try { xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; - bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPasswordRequired")))); - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User"))) >>= sUser; + bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString("IsPasswordRequired"))); + xProp->getPropertyValue(::rtl::OUString("User")) >>= sUser; } catch(Exception&) { @@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro Reference< XConnection> xReturn; Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY); if (xRowSetProps.is()) - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xReturn; + xRowSetProps->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xReturn; return xReturn; } @@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R // 1. already connected? Reference< XConnection > xExistingConn( - xRowSetProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ) ), + xRowSetProps->getPropertyValue( ::rtl::OUString( "ActiveConnection" ) ), UNO_QUERY ); if ( xExistingConn.is() @@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R { if ( _bSetAsActiveConnection ) { - xRowSetProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( xExistingConn ) ); + xRowSetProps->setPropertyValue( ::rtl::OUString( "ActiveConnection" ), makeAny( xExistingConn ) ); // no auto disposer needed, since we did not create the connection } @@ -395,9 +395,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" )); ::rtl::OUString sDataSourceName; - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName; + xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; ::rtl::OUString sURL; - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sURL; + xRowSetProps->getPropertyValue(::rtl::OUString("URL")) >>= sURL; Reference< XConnection > xPureConnection; if (!sDataSourceName.isEmpty()) @@ -429,9 +429,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R if (!sUser.isEmpty()) { // use user and pwd together with the url Sequence< PropertyValue> aInfo(2); - aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); + aInfo.getArray()[0].Name = ::rtl::OUString("user"); aInfo.getArray()[0].Value <<= sUser; - aInfo.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")); + aInfo.getArray()[1].Name = ::rtl::OUString("password"); aInfo.getArray()[1].Value <<= sPwd; xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo ); } @@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R } else xRowSetProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), + ::rtl::OUString( "ActiveConnection" ), makeAny( xConnection.getTyped() ) ); } @@ -672,14 +672,14 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect if ( xComposerFac.is() ) { - Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.SingleSelectQueryComposer"))),UNO_QUERY); + Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY); if ( xComposer.is() ) { xComposer->setQuery( sStatementToExecute ); // Now set the filter to a dummy restriction which will result in an empty // result set. - xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0=1" )) ); + xComposer->setFilter( ::rtl::OUString( "0=1" ) ); sStatementToExecute = xComposer->getQuery( ); } } @@ -703,7 +703,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect { if ( xStatementProps.is() ) xStatementProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxRows" ) ), + ::rtl::OUString( "MaxRows" ), makeAny( sal_Int32( 0 ) ) ); } @@ -1235,19 +1235,19 @@ catch(const Exception&) //------------------------------------------------------------------------------ sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::INSERT) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::INSERT) != 0)); } //------------------------------------------------------------------------------ sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::UPDATE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::UPDATE) != 0)); } //------------------------------------------------------------------------------ sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::DELETE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::DELETE) != 0)); } // ----------------------------------------------------------------------------- Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) @@ -1284,19 +1284,19 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_False; - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )) ) >>= nCommandType ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )) ) >>= sCommand ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" )) ) >>= bEscapeProcessing ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "CommandType" ) ) >>= nCommandType ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sCommand ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing ); StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing ); // append sort - aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) ); + aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Order" ) ) ) ); // append filter sal_Bool bApplyFilter = sal_True; - _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter; + _rxRowSet->getPropertyValue( ::rtl::OUString( "ApplyFilter" ) ) >>= bApplyFilter; if ( bApplyFilter ) - aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) ); + aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Filter" ) ) ) ); aComposer.getQuery(); @@ -1352,8 +1352,8 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( ::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) { - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCatalogInSelect" ) ), sal_True ); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseSchemaInSelect" ) ), sal_True ); + sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseCatalogInSelect" ), sal_True ); + sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseSchemaInSelect" ), sal_True ); return impl_doComposeTableName( _rxConnection->getMetaData(), diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index db7b02bc8c26..a348e8743c66 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -160,14 +160,14 @@ namespace dbtools ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); if ( !aDefault.isEmpty() ) { - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT "))); + aSql.append(::rtl::OUString(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); } // if ( aDefault.getLength() ) if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS) - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"))); + aSql.append(::rtl::OUString(" NOT NULL")); if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty()) { @@ -184,7 +184,7 @@ namespace dbtools ::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) { - ::rtl::OUStringBuffer aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE TABLE "))); + ::rtl::OUStringBuffer aSql(::rtl::OUString("CREATE TABLE ")); ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData(); @@ -199,7 +199,7 @@ namespace dbtools ::dbtools::throwFunctionSequenceException(_xConnection); aSql.append(sComposedName); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aSql.append(::rtl::OUString(" (")); // columns Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); @@ -226,7 +226,7 @@ namespace ::rtl::OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))); + static const ::rtl::OUString sComma(::rtl::OUString(",")); const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" )); @@ -280,7 +280,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY "))); + aSql.append(::rtl::OUString(" PRIMARY KEY ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::UNIQUE) @@ -290,7 +290,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE "))); + aSql.append(::rtl::OUString(" UNIQUE ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::FOREIGN) @@ -302,7 +302,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY "))); + aSql.append(::rtl::OUString(" FOREIGN KEY ")); ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); ::dbtools::qualifiedNameComponents(xMetaData, sRefTable, @@ -321,16 +321,16 @@ namespace switch(nDeleteRule) { case KeyRule::CASCADE: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "))); + aSql.append(::rtl::OUString(" ON DELETE CASCADE ")); break; case KeyRule::RESTRICT: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "))); + aSql.append(::rtl::OUString(" ON DELETE RESTRICT ")); break; case KeyRule::SET_NULL: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "))); + aSql.append(::rtl::OUString(" ON DELETE SET NULL ")); break; case KeyRule::SET_DEFAULT: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "))); + aSql.append(::rtl::OUString(" ON DELETE SET DEFAULT ")); break; default: ; @@ -531,7 +531,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) { - xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); + xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) xProp = new connectivity::sdbcx::OColumn(_rName, ::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), @@ -563,7 +563,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection, if ( xDataSourceProperties.is() ) { Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ), + xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), UNO_QUERY_THROW ); OSL_VERIFY( xSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue ); @@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl:: return false; const Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ), + xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), UNO_QUERY_THROW ); @@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const : if ( xProp.is() ) { Sequence< PropertyValue > aInfo; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Info"))) >>= aInfo; + xProp->getPropertyValue(::rtl::OUString("Info")) >>= aInfo; const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty)); @@ -746,7 +746,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, // Some drivers put a table privilege as soon as any column has the privilege, // some drivers only if all columns have the privilege. // To unifiy the situation, collect column privileges here, too. - Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString("%")); Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY); if ( xColumnCurrentRow.is() ) { @@ -819,14 +819,14 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection, const ::rtl::OUString& _rName, ColumnInformationMap& _rInfo) { - static ::rtl::OUString STR_WHERE = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")); + static ::rtl::OUString STR_WHERE = ::rtl::OUString(" WHERE "); - ::rtl::OUString sSelect = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); + ::rtl::OUString sSelect = ::rtl::OUString("SELECT "); sSelect += _rName; - sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")); + sSelect += ::rtl::OUString(" FROM "); sSelect += _sComposedName; sSelect += STR_WHERE; - sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0 = 1")); + sSelect += ::rtl::OUString("0 = 1"); try { @@ -930,7 +930,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc throw SQLException( sMessage, NULL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22018" ) ), + ::rtl::OUString( "22018" ), 22018, Any() ); @@ -956,7 +956,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& throw SQLException( sMessage, NULL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22001" ) ), + ::rtl::OUString( "22001" ), 22001, Any() ); @@ -1007,10 +1007,10 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& } } else - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory")); + return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); } else - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory")); + return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); return ::rtl::OUString(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index d897c9e5ff8c..f80e7ac1907c 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -130,7 +130,7 @@ namespace dbtools _rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY ); // determine the field type, and whether it's a numeric field - OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= _rData.m_nFieldType ); + OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= _rData.m_nFieldType ); switch ( _rData.m_nFieldType ) { @@ -157,7 +157,7 @@ namespace dbtools // get the format key of our bound field Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW ); bool bHaveFieldFormat = false; - const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormatKey" ) ) ); + const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( "FormatKey" ) ); if ( xPSI->hasPropertyByName( sFormatKeyProperty ) ) { bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey ); @@ -173,7 +173,7 @@ namespace dbtools // some more formatter settings _rData.m_nKeyType = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey ); Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW ); - OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ) >>= _rData.m_aNullDate ); + OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= _rData.m_aNullDate ); // remember the formatter _rData.m_xFormatter = i_rNumberFormatter; diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index bd3c5f2c6c07..46be1486fc2d 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -228,14 +228,14 @@ namespace dbtools // format is: // <detail_column> = :<new_param_name> sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink ); - sFilter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " = :" )); + sFilter += ::rtl::OUString( " = :" ); // generate a parameter name which is not already used - _rNewParamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "link_from_" ) ); + _rNewParamName = ::rtl::OUString( "link_from_" ); _rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters ); while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() ) { - _rNewParamName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" ) ); + _rNewParamName += ::rtl::OUString( "_" ); } return sFilter += _rNewParamName; diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index bf65717dc997..414abf20eb19 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -149,7 +149,7 @@ namespace param sal_Int32 nProperties( aProperties.getLength() ); aProperties.realloc( nProperties + 1 ); aProperties[ nProperties ] = Property( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ), + ::rtl::OUString( "Value" ), PROPERTY_ID_VALUE, ::cppu::UnoType< Any >::get(), PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID @@ -186,11 +186,11 @@ namespace param { // TODO : aParamType & nScale can be obtained within the constructor .... sal_Int32 nParamType = DataType::VARCHAR; - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= nParamType ); + OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nParamType ); sal_Int32 nScale = 0; - if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) ) - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) >>= nScale ); + if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( "Scale" ) ) ) + OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= nScale ); if ( m_xValueDestination.is() ) { diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 8b6220ba6107..43ac90c181e4 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -141,7 +141,7 @@ namespace dbtools if ( !pReturn ) { // is it a text field ? sal_Int32 nType = DataType::OTHER; - _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) >>= nType; + _rxField->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nType; if ( ( DataType::CHAR == nType ) || ( DataType::VARCHAR == nType ) @@ -200,17 +200,17 @@ namespace dbtools try { Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() ); - if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) ) + if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString( "FormatKey" ) ) ) { sal_Int32 nFormatKey = 0; - _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) >>= nFormatKey; + _rxField->getPropertyValue( ::rtl::OUString( "FormatKey" ) ) >>= nFormatKey; if ( nFormatKey && m_xFormatter.is() ) { Locale aFormatLocale; ::comphelper::getNumberFormatProperty( m_xFormatter, nFormatKey, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Locale" ) ) + ::rtl::OUString( "Locale" ) ) >>= aFormatLocale; // valid locale @@ -347,8 +347,8 @@ namespace dbtools { // first try the international version ::rtl::OUString sSql; - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * ")); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE ")); + sSql += ::rtl::OUString("SELECT * "); + sSql += ::rtl::OUString(" FROM x WHERE "); sSql += sField; sSql += _rPredicateValue; ::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) ); diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 085f6e161d68..f0bf69a5bb63 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -127,7 +127,7 @@ namespace dbtools if ( _rData.sCommand.isEmpty() ) break; - sStatement = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) ); + sStatement = ::rtl::OUString( "SELECT * FROM " ); ::rtl::OUString sCatalog, sSchema, sTable; qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation ); @@ -149,12 +149,12 @@ namespace dbtools // a native query ? sal_Bool bQueryEscapeProcessing = sal_False; - xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" ) ) ) >>= bQueryEscapeProcessing; + xQuery->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing; if ( !bQueryEscapeProcessing ) break; // the command used by the query - xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Command" ) ) ) >>= sStatement; + xQuery->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sStatement; if ( sStatement.isEmpty() ) break; @@ -162,7 +162,7 @@ namespace dbtools Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); ::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer; xComposer.set( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), + xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); @@ -170,7 +170,7 @@ namespace dbtools xComposer->setElementaryQuery( sStatement ); // the sort order - const ::rtl::OUString sPropOrder( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) ) ); + const ::rtl::OUString sPropOrder( ::rtl::OUString( "Order" ) ); if ( ::comphelper::hasProperty( sPropOrder, xQuery ) ) { ::rtl::OUString sOrder; @@ -189,7 +189,7 @@ namespace dbtools if ( bApplyFilter ) { ::rtl::OUString sFilter; - OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Filter" ) ) ) >>= sFilter ); + OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( "Filter" ) ) >>= sFilter ); xComposer->setFilter( sFilter ); } @@ -207,7 +207,7 @@ namespace dbtools { // create an composer Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); - Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), + Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); xComposer->setElementaryQuery( sStatement ); diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index ab50f2f5b3b9..7dcd8cffff43 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r break; case PROPERTY_ID_ISAUTOINCREMENT: - OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Autoincrement" )), getBOOL( rValue ) ); + OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString( "Autoincrement" ), getBOOL( rValue ) ); break; case PROPERTY_ID_IM001: @@ -218,7 +218,7 @@ void OAdoColumn::fillPropertyValues() OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), ::o3tl::compose1( - ::std::bind2nd(aCase, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VarBinary"))), + ::std::bind2nd(aCase, ::rtl::OUString("VarBinary")), ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), ::o3tl::select2nd<OTypeInfoMap::value_type>()) @@ -252,11 +252,11 @@ void OAdoColumn::fillPropertyValues() if ( aProps.IsValid() ) { - m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")) ); + m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString("Autoincrement") ); - m_Description = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")) ); + m_Description = OTools::getValue( aProps, ::rtl::OUString("Description") ); - m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")) ); + m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString("Default") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 2fd7b21b6937..5b918cdfef68 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -110,7 +110,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc sal_Bool bAutoIncrement = sal_False; pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; if ( bAutoIncrement ) - OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")), bAutoIncrement ); + OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString("Autoincrement"), bAutoIncrement ); if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary aColumn.put_Type(aFind->first); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 9ffc553f3182..775f0a2aa175 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -138,8 +138,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True); - OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:Engine Type")))); + OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); + OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString("Jet OLEDB:Engine Type"))); if(!aVar.isNull() && !aVar.isEmpty()) m_nEngineType = aVar; } @@ -208,7 +208,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True); + OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); WpADOCommand aCommand; aCommand.Create(); aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index 634660f40558..df38f9e2cfb8 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLExc // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size"))); + return getInt32Property(::rtl::OUString("Maximum Row Size")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) @@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Active Sessions"))); + return getInt32Property(::rtl::OUString("Active Sessions")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in Table"))); + return getInt32Property(::rtl::OUString("Max Columns in Table")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) @@ -269,7 +269,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Tables in SELECT"))); + return getInt32Property(::rtl::OUString("Maximum Tables in SELECT")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( @@ -362,7 +362,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); aRows.push_back(aRow); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue(); @@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size Includes BLOB"))); + return getBoolProperty(::rtl::OUString("Maximum Row Size Includes BLOB")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) @@ -449,17 +449,17 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Index Size"))); + return getInt32Property(::rtl::OUString("Maximum Index Size")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NON_NULL; + return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Term"))); + return getStringProperty(::rtl::OUString("Catalog Term")); } // ------------------------------------------------------------------------- ::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) @@ -480,27 +480,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Location"))) == DBPROPVAL_CL_START; + return getInt32Property(::rtl::OUString("Catalog Location")) == DBPROPVAL_CL_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_IGNORE; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_COMMIT; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DML; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DML; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_ALL; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) @@ -515,29 +515,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Abort Behavior"))) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(::rtl::OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Commit Behavior"))) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(::rtl::OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; + return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; + return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) { sal_Bool bValue(sal_False); - sal_Int32 nTxn = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Levels"))); + sal_Int32 nTxn = getInt32Property(::rtl::OUString("Isolation Levels")); if(level == TransactionIsolation::NONE) bValue = sal_True; else if(level == TransactionIsolation::READ_UNCOMMITTED) @@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) @@ -604,7 +604,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))); + return getBoolProperty(::rtl::OUString("Outer Join Capabilities")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) @@ -629,7 +629,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_NONE; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) @@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Read-Only Data Source"))); + return getBoolProperty(::rtl::OUString("Read-Only Data Source")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) @@ -674,7 +674,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NULL; + return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) @@ -689,27 +689,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rowset Conversions on Command"))); + return getBoolProperty(::rtl::OUString("Rowset Conversions on Command")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List"))); + return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_NOT_SUPPORTED; + return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_CONTAINS_SELECT; + return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) == DBPROPVAL_GB_NO_RELATION; + return getInt32Property(::rtl::OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) @@ -729,7 +729,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List"))); + return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) @@ -744,32 +744,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, Ru // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -779,7 +779,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(S // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -794,73 +794,73 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:"))+ m_pADOConnection->GetConnectionString(); + return ::rtl::OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString(); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User Name"))); + return getStringProperty(::rtl::OUString("User Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Friendly Name"))); + return getStringProperty(::rtl::OUString("Provider Friendly Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Version"))); + return getStringProperty(::rtl::OUString("Provider Version")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Version"))); + return getStringProperty(::rtl::OUString("DBMS Version")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Name"))); + return getStringProperty(::rtl::OUString("DBMS Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Procedure Term"))); + return getStringProperty(::rtl::OUString("Procedure Term")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Term"))); + return getStringProperty(::rtl::OUString("Schema Term")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -957,19 +957,19 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } // ------------------------------------------------------------------------- @@ -977,7 +977,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLExcepti { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))) & 0x00000004L) == 0x00000004L; + return (getInt32Property(::rtl::OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) @@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLExce // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in GROUP BY"))); + return getInt32Property(::rtl::OUString("Max Columns in GROUP BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in ORDER BY"))); + return getInt32Property(::rtl::OUString("Max Columns in ORDER BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 3c9ab91ddb7d..e2ca3ef77a4e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -117,7 +117,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")), + m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 3,3,0, DataType::VARCHAR); @@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("TYPE_NAME"), ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); - m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_DEF")), + m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString("COLUMN_DEF"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")), + m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")), + m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR_OCTET_LENGTH")), + m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("CHAR_OCTET_LENGTH"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PK_NAME"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_UNIQUE")), + m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString("NON_UNIQUE"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_QUALIFIER")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("INDEX_QUALIFIER"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASC_OR_DESC")), + m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString("ASC_OR_DESC"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PRIVILEGE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { - m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")), + m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")), + m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString("PRECISION"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTO_INCREMENT")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("AUTO_INCREMENT"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")), + m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")), + m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")), + m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString("NUM_PREC_RADIX"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues() { WpADOProperties aProps = m_aTable.get_Properties(); if(aProps.IsValid()) - m_Description = OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description"))); + m_Description = OTools::getValue(aProps,::rtl::OUString("Description")); } } } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index ed48af3963c2..ce04f82e5128 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -902,8 +902,8 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aValueRange[12] = aMap; ::std::map< sal_Int32,::rtl::OUString> aMap2; - aMap2[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")); - aMap2[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")); + aMap2[0] = ::rtl::OUString("YES"); + aMap2[1] = ::rtl::OUString("NO"); m_aIntValueRange[18] = aMap2; ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); @@ -1036,8 +1036,8 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() ::std::map< sal_Int32,::rtl::OUString> aMap3; aMap3[0] = ::rtl::OUString(); - aMap3[DB_COLLATION_ASC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A")); - aMap3[DB_COLLATION_DESC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D")); + aMap3[DB_COLLATION_ASC] = ::rtl::OUString("A"); + aMap3[DB_COLLATION_DESC] = ::rtl::OUString("D"); m_aIntValueRange[21] = aMap3; @@ -1058,8 +1058,8 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap() m_aColMapping.push_back(7); ::std::map< sal_Int32,::rtl::OUString> aMap; - aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")); - aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")); + aMap[0] = ::rtl::OUString("YES"); + aMap[1] = ::rtl::OUString("NO"); m_aIntValueRange[7] = aMap; @@ -1085,11 +1085,11 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() m_aColMapping.push_back(18); ::std::map< ::rtl::OUString,sal_Int32> aMap; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CASCADE"))] = KeyRule::CASCADE; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTRICT"))] = KeyRule::RESTRICT; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET NULL"))] = KeyRule::SET_NULL; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET DEFAULT"))] = KeyRule::SET_DEFAULT; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO ACTION"))] = KeyRule::NO_ACTION; + aMap[ ::rtl::OUString("CASCADE")] = KeyRule::CASCADE; + aMap[ ::rtl::OUString("RESTRICT")] = KeyRule::RESTRICT; + aMap[ ::rtl::OUString("SET NULL")] = KeyRule::SET_NULL; + aMap[ ::rtl::OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT; + aMap[ ::rtl::OUString("NO ACTION")] = KeyRule::NO_ACTION; m_aStrValueRange[14] = aMap; m_aStrValueRange[15] = aMap; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index cbcc5561eb35..74717ba9a0a0 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -84,14 +84,14 @@ void ODriver::disposing() //------------------------------------------------------------------------------ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ado.ODriver")); + return rtl::OUString("com.sun.star.comp.sdbc.ado.ODriver"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); - aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ @@ -162,26 +162,26 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O ::std::vector< DriverPropertyInfo > aDriverInfo; Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ); - aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); + aBooleanValues[0] = ::rtl::OUString( "false" ); + aBooleanValues[1] = ::rtl::OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver.")) + ::rtl::OUString("IgnoreDriverPrivileges") + ,::rtl::OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,::rtl::OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format.")) + ::rtl::OUString("EscapeDateTime") + ,::rtl::OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) + ,::rtl::OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated.")) + ::rtl::OUString("TypeInfoSettings") + ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.") ,sal_False ,::rtl::OUString( ) ,Sequence< ::rtl::OUString > ()) diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index ee19aec81448..18da7981c1b0 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -81,7 +81,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< WpADOKey aKey = pKey->getImpl(); ::rtl::OUString sName = aKey.get_Name(); if(!sName.getLength()) - aKey.put_Name(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")) ); + aKey.put_Name(::rtl::OUString("PrimaryKey") ); ADOKeys* pKeys = m_aCollection; if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey), diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index ed2373a4af80..de0ba5f7e5cf 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -538,7 +538,7 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(":") ,SQL_NODE_PUNCTUATION,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); ::rtl::OUString sParameterName = _sDefaultName; sParameterName += ::rtl::OUString::valueOf(++_rParameterCount); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 2e10ea9e6f96..804105772a16 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -54,14 +54,14 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ado.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.ado.ResultSet"); } // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); - aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- @@ -901,7 +901,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); - WpADOProperty aProp(aProps.GetItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks Ordered")))); + WpADOProperty aProp(aProps.GetItem(::rtl::OUString("Bookmarks Ordered"))); OLEVariant aVar; if(aProp.IsValid()) aVar = aProp.GetValue(); diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index a2bdef9699f1..31e5938e866e 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -84,7 +84,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISCASESENSITIVE")) ); + bRet = OTools::getValue( aProps, ::rtl::OUString("ISCASESENSITIVE") ); } return bRet; } @@ -114,7 +114,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - sTableName = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BASETABLENAME")) ); + sTableName = OTools::getValue( aProps, ::rtl::OUString("BASETABLENAME") ); } return sTableName; } @@ -160,7 +160,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) { - bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISAUTOINCREMENT")) ); + bRet = OTools::getValue( aProps, ::rtl::OUString("ISAUTOINCREMENT") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); for (sal_Int32 i = 0; i<nCount; ++i) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 0d042d84f2e7..35664bdbbcb6 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -354,7 +354,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, ::rtl::OUString aBatchSql; sal_Int32 nLen = 0; for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) - aBatchSql = aBatchSql + *i + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + aBatchSql = aBatchSql + *i + ::rtl::OUString(";"); if ( m_RecordSet.IsValid() ) diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index fe4a337b6874..e0c51af338b2 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -215,7 +215,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV case PROPERTY_ID_DESCRIPTION: OTools::putValue( m_aTable.get_Properties(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), + ::rtl::OUString("Description"), getString(rValue)); break; diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index cbdde99e7be5..1a24260b7f7e 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -436,7 +436,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) throw ::com::sun::star::sdbc::SQLException( sError, NULL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "S1000" )), + ::rtl::OUString( "S1000" ), 1000, ::com::sun::star::uno::Any() ); diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 75655025e37d..37b6636df462 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -69,7 +69,7 @@ const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613); OLEString& ADOS::GetKeyStr() { - static OLEString sKeyStr(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz"))); + static OLEString sKeyStr(::rtl::OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz")); return sKeyStr; } diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 4e84462da2af..2d7481413ed8 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index b9a20b1fd00d..925cd763c47c 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -104,25 +104,25 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const switch(eDayOfWeek) { case MONDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Monday")); + sRet = ::rtl::OUString("Monday"); break; case TUESDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tuesday")); + sRet = ::rtl::OUString("Tuesday"); break; case WEDNESDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wednesday")); + sRet = ::rtl::OUString("Wednesday"); break; case THURSDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thursday")); + sRet = ::rtl::OUString("Thursday"); break; case FRIDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Friday")); + sRet = ::rtl::OUString("Friday"); break; case SATURDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Saturday")); + sRet = ::rtl::OUString("Saturday"); break; case SUNDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sunday")); + sRet = ::rtl::OUString("Sunday"); break; default: OSL_FAIL("Error in enum values for date"); @@ -140,40 +140,40 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const switch(aD.Month) { case 1: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("January")); + sRet = ::rtl::OUString("January"); break; case 2: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("February")); + sRet = ::rtl::OUString("February"); break; case 3: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("March")); + sRet = ::rtl::OUString("March"); break; case 4: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("April")); + sRet = ::rtl::OUString("April"); break; case 5: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("May")); + sRet = ::rtl::OUString("May"); break; case 6: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("June")); + sRet = ::rtl::OUString("June"); break; case 7: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("July")); + sRet = ::rtl::OUString("July"); break; case 8: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("August")); + sRet = ::rtl::OUString("August"); break; case 9: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("September")); + sRet = ::rtl::OUString("September"); break; case 10: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("October")); + sRet = ::rtl::OUString("October"); break; case 11: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("November")); + sRet = ::rtl::OUString("November"); break; case 12: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("December")); + sRet = ::rtl::OUString("December"); break; } return sRet; diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 2c3c380ba691..ea447b75fc02 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -44,8 +44,8 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -71,7 +71,7 @@ void OHCatalog::refreshTables() void OHCatalog::refreshViews() { Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); + aTypes[0] = ::rtl::OUString("VIEW"); sal_Bool bSupportsViews = sal_False; try @@ -108,7 +108,7 @@ void OHCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from hsqldb.user group by User"))); + Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from hsqldb.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 2b1f9c0464a0..62e71bb6ce6a 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -181,7 +181,7 @@ namespace connectivity { namespace hsqldb if ( !m_bReadOnly ) { Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW ); - xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CHECKPOINT DEFRAG" ) ) ); + xStmt->execute( ::rtl::OUString( "CHECKPOINT DEFRAG" ) ); } } @@ -359,7 +359,7 @@ namespace connectivity { namespace hsqldb // ask the provider to obtain a graphic Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMediaProperties[0].Name = ::rtl::OUString( "URL" ); aMediaProperties[0].Value <<= sImageURL; xGraphic = xProvider->queryGraphic( aMediaProperties ); OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" ); diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index 251f5452cc34..bb0a279743cf 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.cxx @@ -37,7 +37,7 @@ namespace connectivity { namespace hsqldb LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix ) { m_sFileName = StorageContainer::jstring2ustring(env,streamName); - m_sFileName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); + m_sFileName += ::rtl::OUString("."); m_sFileName += ::rtl::OUString::createFromAscii( _pAsciiSuffix ); } diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 0fe5563271bb..61722dd1df4d 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -437,13 +437,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( // here we know that the count of column doesn't match ::std::map<sal_Int32,sal_Int32> aColumnMatching; static const ::rtl::OUString sPrivs[] = { - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_CAT")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_SCHEM")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_NAME")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTOR")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTEE")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")) + ::rtl::OUString("TABLE_CAT"), + ::rtl::OUString("TABLE_SCHEM"), + ::rtl::OUString("TABLE_NAME"), + ::rtl::OUString("GRANTOR"), + ::rtl::OUString("GRANTEE"), + ::rtl::OUString("PRIVILEGE"), + ::rtl::OUString("IS_GRANTABLE") }; ::rtl::OUString sColumnName; @@ -560,7 +560,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod { ::rtl::OUString sLoggedResult( sReturn ); if ( sLoggedResult.isEmpty() ) - sLoggedResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<empty string>" ) ); + sLoggedResult = ::rtl::OUString( "<empty string>" ); m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } @@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS // log the call if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) ); - ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) ); + ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" ); + ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" ); if ( _pOptionalAdditionalString ) m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString ); else diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 7c5ec0dfa47b..de5be71cdc23 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -43,11 +43,11 @@ void KabCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), aTypes); if (xResult.is()) diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index 89c04ec51262..0014e7961acd 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.cxx @@ -62,7 +62,7 @@ void KabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 5d1663323591..52ed23db9ab3 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang; sdbcx::ObjectType KabTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 18855adc7a21..9bfe86a46ca0 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -43,11 +43,11 @@ void MacabCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), aTypes); if (xResult.is()) @@ -84,7 +84,7 @@ void MacabCatalog::refreshUsers() // ------------------------------------------------------------------------- const ::rtl::OUString& MacabCatalog::getDot() { - static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")); + static const ::rtl::OUString sDot = ::rtl::OUString("."); return sDot; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index 5bd1690c769c..a5fec27c8550 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -69,7 +69,7 @@ void MacabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index afc9d38caa03..a9f7d9685f0c 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang; sdbcx::ObjectType MacabTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 87edf95eac10..26ac1f5f3027 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -51,9 +51,9 @@ void OCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes); + ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 2f24c94c7092..a2b6297c5936 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -87,13 +87,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -115,7 +115,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); // Iterate over all tables for(size_t j = 0; j < tables.size(); j++ ) { @@ -848,15 +848,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE // there exists no possibility to get table types so we have to check static ::rtl::OUString sTableTypes[] = { - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW")) + ::rtl::OUString("TABLE"), + ::rtl::OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM")) + // ::rtl::OUString("SYSTEM TABLE"), + // ::rtl::OUString("GLOBAL TEMPORARY"), + // ::rtl::OUString("LOCAL TEMPORARY"), + // ::rtl::OUString("ALIAS"), + // ::rtl::OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -890,7 +890,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")))); + aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); // Iterate over all tables diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 6cca9c218926..ece7f291ded7 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mork.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.mork.ResultSet"); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) @@ -733,11 +733,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + rMatchString = ::rtl::OUString(""); rtl::OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?")); + aParameterName = ::rtl::OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -939,7 +939,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + matchString = ::rtl::OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -992,7 +992,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); op = MQueryOp::RegExp; } @@ -1003,13 +1003,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); } op = MQueryOp::RegExp; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 725f665b153e..62e0ba0adc08 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -47,11 +47,11 @@ using namespace dbtools; sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index c08bae179398..668a41f76993 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -51,9 +51,9 @@ void OCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes); + ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index a84afd6e0658..871cbbf22a3a 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -100,7 +100,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su { //............................................................. Reference< XNameAccess > xAliasesNode; - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xAliasesNode; + xDriverNode->getPropertyValue( ::rtl::OUString("ColumnAliases") ) >>= xAliasesNode; OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" ); // this is a set of string nodes diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 8b4ee14ad2a4..ee1e1b3c6761 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -54,14 +54,14 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), + ::rtl::OUString("nodepath"), 0, makeAny( sCompleteNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("depth")), + ::rtl::OUString("depth"), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE @@ -70,7 +70,7 @@ namespace connectivity //========================================================= // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess" )), + ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess" ), aArguments ); OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" ); @@ -125,10 +125,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; if ( xMozPrefsNode.is() ) xMozPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii(sNode) ) >>= sDescription; if (sDescription.getLength() == 0) @@ -157,10 +157,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; } catch( const Exception& ) { @@ -198,7 +198,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { usPabDescription = ::connectivity::mozab::getDescription( "PabDescription" , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Personal Address Book" ))); + ::rtl::OUString("Personal Address Book" )); sPabDescription = ::rtl::OUStringToOString( usPabDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; @@ -218,7 +218,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { usHisDescription = ::connectivity::mozab::getDescription( "HisDescription" , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Collected Addresses" ))); + ::rtl::OUString("Collected Addresses" )); sHisDescription = ::rtl::OUStringToOString( usHisDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index ea4a680f2e34..8492941706ca 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -92,13 +92,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -120,7 +120,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); const OColumnAlias& colNames = m_pConnection->getColumnAlias(); @@ -853,15 +853,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE // there exists no possibility to get table types so we have to check static ::rtl::OUString sTableTypes[] = { - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW")) + ::rtl::OUString("TABLE"), + ::rtl::OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM")) + // ::rtl::OUString("SYSTEM TABLE"), + // ::rtl::OUString("GLOBAL TEMPORARY"), + // ::rtl::OUString("LOCAL TEMPORARY"), + // ::rtl::OUString("ALIAS"), + // ::rtl::OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -895,7 +895,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")))); + aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); // Iterate over all tables diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index b0711fccf017..06ae1ca0fe1a 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -63,14 +63,14 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mozab.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.mozab.ResultSet"); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- @@ -716,11 +716,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + rMatchString = ::rtl::OUString(""); rtl::OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?")); + aParameterName = ::rtl::OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -922,7 +922,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + matchString = ::rtl::OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -975,7 +975,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); op = MQueryOp::RegExp; } @@ -986,13 +986,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); } op = MQueryOp::RegExp; @@ -1089,9 +1089,9 @@ void OResultSet::fillRowData() OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement"); ::rtl::OUString aStr; if (xConnection->isLDAP()) - aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail")); + aStr = ::rtl::OUString("PrimaryEmail"); else - aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("card:nsIAbCard")); + aStr = ::rtl::OUString("card:nsIAbCard"); eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) ); queryExpression.setExpressions( eVector ); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 0d11b8d1d46d..dd6f93bfd3a6 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -47,11 +47,11 @@ using namespace dbtools; sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index bb4af33dfc6e..cf9bb13b3dd9 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -62,7 +62,7 @@ nsProfile::nsProfile() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index e841826a6d98..23a721742b63 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0; @@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp // Insert table into map if ( aTableName.isEmpty() ) - aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook")); + aTableName = rtl::OUString("AddressBook"); OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp //map mailing lists as views _rStrings->push_back( aTableName ); // Table name if (!bIsMailList) { - ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE"))); + ::rtl::OUString aTableType(::rtl::OUString("TABLE")); _rTypes->push_back( aTableType ); // Table type } else { - ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW"))); + ::rtl::OUString aTableType(::rtl::OUString("VIEW")); _rTypes->push_back( aTableType ); // Table type } } @@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* Reference<XMozillaBootstrap> xMozillaBootstrap; Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = sal_False; @@ -624,7 +624,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ::std::vector< ::rtl::OUString > tables; ::std::vector< ::rtl::OUString > tabletypes; - ::rtl::OUString matchAny = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + ::rtl::OUString matchAny = rtl::OUString("%"); if ( !getTableStrings( _pCon, tables,tabletypes ) ) return sal_False; @@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) { if ( aTableName.isEmpty() ) { - aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook")); + aTableName = rtl::OUString("AddressBook"); } OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 4f0dce89b0d8..305b0da6ccf3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo { Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index cfea2d48c3e6..21bed90e07dc 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY); if (_pCon) diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 47094a43adee..a756e2ce01c8 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -45,8 +45,8 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCa void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -74,7 +74,7 @@ void OMySQLCatalog::refreshTables() void OMySQLCatalog::refreshViews() { Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); + aTypes[0] = ::rtl::OUString("VIEW"); // let's simply assume the server is new enough to support views. Current drivers // as of this writing might not return the proper information in getTableTypes, so @@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from mysql.user group by User"))); + Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from mysql.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 5158d9bdc59b..9344bd266fb6 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -78,7 +78,7 @@ namespace pq_sdbc_driver ::rtl::OUString Array::getBaseTypeName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "varchar" ) ); + return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 0401c55f2805..0f9e0aeac4bd 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -124,25 +124,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() // Should really share! // At least use for the handles the #define'd values in .hxx file... Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("IsBookmarkable") ), 4, + OUString("IsBookmarkable"), 4, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 5, + OUString("ResultSetConcurrency"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 6, + OUString("ResultSetType"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable) / sizeof(Property) == BASERESULTSET_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 1c0d52ad887b..7a14c3b20478 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -160,7 +160,7 @@ public: OUString ConnectionGetImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Connection.noext" ) ); + return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void) { @@ -331,8 +331,7 @@ Reference< XPreparedStatement > Connection::prepareCall( const ::rtl::OUString& throw (SQLException, RuntimeException) { throw SQLException( - OUString( - RTL_CONSTASCII_USTRINGPARAM( "pq_driver: Callable statements not supported" ) ), + OUString( "pq_driver: Callable statements not supported" ), Reference< XInterface > (), OUString() , 1, Any() ); } @@ -546,7 +545,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) if( ! tc.is() ) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("pq_driver: Couldn't instantiate converter service" )), + OUString("pq_driver: Couldn't instantiate converter service" ), Reference< XInterface > () ); } if( aArguments.getLength() != 2 ) @@ -594,7 +593,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) free(err); } else - errorMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("#no error message#")); + errorMessage = OUString("#no error message#"); OUStringBuffer buf( 128 ); buf.appendAscii( "Error in database URL '" ); buf.append( url ); @@ -602,7 +601,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) buf.append( errorMessage ); // HY092 is "Invalid attribute/option identifier." // Just the most likely error; the error might be HY024 "Invalid attribute value". - throw SQLException( buf.makeStringAndClear(), *this, OUString(RTL_CONSTASCII_USTRINGPARAM("HY092")), 5, Any() ); + throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() ); } for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != NULL; ++opt) @@ -621,7 +620,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) m_settings.pConnection = PQconnectdbParams( keywords.c_array(), values.c_array(), 0 ); } if( ! m_settings.pConnection ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "pq_driver: out of memory" ) ), + throw RuntimeException( OUString( "pq_driver: out of memory" ), Reference< XInterface > () ); if( PQstatus( m_settings.pConnection ) == CONNECTION_BAD ) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 10bdfe44b8bd..96e719faf5e0 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -134,7 +134,7 @@ Reference< XConnection > Driver::connect( seq[1] <<= info; return Reference< XConnection> ( m_smgr->createInstanceWithArgumentsAndContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection.noext" ) ), + OUString("org.openoffice.comp.connectivity.pq.Connection.noext" ), seq, m_ctx ), UNO_QUERY ); } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index b2aa68313743..a8a4058c94c4 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -129,31 +129,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4, + OUString("MaxFieldSize"), 4, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5, + OUString("MaxRows"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6, + OUString("QueryTimeOut"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7, + OUString("ResultSetConcurrency"), 7, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8, + OUString("ResultSetType"), 8, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == PREPARED_STATEMENT_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 42ded6e07398..49b82ae63282 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -145,31 +145,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4, + OUString("MaxFieldSize"), 4, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5, + OUString("MaxRows"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6, + OUString("QueryTimeOut"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7, + OUString("ResultSetConcurrency"), 7, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8, + OUString("ResultSetType"), 8, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == STATEMENT_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 7e6340f9a711..2cb273678019 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -239,7 +239,7 @@ void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & valu // We have no good XInterface Reference to pass here, so just give NULL throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), NULL, - OUString(RTL_CONSTASCII_USTRINGPARAM("22018")), + OUString("22018"), -1, Any()); } @@ -285,7 +285,7 @@ static inline void ibufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl: // Implementation-defined SQLACCESS error throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), NULL, - OUString(RTL_CONSTASCII_USTRINGPARAM("22018")), + OUString("22018"), -1, Any()); } diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index fdbc11428757..b07315bd7289 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -265,8 +265,7 @@ void ReflectionBase::setName( const ::rtl::OUString& /* aName */ ) throw (::com::sun::star::uno::RuntimeException) { throw RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "pq_sdbc::ReflectionBase::setName not implemented" ) ), + rtl::OUString( "pq_sdbc::ReflectionBase::setName not implemented" ), *this ); //setPropertyValue( getStatics().NAME , makeAny( aName ) ); } diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 5c57a641df4b..f29c5eaab96f 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -487,8 +487,7 @@ void Test::testBigStruct() { void Test::testPolyStruct() { CPPUNIT_ASSERT_EQUAL( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.codemaker.cppumaker.Struct<char,short>")), + "test.codemaker.cppumaker.Struct<char,short>"), (com::sun::star::uno::makeAny( test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). getValueType().getTypeName())); @@ -507,7 +506,7 @@ void Test::testExceptions() { aEmptySequence; test::codemaker::cppumaker::TestException1 e11( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, + rtl::OUString("abc"), 0, 1, com::sun::star::uno::makeAny(123.0), test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); @@ -517,7 +516,7 @@ void Test::testExceptions() { e13 = e11; CPPUNIT_ASSERT_EQUAL(e11, e13); test::codemaker::cppumaker::TestException2 e21( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, + rtl::OUString("abc"), 0, 1, com::sun::star::uno::makeAny(123.0), test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index d53f0e2aa7e7..aadc1b35338c 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -301,7 +301,7 @@ void Test::testVoid() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -399,7 +399,7 @@ void Test::testBoolean() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -498,7 +498,7 @@ void Test::testByte() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -597,7 +597,7 @@ void Test::testShort() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -698,7 +698,7 @@ void Test::testUnsignedShort() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -793,7 +793,7 @@ void Test::testLong() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -888,7 +888,7 @@ void Test::testUnsignedLong() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -983,7 +983,7 @@ void Test::testHyper() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1078,7 +1078,7 @@ void Test::testUnsignedHyper() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1173,7 +1173,7 @@ void Test::testFloat() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1268,7 +1268,7 @@ void Test::testDouble() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1368,7 +1368,7 @@ void Test::testChar() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1398,7 +1398,7 @@ void Test::testChar() { } void Test::testString() { - css::uno::Any a(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"))); + css::uno::Any a(rtl::OUString("1")); CPPUNIT_ASSERT(a.getValueType() == getCppuType< rtl::OUString >()); { bool b = true; @@ -1463,7 +1463,7 @@ void Test::testString() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1557,7 +1557,7 @@ void Test::testType() { "css::uno::Type", (a >>= b) && b == getCppuType< sal_Int32 >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1654,7 +1654,7 @@ void Test::testSequence() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1755,7 +1755,7 @@ void Test::testEnum() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1854,7 +1854,7 @@ void Test::testStruct() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -1974,7 +1974,7 @@ void Test::testException() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -2090,7 +2090,7 @@ void Test::testInterface() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { @@ -2204,7 +2204,7 @@ void Test::testNull() { !(a >>= b) && b == getCppuType< rtl::OUString >()); } { - css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2"))); + css::uno::Any b(rtl::OUString("2")); CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a); } { diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 527cac596205..06f6763f580c 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -87,76 +87,76 @@ void Test::testUnoType() { t = ::cppu::UnoType< ::cppu::UnoVoidType >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), t.getTypeName()); + ::rtl::OUString("void"), t.getTypeName()); t = ::cppu::UnoType< bool >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), + ::rtl::OUString("boolean"), t.getTypeName()); CPPUNIT_ASSERT(::cppu::UnoType< ::sal_Bool >::get() == t); t = ::cppu::UnoType< ::sal_Int8 >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), t.getTypeName()); + ::rtl::OUString("byte"), t.getTypeName()); t = ::cppu::UnoType< ::sal_Int16 >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SHORT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), t.getTypeName()); + ::rtl::OUString("short"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); CPPUNIT_ASSERT_EQUAL( +css::uno::TypeClass_UNSIGNED_SHORT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), + ::rtl::OUString("unsigned short"), t.getTypeName()); t = ::cppu::UnoType< ::sal_Int32 >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_LONG, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), t.getTypeName()); + ::rtl::OUString("long"), t.getTypeName()); t = ::cppu::UnoType< ::sal_uInt32 >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_UNSIGNED_LONG, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), + ::rtl::OUString("unsigned long"), t.getTypeName()); t = ::cppu::UnoType< ::sal_Int64 >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_HYPER, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), t.getTypeName()); + ::rtl::OUString("hyper"), t.getTypeName()); t = ::cppu::UnoType< ::sal_uInt64 >::get(); CPPUNIT_ASSERT_EQUAL( +css::uno::TypeClass_UNSIGNED_HYPER, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned hyper")), + ::rtl::OUString("unsigned hyper"), t.getTypeName()); t = ::cppu::UnoType< float >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_FLOAT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float")), t.getTypeName()); + ::rtl::OUString("float"), t.getTypeName()); t = ::cppu::UnoType< double >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_DOUBLE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("double")), + ::rtl::OUString("double"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoCharType >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_CHAR, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("char")), t.getTypeName()); + ::rtl::OUString("char"), t.getTypeName()); t = ::cppu::UnoType< ::rtl::OUString >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRING, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")), + ::rtl::OUString("string"), t.getTypeName()); t = ::cppu::UnoType< css::uno::Type >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_TYPE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("type")), t.getTypeName()); + ::rtl::OUString("type"), t.getTypeName()); t = ::cppu::UnoType< css::uno::Any >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ANY, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), t.getTypeName()); + ::rtl::OUString("any"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]byte")), + ::rtl::OUString("[]byte"), t.getTypeName()); CPPUNIT_ASSERT( ::cppu::UnoType< css::uno::Sequence< ::sal_Int8 > >::get() == t); @@ -164,19 +164,19 @@ void Test::testUnoType() { ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]unsigned short")), + ::rtl::OUString("[]unsigned short"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]char")), + ::rtl::OUString("[]char"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int8 > > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]byte")), + ::rtl::OUString("[][]byte"), t.getTypeName()); CPPUNIT_ASSERT( ::cppu::UnoType< @@ -185,33 +185,30 @@ void Test::testUnoType() { ::cppu::UnoUnsignedShortType > > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]unsigned short")), + ::rtl::OUString("[][]unsigned short"), t.getTypeName()); t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]char")), + ::rtl::OUString("[][]char"), t.getTypeName()); t = ::cppu::UnoType< css::uno::TypeClass >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ENUM, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.TypeClass")), + ::rtl::OUString("com.sun.star.uno.TypeClass"), t.getTypeName()); t = ::cppu::UnoType< css::lang::EventObject >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.EventObject")), + ::rtl::OUString("com.sun.star.lang.EventObject"), t.getTypeName()); CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct1 >::get() == t); t = ::cppu::UnoType< css::beans::PropertyChangeEvent >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.beans.PropertyChangeEvent")), + "com.sun.star.beans.PropertyChangeEvent"), t.getTypeName()); #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t); @@ -219,21 +216,18 @@ void Test::testUnoType() { t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Optional<byte>")), + ::rtl::OUString("com.sun.star.beans.Optional<byte>"), t.getTypeName()); t = ::cppu::UnoType< css::uno::Exception >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")), + ::rtl::OUString("com.sun.star.uno.Exception"), t.getTypeName()); CPPUNIT_ASSERT(::cppu::UnoType< DerivedException1 >::get() == t); t = ::cppu::UnoType< css::uno::RuntimeException >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")), + ::rtl::OUString("com.sun.star.uno.RuntimeException"), t.getTypeName()); #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t); @@ -241,8 +235,7 @@ void Test::testUnoType() { t = ::cppu::UnoType< css::uno::XInterface >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")), + ::rtl::OUString("com.sun.star.uno.XInterface"), t.getTypeName()); CPPUNIT_ASSERT( ::cppu::UnoType< css::uno::Reference< css::uno::XInterface > >::get() == @@ -254,8 +247,7 @@ void Test::testUnoType() { t = ::cppu::UnoType< css::uno::XComponentContext >::get(); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XComponentContext")), + ::rtl::OUString("com.sun.star.uno.XComponentContext"), t.getTypeName()); CPPUNIT_ASSERT( ::cppu::UnoType< diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 86d79f1f7564..1495f56adcc2 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -321,18 +321,18 @@ int AffineBridge::v_isValid(rtl::OUString * pReason) { int result = m_enterCount > 0; if (!result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); + *pReason = rtl::OUString("not entered"); else { result = m_innerThreadId == osl_getThreadIdentifier(NULL); if (!result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread")); + *pReason = rtl::OUString("wrong thread"); } if (result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK")); + *pReason = rtl::OUString("OK"); return result; } diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index a1cacf442db8..a7c768fd42ea 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -112,18 +112,18 @@ int LogBridge::v_isValid(rtl::OUString * pReason) int result = m_count > 0; if (!result) { - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); + *pReason = rtl::OUString("not entered"); } else { result = m_threadId == osl_getThreadIdentifier(NULL); if (!result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread")); + *pReason = rtl::OUString("wrong thread"); } if (result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK")); + *pReason = rtl::OUString("OK"); return result; } diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 382ed3e36f7f..6a5f4831f282 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -121,18 +121,18 @@ int UnsafeBridge::v_isValid(rtl::OUString * pReason) int result = m_count > 0; if (!result) { - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); + *pReason = rtl::OUString("not entered"); } else { result = m_threadId == osl_getThreadIdentifier(NULL); if (!result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread")); + *pReason = rtl::OUString("wrong thread"); } if (result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK")); + *pReason = rtl::OUString("OK"); return result; } diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index b1e9cca1388c..d17299aba5af 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -2183,7 +2183,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName( { // Check for derived interface member type: sal_Int32 i1 = name.lastIndexOf( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@"))); + rtl::OUString(":@")); if (i1 >= 0) { sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@"); sal_Int32 i3 = name.indexOf(',', i2); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 1909274c5d2a..93b5bf107562 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1122,7 +1122,7 @@ static uno_Environment * initDefaultEnvironment( if (!envPurpose.isEmpty()) { rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1); - libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") ); + libStem += rtl::OUString("_uno_uno"); if(!loadEnv(libStem, pEnv)) { diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index d81abf0452be..88919edeeef9 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -170,7 +170,7 @@ css::uno::Any Empty2::queryInterface(css::uno::Type const & type) css::uno::Sequence< rtl::OUString > sequenceThird() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")); + s[0] = rtl::OUString("Third"); return s; } @@ -275,7 +275,7 @@ sal_Int32 Full::getFirst() throw (css::uno::RuntimeException) { void Full::setFirst(sal_Int32 value) throw (css::uno::RuntimeException) { prepareSet( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), css::uno::Any(), + rtl::OUString("First"), css::uno::Any(), css::uno::Any(), 0); osl::MutexGuard g(m_mutex); m_a1 = value; @@ -304,7 +304,7 @@ void Full::setSecond( } BoundListeners l; prepareSet( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), css::uno::Any(), + rtl::OUString("Second"), css::uno::Any(), v, &l); { osl::MutexGuard g(m_mutex); @@ -317,7 +317,7 @@ sal_Int32 Full::getThird() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), static_cast< cppu::OWeakObject * >(this)); } @@ -325,7 +325,7 @@ void Full::setThird(sal_Int32) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), static_cast< cppu::OWeakObject * >(this)); } @@ -333,7 +333,7 @@ sal_Int32 Full::getFourth() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), + rtl::OUString("Fourth"), static_cast< cppu::OWeakObject * >(this)); } @@ -341,7 +341,7 @@ void Full::setFourth(sal_Int32) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), + rtl::OUString("Fourth"), static_cast< cppu::OWeakObject * >(this)); } @@ -384,15 +384,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( rtl::OUString SAL_CALL getImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.cppuhelper.propertysetmixin.comp.CppSupplier")); + "test.cppuhelper.propertysetmixin.comp.CppSupplier"); } css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); s[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.cppuhelper.propertysetmixin.CppSupplier")); + "test.cppuhelper.propertysetmixin.CppSupplier"); return s; } diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 43cf415bbe42..9455752824d0 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -256,20 +256,20 @@ void Test::testEmpty2( static_cast< sal_Int32 >(0), info->getProperties().getLength()); try { info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any"))); + rtl::OUString("any")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")))); + rtl::OUString("any"))); try { empty2p->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), css::uno::Any()); + rtl::OUString("any"), css::uno::Any()); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { empty2p->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any"))); + rtl::OUString("any")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} rtl::Reference< BoundListener > boundListener1(new BoundListener); @@ -311,10 +311,10 @@ void Test::testEmpty2( empty2a->setPropertyValues( css::uno::Sequence< css::beans::PropertyValue >()); css::uno::Sequence< css::beans::PropertyValue > vs(2); - vs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any1")); + vs[0].Name = rtl::OUString("any1"); vs[0].Handle = -1; vs[0].State = css::beans::PropertyState_DIRECT_VALUE; - vs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any2")); + vs[0].Name = rtl::OUString("any2"); vs[0].Handle = -1; vs[0].State = css::beans::PropertyState_DIRECT_VALUE; try { @@ -372,16 +372,16 @@ void Test::testFull( static_cast< sal_Int32 >(3), info->getProperties().getLength()); css::beans::Property prop( info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")))); + rtl::OUString("First"))); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), prop.Name); + rtl::OUString("First"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle); CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes); prop = info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second"))); + rtl::OUString("Second")); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), prop.Name); + rtl::OUString("Second"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle); CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); CPPUNIT_ASSERT_EQUAL( @@ -395,13 +395,13 @@ void Test::testFull( prop.Attributes); try { info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third"))); + rtl::OUString("Third")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} prop = info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth"))); + rtl::OUString("Fourth")); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), prop.Name); + rtl::OUString("Fourth"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle); CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); CPPUNIT_ASSERT_EQUAL( @@ -409,93 +409,93 @@ void Test::testFull( prop.Attributes); try { info->getPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first"))); + rtl::OUString("first")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")))); + rtl::OUString("First"))); CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")))); + rtl::OUString("Second"))); CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")))); + rtl::OUString("Third"))); CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")))); + rtl::OUString("Fourth"))); CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first")))); + rtl::OUString("first"))); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(0)), fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")))); + rtl::OUString("First"))); fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), + rtl::OUString("First"), css::uno::makeAny(static_cast< sal_Int32 >(-100))); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(-100)), fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")))); + rtl::OUString("First"))); css::uno::Any voidAny; CPPUNIT_ASSERT_EQUAL( voidAny, fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")))); + rtl::OUString("Second"))); fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), + rtl::OUString("Second"), css::uno::makeAny(static_cast< sal_Int32 >(100))); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(100)), fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")))); + rtl::OUString("Second"))); CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int32 >(100), full->getSecond().Value.Value.Value); CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted); CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous); fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), + rtl::OUString("Second"), css::uno::Any()); CPPUNIT_ASSERT_EQUAL( voidAny, fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")))); + rtl::OUString("Second"))); CPPUNIT_ASSERT(!full->getSecond().Value.Value.IsPresent); CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted); CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous); try { fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), css::uno::makeAny(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third"))); + rtl::OUString("Third")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), + rtl::OUString("Fourth"), css::uno::makeAny(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth"))); + rtl::OUString("Fourth")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first")), + rtl::OUString("first"), css::uno::Any()); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first"))); + rtl::OUString("first")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} css::uno::Reference< css::beans::XFastPropertySet > fullf( @@ -522,13 +522,13 @@ void Test::testFull( fulla->getPropertyValues()); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength()); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vs[0].Name); + rtl::OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(0)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vs[1].Name); + rtl::OUString("Second"), vs[1].Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), vs[1].Handle); CPPUNIT_ASSERT_EQUAL(voidAny, vs[1].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[1].State); @@ -539,12 +539,12 @@ void Test::testFull( vs = fulla->getPropertyValues(); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength()); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vs[0].Name); + rtl::OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(-100)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vs[1].Name); + rtl::OUString("Second"), vs[1].Name); CPPUNIT_ASSERT_EQUAL( css::uno::makeAny(static_cast< sal_Int32 >(100)), vs[1].Value); CPPUNIT_ASSERT_EQUAL( @@ -557,76 +557,76 @@ void Test::testFull( css::uno::Reference< css::beans::XPropertyChangeListener > boundListener( new BoundListener); fullp->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), boundListener); + rtl::OUString("First"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), boundListener); + rtl::OUString("First"), boundListener); fullp->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), boundListener); + rtl::OUString("Second"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), boundListener); + rtl::OUString("Second"), boundListener); try { fullp->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} fullp->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), boundListener); + rtl::OUString("Fourth"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), boundListener); + rtl::OUString("Fourth"), boundListener); try { fullp->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")), + rtl::OUString("Fifth"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")), + rtl::OUString("Fifth"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} css::uno::Reference< css::beans::XVetoableChangeListener > vetoListener( new VetoListener); fullp->addVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vetoListener); + rtl::OUString("First"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vetoListener); + rtl::OUString("First"), vetoListener); fullp->addVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vetoListener); + rtl::OUString("Second"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vetoListener); + rtl::OUString("Second"), vetoListener); try { fullp->addVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removeVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")), + rtl::OUString("Third"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} fullp->addVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), vetoListener); + rtl::OUString("Fourth"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), vetoListener); + rtl::OUString("Fourth"), vetoListener); try { fullp->addVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")), + rtl::OUString("Fifth"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removeVetoableChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")), + rtl::OUString("Fifth"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index 4ae70ad679ab..c178e986fcc7 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -197,8 +197,8 @@ void OComponentHelper::dispose() catch (Exception & exc) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "unexpected UNO exception caught: ") ) + + OUString( + "unexpected UNO exception caught: ") + exc.Message, Reference< XInterface >() ); } } diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index ba2aeaf2233d..dc5cf91a0fee 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -228,7 +228,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont xComp->dispose(); throw lang::IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot pass arguments to component => no XInitialization implemented!") ), + OUString("cannot pass arguments to component => no XInitialization implemented!"), Reference< XInterface >(), 0 ); } } @@ -818,7 +818,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() OUString aLocation; Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) ); + OUString("/UNO/ACTIVATOR") ); if( xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII ) { aActivatorUrl = xActivatorKey->getAsciiValue(); @@ -828,7 +828,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() aActivatorName = tmpActivator.getToken(0, ':', nIndex ); Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) ); + OUString("/UNO/LOCATION") ); if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII ) aLocation = xLocationKey->getAsciiValue(); } @@ -837,7 +837,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() // old style"url" // the location of the program code of the implementation Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/URL") ) ); + OUString("/UNO/URL") ); // is the key of the right type ? if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII ) { @@ -846,14 +846,14 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() // search protocol delimiter sal_Int32 nPos = aLocation.indexOf( - OUString( RTL_CONSTASCII_USTRINGPARAM("://") ) ); + OUString("://") ); if( nPos != -1 ) { aActivatorName = aLocation.copy( 0, nPos ); if( aActivatorName.compareToAscii( "java" ) == 0 ) - aActivatorName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Java") ); + aActivatorName = OUString("com.sun.star.loader.Java"); else if( aActivatorName.compareToAscii( "module" ) == 0 ) - aActivatorName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ); + aActivatorName = OUString("com.sun.star.loader.SharedLibrary"); aLocation = aLocation.copy( nPos + 3 ); } } @@ -884,7 +884,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void) try { Reference<XRegistryKey > xKey = xImplementationKey->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES") ) ); + OUString("UNO/SERVICES") ); if (xKey.is()) { diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index f983e881e911..4816c4a63832 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -287,8 +287,8 @@ void WeakComponentImplHelperBase::dispose() catch (Exception & exc) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "unexpected UNO exception caught: ") ) + + OUString( + "unexpected UNO exception caught: ") + exc.Message, Reference< XInterface >() ); } } @@ -423,8 +423,8 @@ void WeakAggComponentImplHelperBase::dispose() catch (Exception & exc) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "unexpected UNO exception caught: ") ) + + OUString( + "unexpected UNO exception caught: ") + exc.Message, Reference< XInterface >() ); } } diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index d45409d4d021..12a3752a44e4 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -266,8 +266,7 @@ void Data::initProperties( if (args.getLength() != 1) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "inconsistent UNO type registry")), + "inconsistent UNO type registry"), css::uno::Reference< css::uno::XInterface >()); } t = args[0]; @@ -277,8 +276,7 @@ void Data::initProperties( if (handles > SAL_MAX_INT32) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "interface type has too many attributes")), + "interface type has too many attributes"), css::uno::Reference< css::uno::XInterface >()); } rtl::OUString name(members[i]->getMemberName()); @@ -297,8 +295,7 @@ void Data::initProperties( { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "inconsistent UNO type registry")), + "inconsistent UNO type registry"), css::uno::Reference< css::uno::XInterface >()); } handleNames->push_back(name); @@ -517,7 +514,7 @@ rtl::OUString PropertySetMixinImpl::Impl::translateHandle( { if (handle < 0 || handle >= handleMap.getLength()) { throw css::beans::UnknownPropertyException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad handle ")) + (rtl::OUString("bad handle ") + rtl::OUString::valueOf(handle)), object); } @@ -589,8 +586,7 @@ void PropertySetMixinImpl::Impl::setProperty( //TODO Clarify whether PropertyVetoException is the correct exception // to throw when trying to set a read-only property: throw css::beans::PropertyVetoException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("cannot set read-only property ")) + (rtl::OUString("cannot set read-only property ") + name), object); } catch (css::lang::WrappedTargetRuntimeException & e) { @@ -643,8 +639,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unexpected com.sun.star.lang.IllegalArgumentException: ")) + "unexpected com.sun.star.lang.IllegalArgumentException: ") + e.Message), object); } catch (css::lang::WrappedTargetRuntimeException & e) { @@ -689,8 +684,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( try { if (!(css::uno::Reference< css::reflection::XIdlField2 >( ambiguous->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsAmbiguous"))), + rtl::OUString("IsAmbiguous")), css::uno::UNO_QUERY_THROW)->get(value) >>= isAmbiguous)) { @@ -704,7 +698,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } value = css::uno::Reference< css::reflection::XIdlField2 >( ambiguous->getField( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW)->get(value); } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( @@ -727,8 +721,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( if (!(css::uno::Reference< css::reflection::XIdlField2 >( defaulted->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsDefaulted"))), + rtl::OUString("IsDefaulted")), css::uno::UNO_QUERY_THROW)->get(value) >>= isDefaulted)) { @@ -742,7 +735,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } value = css::uno::Reference< css::reflection::XIdlField2 >( defaulted->getField( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW)->get(value); } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( @@ -765,8 +758,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( bool present = false; if (!(css::uno::Reference< css::reflection::XIdlField2 >( optional->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsPresent"))), + rtl::OUString("IsPresent")), css::uno::UNO_QUERY_THROW)->get(value) >>= present)) { @@ -783,7 +775,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } value = css::uno::Reference< css::reflection::XIdlField2 >( optional->getField( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW)->get(value); } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( @@ -798,8 +790,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } else { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unexpected type of attribute ")) + "unexpected type of attribute ") + name), object); } @@ -826,8 +817,7 @@ PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const refl.ifc = css::uno::Reference< css::reflection::XIdlReflection >( factory->createInstanceWithContext( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.reflection.CoreReflection")), + "com.sun.star.reflection.CoreReflection"), m_context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { @@ -865,8 +855,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( try { css::uno::Reference< css::reflection::XIdlField2 > field( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW); field->set( strct, @@ -875,8 +864,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( wrapDefaulted, isDefaulted, wrapOptional)); css::uno::Reference< css::reflection::XIdlField2 >( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsAmbiguous"))), + rtl::OUString("IsAmbiguous")), css::uno::UNO_QUERY_THROW)->set( strct, css::uno::makeAny(isAmbiguous)); } catch (css::lang::IllegalArgumentException & e) { @@ -906,8 +894,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( try { css::uno::Reference< css::reflection::XIdlField2 > field( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW); field->set( strct, @@ -916,8 +903,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( false, false, wrapOptional)); css::uno::Reference< css::reflection::XIdlField2 >( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsDefaulted"))), + rtl::OUString("IsDefaulted")), css::uno::UNO_QUERY_THROW)->set( strct, css::uno::makeAny(isDefaulted)); } catch (css::lang::IllegalArgumentException & e) { @@ -948,15 +934,13 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( try { css::uno::Reference< css::reflection::XIdlField2 >( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("IsPresent"))), + rtl::OUString("IsPresent")), css::uno::UNO_QUERY_THROW)->set( strct, css::uno::makeAny(present)); if (present) { css::uno::Reference< css::reflection::XIdlField2 > field( type->getField( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Value"))), + rtl::OUString("Value")), css::uno::UNO_QUERY_THROW); field->set( strct, @@ -986,8 +970,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( if (wrapAmbiguous || wrapDefaulted || wrapOptional) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unexpected type of attribute")), + "unexpected type of attribute"), object); } return value; @@ -1027,7 +1010,7 @@ void PropertySetMixinImpl::prepareSet( osl::MutexGuard g(m_impl->mutex); if (m_impl->disposed) { throw css::lang::DisposedException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("disposed")), + rtl::OUString("disposed"), static_cast< css::beans::XPropertySet * >(this)); } if ((it->second.property.Attributes @@ -1393,10 +1376,9 @@ void PropertySetMixinImpl::setPropertyValues( props[i].Handle))) { throw css::beans::UnknownPropertyException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name ")) + (rtl::OUString("name ") + props[i].Name - + rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(" does not match handle ")) + + rtl::OUString(" does not match handle ") + rtl::OUString::valueOf(props[i].Handle)), static_cast< css::beans::XPropertySet * >(this)); } diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index d2ed0cf8a524..180a05484b66 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -296,7 +296,7 @@ static void getLibEnv(oslModule lib, const OString aStr( aEnv.getToken( 0, ';', nIndex ) ); if ( aStr.equals(implName) ) { - *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log")); + *pSourceEnv_name += ::rtl::OUString(":log"); break; } } while( nIndex != -1 ); diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index 15e1d11df210..7179256f3a3a 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -78,8 +78,8 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) case STATE_NAME0: if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains bad descriptor name"))); + rtl::OUString( + "UNO URL contains bad descriptor name")); nStart = i; eState = STATE_NAME; break; @@ -93,15 +93,15 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) } else if (!isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains bad descriptor name"))); + rtl::OUString( + "UNO URL contains bad descriptor name")); break; case STATE_KEY0: if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains bad parameter key"))); + rtl::OUString( + "UNO URL contains bad parameter key")); nStart = i; eState = STATE_KEY; break; @@ -115,8 +115,8 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) } else if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains bad parameter key"))); + rtl::OUString( + "UNO URL contains bad parameter key")); break; case STATE_VALUE: @@ -131,8 +131,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) RTL_TEXTENCODING_UTF8))).second) throw rtl::MalformedUriException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains duplicated parameter"))); + "UNO URL contains duplicated parameter")); eState = STATE_KEY0; } break; @@ -223,8 +222,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) sal_Int32 j = rUrl.indexOf(';', i); if (j < 0) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL has too few semicolons"))); + rtl::OUString( + "UNO URL has too few semicolons")); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); @@ -233,8 +232,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) j = rUrl.indexOf(0x3B, i); // ';' if (j < 0) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL has too few semicolons"))); + rtl::OUString( + "UNO URL has too few semicolons")); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); @@ -242,8 +241,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) i = j + 1; if (i == rUrl.getLength()) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains empty ObjectName"))); + rtl::OUString( + "UNO URL contains empty ObjectName")); for (j = i; j < rUrl.getLength(); ++j) { sal_Unicode c = rUrl.getStr()[j]; @@ -255,8 +254,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) && c != 0x3F && c != 0x40 && c != 0x5F // '?', '@', '_' && c != 0x7E) // '~' throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL contains invalid ObjectName"))); + rtl::OUString( + "UNO URL contains invalid ObjectName")); } return new Impl(xConnection, xProtocol, rUrl.copy(i)); } diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx index cf06790caa84..1a0d4065ea2c 100644 --- a/cppuhelper/test/bootstrap/TestEnv.cxx +++ b/cppuhelper/test/bootstrap/TestEnv.cxx @@ -96,10 +96,10 @@ int TestEnv::v_isValid(rtl::OUString * pReason) int result = m_inCount & 1; if (result) - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK")); + *pReason = rtl::OUString("OK"); else - *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered/invoked")); + *pReason = rtl::OUString("not entered/invoked"); return result; } diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index ebbb5ca24cc6..861491072477 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx @@ -53,7 +53,7 @@ static bool s_check_object_is_in(void * pObject) currentEnv.get()->pExtEnv->getObjectIdentifier(currentEnv.get()->pExtEnv, &pOId, pObject); - uno::TypeDescription typeDescription(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface"))); + uno::TypeDescription typeDescription(rtl::OUString("com.sun.star.uno.XInterface")); void * pRegisteredObject = NULL; currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv, @@ -92,11 +92,11 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu cppu::loadSharedLibComponentFactory( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX "TestComponent.uno" SAL_DLLEXTENSION)), #ifdef WIN32 - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), + rtl::OUString(""), #else - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://../lib/")), + rtl::OUString("file://../lib/"), #endif - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")) + servicePurpose, + rtl::OUString("impl.test.TestComponent") + servicePurpose, uno::Reference<lang::XMultiServiceFactory>(), uno::Reference<registry::XRegistryKey>() ) @@ -104,7 +104,7 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu if (!xItf.is()) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); + s_comment += rtl::OUString("\t\tgot no object - FAILURE\n"); return; } @@ -125,33 +125,33 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu static void s_test__loadSharedLibComponentFactory__free_free() { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_free\n")); + s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__free_free\n"); s_test__loadSharedLibComponentFactory(rtl::OUString(), rtl::OUString()); } static void s_test__loadSharedLibComponentFactory__free_purpose() { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_purpose\n")); + s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__free_purpose\n"); s_test__loadSharedLibComponentFactory(rtl::OUString(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); + rtl::OUString(":testenv")); } static void s_test__loadSharedLibComponentFactory__purpose_free() { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_free\n")); + s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__purpose_free\n"); - s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")), + s_test__loadSharedLibComponentFactory(rtl::OUString(":testenv"), rtl::OUString()); } static void s_test__loadSharedLibComponentFactory__purpose_purpose() { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n")); + s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n"); - s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); + s_test__loadSharedLibComponentFactory(rtl::OUString(":testenv"), + rtl::OUString(":testenv")); } static rtl::OUString s_getSDrive(void) @@ -166,10 +166,10 @@ static rtl::OUString s_getSDrive(void) path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US); path += rtl::OUString(SAL_PATHDELIMITER); #ifdef WIN32 - path += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); + path += rtl::OUString("bin"); #else - path += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lib")); + path += rtl::OUString("lib"); #endif tmp = getenv("UPDMINOREXT"); @@ -199,7 +199,7 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose) if (!registry.is()) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); + s_comment += rtl::OUString("\t\tgot no object - FAILURE\n"); return; } @@ -213,16 +213,16 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose) static void s_test__createSimpleRegistry__free(void) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__createSimpleRegistry__free\n")); + s_comment += rtl::OUString("\ts_test__createSimpleRegistry__free\n"); s_test__createSimpleRegistry(rtl::OUString()); } static void s_test__createSimpleRegistry__purpose(void) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__createSimpleRegistry__purpose\n")); + s_comment += rtl::OUString("\ts_test__createSimpleRegistry__purpose\n"); - s_test__createSimpleRegistry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); + s_test__createSimpleRegistry(rtl::OUString(":testenv")); } @@ -247,7 +247,7 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie if (!xContext.is()) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); + s_comment += rtl::OUString("\t\tgot no object - FAILURE\n"); return; } @@ -264,16 +264,16 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie static void s_test__bootstrap_InitialComponentContext__free(void) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__bootstrap_InitialComponentContext__free\n")); + s_comment += rtl::OUString("\ts_test__bootstrap_InitialComponentContext__free\n"); s_test__bootstrap_InitialComponentContext(rtl::OUString()); } static void s_test__bootstrap_InitialComponentContext__purpose(void) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__bootstrap_InitialComponentContext__purpose\n")); + s_comment += rtl::OUString("\ts_test__bootstrap_InitialComponentContext__purpose\n"); - s_test__bootstrap_InitialComponentContext(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); + s_test__bootstrap_InitialComponentContext(rtl::OUString(":testenv")); } @@ -293,12 +293,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) int ret; if (s_comment.indexOf("FAILURE") == -1) { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); + s_comment += rtl::OUString("TESTS PASSED\n"); ret = 0; } else { - s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n")); + s_comment += rtl::OUString("TESTS _NOT_ PASSED\n"); ret = -1; } diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 6dfece4a873f..4acc23c2e741 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -59,7 +59,7 @@ static Sequence< OUString > impl0_getSupportedServiceNames() //-------------------------------------------------------------------------------------------------- static OUString impl0_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bootstrap.TestComponent0") ); + return OUString("com.sun.star.comp.bootstrap.TestComponent0"); } //-------------------------------------------------------------------------------------------------- static Sequence< OUString > impl1_getSupportedServiceNames() @@ -70,7 +70,7 @@ static Sequence< OUString > impl1_getSupportedServiceNames() //-------------------------------------------------------------------------------------------------- static OUString impl1_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bootstrap.TestComponent1") ); + return OUString("com.sun.star.comp.bootstrap.TestComponent1"); } //================================================================================================== diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index 466f243f52dc..cbaf7348d5e9 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.cxx @@ -82,7 +82,7 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_loadSharedLibComponentFactory ")); + result += rtl::OUString("\ts_test__cppu_loadSharedLibComponentFactory "); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\"")); result += servicePurpose; result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - ")); @@ -92,14 +92,14 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe cppu::loadSharedLibComponentFactory( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX "TestComponent.uno" SAL_DLLEXTENSION)), rtl::OUString(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")) + servicePurpose, + rtl::OUString("impl.test.TestComponent") + servicePurpose, uno::Reference<lang::XMultiServiceFactory>(), uno::Reference<registry::XRegistryKey>()) ); rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp)); if (envDcp_purpose == servicePurpose) - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); + result += rtl::OUString("passed\n"); else { @@ -125,7 +125,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_writeSharedLibComponentInfo ")); + result += rtl::OUString("\ts_test__cppu_writeSharedLibComponentInfo "); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\"")); result += servicePurpose; result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - ")); @@ -146,7 +146,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp)); if (envDcp_purpose == servicePurpose) - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); + result += rtl::OUString("passed\n"); else { @@ -172,7 +172,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) rtl::OUString message; message += rtl::OUString(argv[0], rtl_str_getLength(argv[0]), RTL_TEXTENCODING_ASCII_US); - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + message += rtl::OUString("\n"); message += s_test__cppu_loadSharedLibComponentFactory(":unsafe"); message += s_test__cppu_loadSharedLibComponentFactory(":affine"); @@ -183,11 +183,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) message += s_test__cppu_writeSharedLibComponentInfo(""); if (message.indexOf("FAILED") == -1) - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); + message += rtl::OUString("TESTS PASSED\n"); else { - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n")); + message += rtl::OUString("TESTS _NOT_ PASSED\n"); result = -1; } diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index e23069ad047f..a5cd71daea35 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -98,7 +98,7 @@ uno::Reference<uno::XInterface> SAL_CALL TestComponent::create( } catch (std::bad_alloc &) { - throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + throw uno::RuntimeException(rtl::OUString("std::bad_alloc"), uno::Reference<uno::XInterface>()); } } @@ -106,7 +106,7 @@ uno::Reference<uno::XInterface> SAL_CALL TestComponent::create( uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> serviceNames(1); - serviceNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceInfo")); + serviceNames[0] = rtl::OUString("com.sun.star.lang.ServiceInfo"); return serviceNames; } diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index 371e9aad4be0..30df8637ff43 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.cxx @@ -54,21 +54,21 @@ SAL_IMPLEMENT_MAIN() try { Reference< XMultiComponentFactory > xMgr( createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("cpputest.rdb") ) ), UNO_QUERY ); + OUString("cpputest.rdb") ), UNO_QUERY ); Reference< XComponentContext > xInitialContext; OSL_VERIFY( Reference< beans::XPropertySet >( xMgr, UNO_QUERY )->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xInitialContext ); + OUString("DefaultContext") ) >>= xInitialContext ); ContextEntry_Init aEntry; aEntry.bLateInitService = false; - aEntry.name = OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ); + aEntry.name = OUString("bla, bla"); aEntry.value = makeAny( (sal_Int32)5 ); Reference< XComponentContext > xContext( createComponentContext( &aEntry, 1, xInitialContext ) ); OSL_ASSERT( xContext->getServiceManager() != xMgr ); // must be wrapped one OSL_ASSERT( Reference< beans::XPropertySet >( xContext->getServiceManager(), UNO_QUERY )->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) != xInitialContext ); + OUString("DefaultContext") ) != xInitialContext ); Reference< XMultiServiceFactory > x( xMgr, UNO_QUERY ); test_ImplHelper( x ); @@ -78,9 +78,9 @@ SAL_IMPLEMENT_MAIN() test_interfacecontainer(); OSL_VERIFY( xContext->getValueByName( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ) == (sal_Int32)5 ); + OUString("bla, bla") ) == (sal_Int32)5 ); OSL_VERIFY( ! xInitialContext->getValueByName( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ).hasValue() ); + OUString("bla, bla") ).hasValue() ); Reference< XComponent >( xInitialContext, UNO_QUERY )->dispose(); xMgr.clear(); xContext.clear(); diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index e00043bb36fb..37c6c3f7732b 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -94,25 +94,25 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G > // A virtual OUString SAL_CALL a() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } + { return OUString("a"); } // BA virtual OUString SAL_CALL ba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); } + { return OUString("ba"); } // CA virtual OUString SAL_CALL ca() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); } + { return OUString("ca"); } // DBA virtual OUString SAL_CALL dba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); } + { return OUString("dba"); } // E virtual OUString SAL_CALL e() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); } + { return OUString("e"); } // FE virtual OUString SAL_CALL fe() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); } + { return OUString("fe"); } // G virtual OUString SAL_CALL g() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); } + { return OUString("g"); } }; //================================================================================================== @@ -123,25 +123,25 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G > // A virtual OUString SAL_CALL a() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } + { return OUString("a"); } // BA virtual OUString SAL_CALL ba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); } + { return OUString("ba"); } // CA virtual OUString SAL_CALL ca() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); } + { return OUString("ca"); } // DBA virtual OUString SAL_CALL dba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); } + { return OUString("dba"); } // E virtual OUString SAL_CALL e() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); } + { return OUString("e"); } // FE virtual OUString SAL_CALL fe() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); } + { return OUString("fe"); } // G virtual OUString SAL_CALL g() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); } + { return OUString("g"); } }; //================================================================================================== @@ -154,25 +154,25 @@ struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G > // A virtual OUString SAL_CALL a() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } + { return OUString("a"); } // BA virtual OUString SAL_CALL ba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); } + { return OUString("ba"); } // CA virtual OUString SAL_CALL ca() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); } + { return OUString("ca"); } // DBA virtual OUString SAL_CALL dba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); } + { return OUString("dba"); } // E virtual OUString SAL_CALL e() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); } + { return OUString("e"); } // FE virtual OUString SAL_CALL fe() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); } + { return OUString("fe"); } // G virtual OUString SAL_CALL g() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); } + { return OUString("g"); } protected: TestWeakImpl(int) {} @@ -203,25 +203,25 @@ struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G > // A virtual OUString SAL_CALL a() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } + { return OUString("a"); } // BA virtual OUString SAL_CALL ba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); } + { return OUString("ba"); } // CA virtual OUString SAL_CALL ca() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); } + { return OUString("ca"); } // DBA virtual OUString SAL_CALL dba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); } + { return OUString("dba"); } // E virtual OUString SAL_CALL e() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); } + { return OUString("e"); } // FE virtual OUString SAL_CALL fe() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); } + { return OUString("fe"); } // G virtual OUString SAL_CALL g() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); } + { return OUString("g"); } }; //================================================================================================== @@ -239,25 +239,25 @@ struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, F // A virtual OUString SAL_CALL a() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } + { return OUString("a"); } // BA virtual OUString SAL_CALL ba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); } + { return OUString("ba"); } // CA virtual OUString SAL_CALL ca() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); } + { return OUString("ca"); } // DBA virtual OUString SAL_CALL dba() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); } + { return OUString("dba"); } // E virtual OUString SAL_CALL e() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); } + { return OUString("e"); } // FE virtual OUString SAL_CALL fe() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); } + { return OUString("fe"); } // G virtual OUString SAL_CALL g() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); } + { return OUString("g"); } }; //================================================================================================== @@ -288,10 +288,10 @@ struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I > // H virtual OUString SAL_CALL h() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("h") ); } + { return OUString("h"); } // I virtual OUString SAL_CALL i() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("i") ); } + { return OUString("i"); } }; //================================================================================================== @@ -302,10 +302,10 @@ struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H, I // H virtual OUString SAL_CALL h() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("h2") ); } + { return OUString("h2"); } // I virtual OUString SAL_CALL i() throw(RuntimeException) - { return OUString( RTL_CONSTASCII_USTRINGPARAM("i2") ); } + { return OUString("i2"); } }; @@ -485,7 +485,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) bool exc_succ = false; lang::IllegalAccessException exc( - OUString( RTL_CONSTASCII_USTRINGPARAM("testtest") ), + OUString("testtest"), xWeakAggImpl ); // exception helper tests try @@ -532,7 +532,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) try { throwException( makeAny( RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("runtime exc") ), xImpl ) ) ); + OUString("runtime exc"), xImpl ) ) ); } catch (RuntimeException & rExc) { @@ -540,7 +540,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) try { throwException( makeAny( Exception( - OUString( RTL_CONSTASCII_USTRINGPARAM("exc") ), rExc.Context ) ) ); + OUString("exc"), rExc.Context ) ) ); } catch (lang::IllegalAccessException &) { @@ -552,7 +552,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) try { throwException( makeAny( lang::IllegalAccessException( - OUString( RTL_CONSTASCII_USTRINGPARAM("axxess exc") ), rExc2.Context ) ) ); + OUString("axxess exc"), rExc2.Context ) ) ); } catch (lang::IllegalAccessException & rExc3) { diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index c04c4d8187ef..c67c1ecbf43e 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -52,17 +52,17 @@ static Property * getPropertyTable1() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) , + Property( OUString("a"), 0, getCppuType( (OUString *)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) , + Property( OUString("b"), 1, getCppuCharType( ) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) , + Property( OUString("c"), 2, getCppuType( (sal_Int32*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32 - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , + Property( OUString("d"), 5, getCppuType( (double*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , + Property( OUString("e"), 7, getCppuBooleanType() , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //BOOL - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0) , + Property( OUString("f"), 8, getCppuType( (Any*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) //Any }; pTable = aTable; @@ -81,17 +81,17 @@ static Property * getPropertyTable2() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , + Property( OUString("f"), 8, getCppuType( (Any *)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Any - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + Property( OUString("b"), 1, getCppuCharType( ), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + Property( OUString("a"), 0, getCppuType( (OUString*)0), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , + Property( OUString("d"), 5, getCppuType( (double*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0), + Property( OUString("c"), 2, getCppuType( (sal_Int32*)0), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32 - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , + Property( OUString("e"), 7, getCppuBooleanType() , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool }; pTable = aTable; @@ -109,11 +109,11 @@ static Property * getPropertyTable3() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + Property( OUString("b"), 1, getCppuCharType( ), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , + Property( OUString("f"), 8, getCppuType( (Any *)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // any - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + Property( OUString("a"), 0, getCppuType( (OUString*)0), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // OUString }; pTable = aTable; @@ -132,11 +132,11 @@ static Property * getPropertyTable4() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + Property( OUString("a"), 0, getCppuType( (OUString*)0), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + Property( OUString("b"), 1, getCppuCharType( ), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0) , + Property( OUString("f"), 2, getCppuType( (Any *)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Any }; pTable = aTable; @@ -220,10 +220,10 @@ void test_PropertyArrayHelper() OSL_ENSURE( aP.Type == getPropertyTable1()[i].Type, "Type not correct" ); } - OSL_ENSURE( !a1.hasPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM("never exist") ) ), "hasPropertyByName not correct" ); + OSL_ENSURE( !a1.hasPropertyByName( OUString("never exist") ), "hasPropertyByName not correct" ); try { - a1.getPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM("never exist") ) ); + a1.getPropertyByName( OUString("never exist") ); OSL_FAIL( "exeption not thrown" ); } catch( UnknownPropertyException & ) @@ -239,7 +239,7 @@ void test_PropertyArrayHelper() sal_Int32 Handle = a1.getHandleByName( getPropertyTable1()[i].Name ); OSL_ENSURE( Handle == getPropertyTable1()[i].Handle, "Handle not correct" ); } - sal_Int32 Handle = a1.getHandleByName( OUString( RTL_CONSTASCII_USTRINGPARAM("asdaf") ) ); + sal_Int32 Handle = a1.getHandleByName( OUString("asdaf") ); OSL_ENSURE( Handle == -1, "Handle not correct" ); } @@ -277,10 +277,10 @@ void test_PropertyArrayHelper() Sequence< OUString > aS( 4 ); sal_Int32 Handles[4]; // muss sortiert sein - aS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); - aS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("d") ); - aS.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("f") ); - aS.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("t") ); + aS.getArray()[0] = OUString("a"); + aS.getArray()[1] = OUString("d"); + aS.getArray()[2] = OUString("f"); + aS.getArray()[3] = OUString("t"); sal_Int32 nHitCount = a1.fillHandles( Handles, aS ); OSL_ENSURE( nHitCount == 3, "wrong number of hits " ); OSL_ENSURE( Handles[0] == getPropertyTable1()[0].Handle, "Handle not correct" ); @@ -408,11 +408,11 @@ Property * getBasicProps() static Property aBasicProps[PROPERTY_COUNT] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , PROPERTY_INT16, + Property( OUString("BOOL") , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ), + Property( OUString("INT16") , PROPERTY_INT16, getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") ) , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND ) + Property( OUString("INT32") , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ), + Property( OUString("TEST") , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND ) }; pTable = aBasicProps; } @@ -468,13 +468,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT , "PropertySetHelper: wrong data type" ); @@ -493,7 +493,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); @@ -526,13 +526,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; @@ -554,7 +554,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); pExceptedListenerValues[nCurrent] >>= nInt32; @@ -589,13 +589,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; @@ -611,7 +611,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); @@ -804,26 +804,26 @@ void test_PropertySetHelper() Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); + xPS->addPropertyChangeListener( OUString("INT16"), xPS_L ); Sequence<OUString> szPN( 3 ); - szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); - szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); - szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method + szPN.getArray()[0] = OUString("BOOL"); + szPN.getArray()[1] = OUString("INT32"); + szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method pPS->addPropertiesChangeListener( szPN, x1 ); szPN = Sequence<OUString>(); pPS->addPropertiesChangeListener( szPN, x1 ); - pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + pPS->addVetoableChangeListener( OUString("INT16"), x2 ); - xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); + xPS->removePropertyChangeListener( OUString("INT16"), xPS_L ); pPS->removePropertiesChangeListener( x1 ); pPS->removePropertiesChangeListener( x1 ); - pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + pPS->removeVetoableChangeListener( OUString("INT16"), x2 ); // this exception must thrown try { - xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), xPS_L ); + xPS->addPropertyChangeListener( OUString("Does not exist"), xPS_L ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( UnknownPropertyException & /*e*/ ) @@ -833,7 +833,7 @@ void test_PropertySetHelper() try { - xPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), x2 ); + xPS->addVetoableChangeListener( OUString("Does not exist"), x2 ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( UnknownPropertyException & /*e*/ ) @@ -849,14 +849,14 @@ void test_PropertySetHelper() Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); + xPS->addPropertyChangeListener( OUString("INT16"), xPS_L ); Sequence<OUString> szPN( 2 ); - szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); - szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); + szPN.getArray()[0] = OUString("BOOL"); + szPN.getArray()[1] = OUString("INT32"); pPS->addPropertiesChangeListener( szPN, x1 ); szPN = Sequence<OUString>(); pPS->addPropertiesChangeListener( szPN, x1 ); - pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + pPS->addVetoableChangeListener( OUString("INT16"), x2 ); pPS->dispose(); } OSL_ENSURE( pPS_L->nDisposing == 4 , "PropertySetHelper: wrong disposing count" ); @@ -873,7 +873,7 @@ void test_PropertySetHelper() sal_Bool b = sal_True; Any aBool; aBool.setValue( &b , getCppuBooleanType() ); - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), aBool ); + xPS->setPropertyValue( OUString("BOOL"), aBool ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( PropertyVetoException & /*e*/ ) @@ -900,7 +900,7 @@ void test_PropertySetHelper() sal_Bool b = sal_True; Any aBool; aBool.setValue( &b , getCppuBooleanType() ); - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), aBool ); + xPS->setPropertyValue( OUString("Does not exist"), aBool ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( UnknownPropertyException & /*e*/ ) @@ -923,7 +923,7 @@ void test_PropertySetHelper() try { Any aBool; - aBool = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ) ); + aBool = xPS->getPropertyValue( OUString("Does not exist") ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( UnknownPropertyException & /*e*/ ) @@ -944,7 +944,7 @@ void test_PropertySetHelper() try { Any aBool; - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aBool ); + xPS->setPropertyValue( OUString("INT32"), aBool ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( IllegalArgumentException & /*e*/ ) @@ -966,7 +966,7 @@ void test_PropertySetHelper() { Any aINT32; aINT32 <<= (sal_Int32 ) 16; - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aINT32 ); + xPS->setPropertyValue( OUString("INT16"), aINT32 ); OSL_FAIL( "PropertySetHelper: exeption not thrown" ); } catch( IllegalArgumentException & /*e*/ ) @@ -987,7 +987,7 @@ void test_PropertySetHelper() Any aValue; - aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) ); + aValue = xPS->getPropertyValue( OUString("BOOL") ); sal_Bool b = *( (sal_Bool*)aValue.getValue()); OSL_ENSURE( ! b, "PropertySetHelper: wrong BOOL value" ); aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_BOOL ); @@ -997,8 +997,8 @@ void test_PropertySetHelper() sal_Int16 n16(0); aValue <<=(sal_Int16)22; - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue ); - aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) ); + xPS->setPropertyValue( OUString("INT16"), aValue ); + aValue = xPS->getPropertyValue( OUString("INT16") ); aValue >>= n16; OSL_ENSURE( 22 == n16 , "PropertySetHelper: wrong INT16 value" ); aValue <<= (sal_Int16)44; @@ -1010,8 +1010,8 @@ void test_PropertySetHelper() // widening conversion aValue <<= (sal_Int16)55; - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue ); - aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) ); + xPS->setPropertyValue( OUString("INT32"), aValue ); + aValue = xPS->getPropertyValue( OUString("INT32") ); sal_Int32 n32(0); aValue >>= n32; OSL_ENSURE( 55 == n32 , "PropertySetHelper: wrong INT32 value" ); @@ -1022,9 +1022,9 @@ void test_PropertySetHelper() OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" ); Sequence< OUString >valueNames = Sequence<OUString>( 3 ); - valueNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); - valueNames.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); - valueNames.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); + valueNames.getArray()[0] = OUString("BOOL"); + valueNames.getArray()[1] = OUString("INT16"); + valueNames.getArray()[2] = OUString("INT32"); Sequence< Any > aValues = pPS->getPropertyValues( valueNames ); b = *((sal_Bool*)aValues.getConstArray()[0].getValue()); @@ -1042,8 +1042,8 @@ void test_PropertySetHelper() { Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); - pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + xPS->addPropertyChangeListener( OUString("INT16"), xPS_L ); + pPS->addVetoableChangeListener( OUString("INT16"), x2 ); pPS_L->nCount = 10; Sequence< Any > aSeq( pPS_L->nCount ); @@ -1064,7 +1064,7 @@ void test_PropertySetHelper() Any aValue; aValue <<= (sal_Int16)22; - xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue ); + xPS->setPropertyValue( OUString("INT16"), aValue ); aValue <<= (sal_Int16) 44; ((XFastPropertySet *)pPS)->setFastPropertyValue( PROPERTY_INT16, aValue ); aValue <<= (sal_Int16)100;// exception @@ -1084,8 +1084,8 @@ void test_PropertySetHelper() pPS_L->nCount = 0; pPS_L->nCurrent = 0; pPS_L->pExceptedListenerValues = NULL; - xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); - pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + xPS->removePropertyChangeListener( OUString("INT16"), xPS_L ); + pPS->removeVetoableChangeListener( OUString("INT16"), x2 ); } // Test multi property set listener @@ -1093,12 +1093,12 @@ void test_PropertySetHelper() Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , x2 ); + pPS->addVetoableChangeListener( OUString("INT16") , x2 ); Sequence<OUString> szPN( 4 ); - szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); - szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); - szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method - szPN.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); + szPN.getArray()[0] = OUString("BOOL"); + szPN.getArray()[1] = OUString("INT32"); + szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method + szPN.getArray()[3] = OUString("INT16"); pPS->addPropertiesChangeListener( szPN, x1 ); pPS_L->nCount = 6; @@ -1114,8 +1114,8 @@ void test_PropertySetHelper() pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value bound szPN = Sequence<OUString>( 2 ); - szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); - szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); + szPN.getArray()[0] = OUString("INT16"); + szPN.getArray()[1] = OUString("INT32"); Sequence< Any > aValues( 2 ); aValues.getArray()[0] <<= (sal_Int16) 22; aValues.getArray()[1] <<= (sal_Int16) 44; @@ -1136,8 +1136,8 @@ void test_PropertySetHelper() //vetoable exception with multible - szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); - szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); + szPN.getArray()[0] = OUString("INT16"); + szPN.getArray()[1] = OUString("INT16"); pPS->nINT32 = 0; pPS->nINT16 = 0; pPS_L->nCount = 4; @@ -1160,7 +1160,7 @@ void test_PropertySetHelper() OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" ); pPS->removePropertiesChangeListener( x1 ); - pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); + pPS->removeVetoableChangeListener( OUString("INT16"), x2 ); } } } diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx index c4d3dae742a0..d52515bff05e 100644 --- a/cppuhelper/test/testproptyphlp.cxx +++ b/cppuhelper/test/testproptyphlp.cxx @@ -56,7 +56,7 @@ void testPropertyTypeHelper() ::com::sun::star::beans::Property prop; - prop.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Huhu") ); + prop.Name = rtl::OUString("Huhu"); prop.Handle = 5; prop.Attributes = 3; diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 7f3361a1bc5f..0aed44a083df 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -270,13 +270,13 @@ static Reference< XInterface > loadComponent( aExt.compareToAscii( "so" ) == 0) { createInstance( - xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) ); + xLoader, xContext, OUString("com.sun.star.loader.SharedLibrary") ); } else if (aExt.compareToAscii( "jar" ) == 0 || aExt.compareToAscii( "class" ) == 0) { createInstance( - xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Java") ) ); + xLoader, xContext, OUString("com.sun.star.loader.Java") ); } else { @@ -533,7 +533,7 @@ SAL_IMPLEMENT_MAIN() } if (!(aImplName.isEmpty() || aServiceName.isEmpty())) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component exOR service name!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("give component exOR service name!" ), Reference< XInterface >() ); if (aImplName.isEmpty() && aServiceName.isEmpty()) { if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL( @@ -545,12 +545,12 @@ SAL_IMPLEMENT_MAIN() Reference<XInterface>() ); if (bSingleInstance) throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "unexpected option --singleinstance!") ), + OUString( + "unexpected option --singleinstance!"), Reference<XInterface>() ); } if (!aImplName.isEmpty() && aLocation.isEmpty()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component location!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("give component location!" ), Reference< XInterface >() ); if (!aServiceName.isEmpty() && !aLocation.isEmpty()) out( "\n> warning: service name given, will ignore location!" ); @@ -573,9 +573,9 @@ SAL_IMPLEMENT_MAIN() sal_Int32 nIndex = 0, nTokens = 0; do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while( nIndex != -1 ); if (nTokens != 3 || aUnoUrl.getLength() < 10 || - !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("uno:") ) )) + !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString("uno:") )) { - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal uno url given!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("illegal uno url given!" ), Reference< XInterface >() ); } nIndex = 0; OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName @@ -584,7 +584,7 @@ SAL_IMPLEMENT_MAIN() Reference< XAcceptor > xAcceptor; createInstance( xAcceptor, xContext, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor") ) ); + OUString("com.sun.star.connection.Acceptor") ); // init params Sequence< Any > aInitParams( aParams.getLength() ); @@ -614,7 +614,7 @@ SAL_IMPLEMENT_MAIN() Reference< XBridgeFactory > xBridgeFactory; createInstance( xBridgeFactory, xContext, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory") ) ); + OUString("com.sun.star.bridge.BridgeFactory") ); // bridge Reference< XBridge > xBridge( xBridgeFactory->createBridge( diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx index e862dd3e82df..c827c1c539e2 100644 --- a/crashrep/source/win32/soreport.cxx +++ b/crashrep/source/win32/soreport.cxx @@ -164,7 +164,7 @@ static BOOL GetCrashDataPath( LPTSTR szBuffer ) if ( !ustrValue.isEmpty() ) { - ustrValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); + ustrValue += ::rtl::OUString("/user/crashdata"); ::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue ); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index e66403c664a5..bbe06d6aa432 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1510,7 +1510,7 @@ private: OUString SAL_CALL ColorPicker_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.cui.ColorPicker" ) ); + return OUString( "com.sun.star.cui.ColorPicker" ); } // -------------------------------------------------------------------- @@ -1525,7 +1525,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > seq(1); - seq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ColorPicker" ) ); + seq[0] = OUString( "com.sun.star.ui.dialogs.ColorPicker" ); return seq; } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 31af615160fa..d5c0fed2139e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -133,8 +133,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() ); Sequence< OUString > aProps( 2 ); - aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" )); - aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" )); + aProps.getArray()[ 0 ] = OUString( "IsFolder" ); + aProps.getArray()[ 1 ] = OUString( "IsDocument" ); ::com::sun::star::uno::Reference< XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index fe8408130bd1..15066802f930 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -255,9 +255,9 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) try { uno::Sequence< beans::PropertyValue > aArg(1); - aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + aArg.getArray()[0].Name = OUString( "Hidden" ); aArg.getArray()[0].Value <<= (sal_Bool) sal_True; - xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg ); + xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); } catch( const io::IOException& ) { diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 0f79ebfbdd40..a9dcd4aad45e 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ), + ::utl::ConfigItem( rtl::OUString("Office.Chart") ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") ); + maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series"); } SvxChartOptions::~SvxChartOptions() diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index efced8d6b6ba..cc1a243a1b82 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -468,10 +468,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) while(xList->hasMoreElements()) { SequenceAsHashMap aFilter(xList->nextElement()); - OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); + OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString("Name"),OUString()); if (!sFilter.isEmpty()) { - sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); + sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString("Flags"),sal_Int32()); lList.push_back(sFilter); lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN)); lODFList.push_back( isODFFormat( sFilter ) ); @@ -491,8 +491,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) OSL_FAIL( rtl::OUStringToOString( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "exception in FilterFactory access: ")) + + "exception in FilterFactory access: ") + e.Message), RTL_TEXTENCODING_UTF8). getStr()); diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index d56ebb8d94b8..49a0354bdf86 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -190,7 +190,7 @@ void WebConnectionInfoDialog::FillPasswordList() { ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); - aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); + aUIEntry += ::rtl::OUString( "*" ); SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4a0b57a37e13..dc51d3c6c675 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1826,12 +1826,12 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat; + xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; if ( !bTextFormat ) { Locale aLocale; - ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale; + ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString("Locale")) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 886cdc11e3d5..1ae7fe74a4b4 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -205,7 +205,7 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ) ); + ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ) ); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) @@ -226,7 +226,7 @@ namespace dbaui ::comphelper::SequenceAsHashMap aFilterProperties( aProps ); ::rtl::OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ) ), ::rtl::OUString() ); + ::rtl::OUString( "DocumentService" ), ::rtl::OUString() ); if ( sDocumentService.equalsAscii( _pAsciiModuleName ) ) { // yes, it's a Base document diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index feee0a084aab..349a50fa3506 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -95,8 +95,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : m_notifier = n; } css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")); - s[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")); + s[0] = rtl::OUString("FontHeight"); + s[1] = rtl::OUString("FontName"); n->addPropertiesChangeListener(s, m_listener.get()); m_ColorConfig.AddListener(this); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index d768adf0358b..6baf9d09bbf3 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -106,19 +106,19 @@ namespace dbaui if ( m_aCommandURL == ".uno:DBNewForm" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewForm") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewView") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewViewSQL") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuery") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuerySql") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReport") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReportAutoPilot"),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewTable") ,sal_True)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Refresh")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBRebuildData")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Refresh") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBRebuildData") ,sal_True)); } TCommandState::iterator aIter = m_aStates.begin(); @@ -187,7 +187,7 @@ namespace dbaui try { Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager()))); - Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))); + Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument")); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 1cb79146415d..3660aa5de92e 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -154,12 +154,12 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { Sequence< Any > aValues(2); PropertyValue aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName")); + aValue.Name = ::rtl::OUString("ResourceName"); aValue.Value <<= sSubFolder; aValues[0] <<= aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceType")); - aValue.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("folder")); + aValue.Name = ::rtl::OUString("ResourceType"); + aValue.Value <<= ::rtl::OUString("folder"); aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index b51ecc0211c1..9c4cc2ef6b13 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -589,18 +589,18 @@ DBG_NAME(OConnectionHelper) ::rtl::OUString sContentType; if ( INET_PROT_FILE == eProtocol ) { - sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")); + sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder"); // the file UCP currently does not support the ContentType property } else { - Any aContentType = aParent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")) ); + Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") ); aContentType >>= sContentType; } // the properties which need to be set on the new content Sequence< ::rtl::OUString > aNewDirectoryProperties(1); - aNewDirectoryProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aNewDirectoryProperties[0] = ::rtl::OUString("Title"); // the values to be set Sequence< Any > aNewDirectoryAttributes(1); diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 1176326d0dc5..e60236d7608b 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -68,28 +68,28 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } #endif typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))) - ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))) - ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter"))) - ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter"))) - ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter"))) - ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter"))) - ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension"))) - ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine"))) - ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings"))) - ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase"))) - ,TProperties(DSID_CONN_DATAINC,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement"))) - ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize"))) - ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser"))) - ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword"))) - ,TProperties(DSID_USECATALOG,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog"))) - ,TProperties(DSID_CONN_SOCKET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"))) - ,TProperties(DSID_NAMED_PIPE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe"))) - ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"))) - ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"))) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount"))) - ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL"))) - ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency"))) + TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted")) + ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet")) + ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter")) + ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter")) + ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter")) + ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter")) + ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension")) + ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine")) + ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings")) + ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase")) + ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement")) + ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize")) + ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser")) + ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword")) + ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog")) + ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket")) + ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe")) + ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass")) + ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN")) + ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount")) + ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL")) + ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency")) ,TProperties(0,::rtl::OUString()) }; // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 30e52f18813a..404cefcf5a9c 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -110,7 +110,7 @@ DBG_NAME(OUserAdminDlg) if ( !aMetaData.supportsUserAdministration( getORB() ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 62c3cdabbb1d..559f04a2ed9c 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -491,7 +491,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const try { ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 424db244bf36..7a9afc377d1e 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -344,7 +344,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() { sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() ); if ( nCreateNewDBIndex == -1 ) - nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) ); + nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); @@ -482,13 +482,13 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")); + sRet = ::rtl::OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")); + sRet = ::rtl::OUString("sdbc:mysql:mysqlc:"); break; case OMySQLIntroPageSetup::VIA_ODBC: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:")); + sRet = ::rtl::OUString("sdbc:mysql:odbc:"); break; } } @@ -539,16 +539,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:odbc:")))); pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_JDBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:jdbc:")))); pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:")))); pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet); break; @@ -627,13 +627,13 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt switch( _pMySQLIntroPageSetup->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_ODBC: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:"); break; case OMySQLIntroPageSetup::VIA_JDBC: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:"); break; } activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); @@ -814,11 +814,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() try { if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() ) - sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")); + sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); } catch(const Exception&) { - sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")); + sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); } return sEmbeddedURL; @@ -1028,7 +1028,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aLoadArgs >>= aLoadArgPV; m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), + ::rtl::OUString( "_default" ), FrameSearchFlag::ALL, aLoadArgPV ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 96bafbcdef93..61392de4d379 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -239,7 +239,7 @@ DBG_NAME(DirectSQLDialog) while (xResultSet->next()) { // initialise the output line for each row - String out = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); + String out = ::rtl::OUString(""); // work along the columns until that are none left int i = 1; try @@ -247,7 +247,7 @@ DBG_NAME(DirectSQLDialog) for (;;) { // be dumb, treat everything as a string - out += xRow->getString(i) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + out += xRow->getString(i) + ::rtl::OUString(","); i++; } } diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 49e9697f6d02..4d646974aa68 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -179,7 +179,7 @@ DBG_NAME(DbaIndexDialog) const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbaccess.tabledesign.indexdialog"))) + ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString("dbaccess.tabledesign.indexdialog")) ,m_aActions (this, ModuleRes(TLB_ACTIONS)) ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 67216909840c..1f1b2e5e17dd 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const ::rtl::OUString sNameProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ); - const ::rtl::OUString sAscendingProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAscending" ) ); + const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" ); + const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" ); Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); @@ -231,7 +231,7 @@ void DlgOrderCrit::EnableLines() if(m_aColumnList[i]->GetSelectEntryPos() != 0) { if(!sOrder.isEmpty()) - sOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sOrder += ::rtl::OUString(","); String sName = m_aColumnList[i]->GetSelectEntry(); try diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 874311a625bb..f9deebacf8b5 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( utl::ConfigManager::getProductName() + - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Base" ) ) ); + rtl::OUString( " Base" ) ); // position and size the controls and the dialog, depending on whether we have one or two texts to display impl_positionControls(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 41754803c643..f31c32af66f9 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -305,7 +305,7 @@ DBG_NAME(OTableSubscriptionPage) sal_Bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< ::rtl::OUString > aNewTableFilter(1); - aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aNewTableFilter[0] = ::rtl::OUString("%"); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); @@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) + m_sCatalogSeparator = ::rtl::OUString("."); // (default) m_bCatalogAtStart = sal_True; // (default) try { diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 48f5d6b9f480..5d199166bb5e 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -823,7 +823,7 @@ void ODatabaseExport::ensureFormatter() SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; Reference<XPropertySet> xNumberFormatSettings = xSupplier->getNumberFormatSettings(); - xNumberFormatSettings->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate; + xNumberFormatSettings->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate; } } // ----------------------------------------------------------------------------- @@ -832,11 +832,11 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const TPositions& _rvColumns) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" ); - ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); + ::rtl::OUString aSql(::rtl::OUString("INSERT INTO ")); ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( ")); + aSql += ::rtl::OUString(" ( "); // set values and column names ::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( ")); static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index a4eaf1b23460..5bdd129a6f3a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -66,7 +66,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString("S1000") ,0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 856a8b477def..1405204dda8a 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -213,7 +213,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } catch(const SQLException&) { @@ -225,7 +225,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } } else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- @@ -324,7 +324,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- //........................................................................ diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 70c1bb12c5d1..3f409cf51eaa 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1146,7 +1146,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, pValue->Value >>= _rsAutoIncrementValue; pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) )); + ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString("IsAutoRetrievingEnabled") )); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rAutoIncrementValueEnabled; } @@ -1189,15 +1189,15 @@ void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) // query part exists? if ( _bQuestionMark ) // no, so start with '?' - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?")); + _rURL += ::rtl::OUString("?"); else // yes, so only append with '&' - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&")); + _rURL += ::rtl::OUString("&"); // set parameters - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Language=")); + _rURL += ::rtl::OUString("Language="); _rURL += utl::ConfigManager::getLocale(); - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&System=")); + _rURL += ::rtl::OUString("&System="); _rURL += SvtHelpOptions().GetSystem(); } @@ -1215,7 +1215,7 @@ namespace ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -1242,9 +1242,9 @@ namespace ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) { ::com::sun::star::util::URL aURL; - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); + aURL.Complete = ::rtl::OUString( "vnd.sun.star.help://" ); aURL.Complete += _sModuleName; - aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + aURL.Complete += ::rtl::OUString( "/" ); aURL.Complete += ::rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); ::rtl::OUString sAnchor; @@ -1254,7 +1254,7 @@ namespace AppendConfigToken(aURL.Complete,sal_True); if ( bHasAnchor ) { - aURL.Complete += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")); + aURL.Complete += ::rtl::OUString("#"); aURL.Complete += sAnchor; } return aURL; @@ -1486,7 +1486,7 @@ Reference<XPropertySet> createView( const ::rtl::OUString& _rName, const Referen } else { - sCommand = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) ); + sCommand = ::rtl::OUString( "SELECT * FROM " ); sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject ); } return createView( _rName, _rxConnection, sCommand ); @@ -1557,7 +1557,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon { String sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError.SearchAndReplaceAscii("#",sNewName); - throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); } try @@ -1566,11 +1566,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon Sequence< Any > aArguments(3); PropertyValue aValue; // set as folder - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); + aValue.Name = ::rtl::OUString("Name"); aValue.Value <<= sNewName; aArguments[0] <<= aValue; //parent - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); + aValue.Name = ::rtl::OUString("Parent"); aValue.Value <<= xNameAccess; aArguments[1] <<= aValue; diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 8a3a8bc300de..edf5aeab57d1 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -168,21 +168,21 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const { ::std::pair< ::rtl::OUString, ::rtl::OUString > aProperties[] = { - ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))) - ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "))) + ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(" AND ")) + ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(" ORDER BY ")) }; size_t i = 0; try { - const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(".")); const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); - const String sTargetNameTemp = (sTargetName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); sStatement += sTargetName; - sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1")); + sStatement += ::rtl::OUString(" WHERE 0=1"); for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i ) @@ -942,7 +942,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_bCreatePrimaryKeyColumn = sal_True; m_aKeyName = pPage->GetKeyName(); if ( m_aKeyName.isEmpty() ) - m_aKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ); + m_aKeyName = ::rtl::OUString( "ID" ); m_aKeyName = createUniqueName( m_aKeyName ); sal_Int32 nBreakPos2 = 0; CheckColumns(nBreakPos2); diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index d5dae84f709f..28c21278515f 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -225,7 +225,7 @@ namespace dbaui { if ( _rData.m_xDocEventBroadcaster.is() ) { - ::rtl::OUString sEventName = _bActive ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus")); + ::rtl::OUString sEventName = _bActive ? rtl::OUString("OnFocus") : rtl::OUString("OnUnfocus"); Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW ); _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() ); } diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 16b748d0f3c1..33013cb3887f 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -124,11 +124,11 @@ namespace dbaui NamedValue aProp; sal_Int32 nArg = 0; - aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); + aProp.Name = ::rtl::OUString("ParentFrame"); aProp.Value <<= m_xParentFrame; lArgs[nArg++] <<= aProp; - aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow")); + aProp.Name = ::rtl::OUString("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; @@ -147,7 +147,7 @@ namespace dbaui Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW ); xReturn = xFrameLoader->loadComponentFromURL( m_sComponentURL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), + ::rtl::OUString("_self"), 0, i_rDispatchArgs.getPropertyValues() ); diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index d28540383ba2..82deb2502ae2 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -165,9 +165,9 @@ namespace dbaui } // set the properties - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique")); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending")); - static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); + static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); + static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); + static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString("Name"); // the index' own props xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique)); xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); @@ -271,10 +271,10 @@ namespace dbaui //------------------------------------------------------------------ void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception)) { - static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPrimaryKeyIndex")); - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique")); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending")); - static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog")); + static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString("IsPrimaryKeyIndex"); + static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); + static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); + static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString("Catalog"); _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName)); _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName)); diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index a89876dae742..0f6a854ac524 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -148,7 +148,7 @@ namespace dbaui switch ( _eOpenMode ) { case E_OPEN_NORMAL: - sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ); + sOpenMode = ::rtl::OUString( "open" ); break; case E_OPEN_FOR_MAIL: @@ -156,7 +156,7 @@ namespace dbaui // fall through case E_OPEN_DESIGN: - sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) ); + sOpenMode = ::rtl::OUString( "openDesign" ); break; default: @@ -215,7 +215,7 @@ namespace dbaui ), UNO_QUERY_THROW ); } - xWizard->trigger( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "start" ) ) ); + xWizard->trigger( ::rtl::OUString( "start" ) ); ::comphelper::disposeComponent( xWizard ); } catch(const Exception&) @@ -317,7 +317,7 @@ namespace dbaui aCommandArgs.put( "OpenMode", aOpenModeArg ); Command aCommand; - aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) ); + aCommand.Name = ::rtl::OUString( "openDesign" ); aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); @@ -379,7 +379,7 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); + aInfo.prepend(::rtl::OUString(" \n")); String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 393f4397b143..5cab1e4a9bc7 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -69,7 +69,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index c84bb7790106..37e1e260a384 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -45,7 +45,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); } // ----------------------------------------------------------------------------- void OJoinDesignViewAccess::clearTableView() diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 4ad229061658..4bc0556f2be3 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) ); aWindowData.put( "ShowAll", (*aIter)->IsShowAll() ); - const ::rtl::OUString sTableName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) + ::rtl::OUString::valueOf( i ) ); + const ::rtl::OUString sTableName( ::rtl::OUString( "Table" ) + ::rtl::OUString::valueOf( i ) ); aAllTablesData.put( sTableName, aWindowData.getPropertyValues() ); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index d2577693d504..4bb97c530104 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -374,9 +374,9 @@ namespace OUString aQuote = xMetaData->getIdentifierQuoteString(); if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName ) { - aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + aTableListStr += OUString(" "); if ( generateAsBeforeTableAlias( _xConnection ) ) - aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM("AS ")); + aTableListStr += OUString("AS "); aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() ); } aDBName = aTableListStr; @@ -865,7 +865,7 @@ namespace else { aWhereStr += aWork; - aWhereStr += OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + aWhereStr += OUString("="); aWhereStr += aCriteria; } } @@ -999,7 +999,7 @@ namespace eErrorCode = eStatementTooLong; else { - _rsRet = OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")); + _rsRet = OUString(" ORDER BY "); _rsRet += aWorkStr; } } @@ -1107,17 +1107,17 @@ namespace { // create outer join if ( bUseEscape ) - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ ")); + aStr += OUString("{ OJ "); aStr += aJoin; if ( bUseEscape ) - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" }")); + aStr += OUString(" }"); } break; default: aStr += aJoin; break; } - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + aStr += OUString(","); aTableListStr += aStr; } } @@ -1584,7 +1584,7 @@ namespace for(;aIter != aTabEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft )) + if (pTabWin->ExistsField( OUString("*"), aDragLeft )) { aDragLeft->SetAlias(String()); aDragLeft->SetTable(String()); @@ -1698,22 +1698,22 @@ namespace case SQL_NODE_LESS: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + aCondition = aCondition + OUString(">"); break; case SQL_NODE_LESSEQ: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + aCondition = aCondition + OUString(">="); break; case SQL_NODE_GREAT: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + aCondition = aCondition + OUString("<"); break; case SQL_NODE_GREATEQ: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + aCondition = aCondition + OUString("<="); break; default: break; @@ -2258,7 +2258,7 @@ namespace for(;aIter != aEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo )) + if (pTabWin->ExistsField( OUString("*"), aInfo )) { aInfo->SetAlias(String()); aInfo->SetTable(String()); @@ -2943,16 +2943,16 @@ OUString OQueryDesignView::getStatement() aCriteriaListStr = aTmp; } // ----------------- construct statement ---------------------- - OUStringBuffer aSqlCmd(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))); + OUStringBuffer aSqlCmd(OUString("SELECT ")); if(rController.isDistinct()) - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT "))); + aSqlCmd.append(OUString(" DISTINCT ")); aSqlCmd.append(aFieldListStr); - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))); + aSqlCmd.append(OUString(" FROM ")); aSqlCmd.append(aTableListStr); if (aCriteriaListStr.getLength()) { - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); + aSqlCmd.append(OUString(" WHERE ")); aSqlCmd.append(aCriteriaListStr.makeStringAndClear()); } // ----------------- construct GroupBy and attachen ------------ @@ -2967,7 +2967,7 @@ OUString OQueryDesignView::getStatement() // ----------------- attache having ------------ if(aHavingStr.getLength()) { - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING "))); + aSqlCmd.append(OUString(" HAVING ")); aSqlCmd.append(aHavingStr.makeStringAndClear()); } // ----------------- construct sorting and attach ------------ @@ -3108,8 +3108,8 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE { // first try the international version OUString sSql; - sSql += OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * ")); - sSql += OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE ")); + sSql += OUString("SELECT * "); + sSql += OUString(" FROM x WHERE "); sSql += pEntry->GetField(); sSql += _sCriteria; SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 249fd03165c8..3556f0e58aa7 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -721,13 +721,13 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& else sSql += sFullFieldName; - sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) + sSql; + sSql = ::rtl::OUString("SELECT ") + sSql; if ( !sFieldAlias.isEmpty() ) { // always quote the alias name: there cannot be a function in it - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + sSql += ::rtl::OUString(" "); sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias ); } - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x")); + sSql += ::rtl::OUString(" FROM x"); pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational ); } @@ -822,7 +822,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) ) bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction ); else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table - bError = fillColumnRef( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); + bError = fillColumnRef( ::rtl::OUString("*"), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); else { nFunctionType |= FKT_NUMERIC; diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 902132aa084e..9a4e5005f52f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -216,7 +216,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con ++crit, ++c ) { - aCriteria[c].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Criterion_" ) ) + ::rtl::OUString::valueOf( c ); + aCriteria[c].Name = ::rtl::OUString( "Criterion_" ) + ::rtl::OUString::valueOf( c ); aCriteria[c].Value <<= *crit; } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 413b3abf2540..03f57e2b37f9 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -183,7 +183,7 @@ sal_Bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ); + SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString("*") ); pEntry->SetUserData( createUserData(NULL,false) ); } diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 3d88257e5204..b7350b15bfd9 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -88,14 +88,14 @@ namespace dbaui Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible")); - aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext")); + aSupported[0] = ::rtl::OUString("com.sun.star.accessibility.Accessible"); + aSupported[1] = ::rtl::OUString("com.sun.star.accessibility.AccessibleContext"); return aSupported; } // ----------------------------------------------------------------------------- ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index dc342f56ae04..174fb8d49e71 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -195,7 +195,7 @@ namespace dbaui ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")), m_pViewSwitch->getORB()),UNO_QUERY ); + Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); m_xBeamer.set( xBeamerFrame ); OSL_ENSURE(m_xBeamer.is(),"No frame created!"); m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) ); diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 526202d29f52..083a76ff7b54 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -98,13 +98,13 @@ using namespace ::osl; //------------------------------------------------------------------------------ ::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign")); + return ::rtl::OUString("org.openoffice.comp.dbu.ORelationDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.RelationDesign"); return aSupported; } //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 3734961ef531..f1ab891036dd 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -390,7 +390,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW"))) return NULL; ////////////////////////////////////////////////////////////////////// diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index a0d375d791b6..77ec4fce4827 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -132,13 +132,13 @@ namespace //------------------------------------------------------------------------------ ::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign")); + return ::rtl::OUString("org.openoffice.comp.dbu.OTableDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDesign"); return aSupported; } //------------------------------------------------------------------------- @@ -999,7 +999,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: pActFieldDescr->SetAutoIncrement(sal_False); pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); - pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) )); + pActFieldDescr->SetName( createUniqueName(::rtl::OUString("ID") )); pActFieldDescr->SetPrimaryKey( sal_True ); m_vRowList.insert(m_vRowList.begin(),pNewRow); @@ -1258,7 +1258,7 @@ void OTableController::alterColumns() SQLException aNewException; aNewException.Message = sError; - aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")); + aNewException.SQLState = ::rtl::OUString("S1000"); aNewException.NextException = ::cppu::getCaughtException(); throw aNewException; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index f3690eb29de1..5a01b0491d8e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -99,7 +99,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc")); + aUrl.Complete =::rtl::OUString(".uno:DSBEditDoc"); GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index ad28ad1719fc..9b56fe1c5cdb 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -57,7 +57,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW")) bRead = sal_True; else { diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 14bbf350c855..41c2e7ce9299 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -95,7 +95,7 @@ namespace dbaui //------------------------------------------------------------------------- ::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdvancedSettingsDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } //------------------------------------------------------------------------- @@ -108,7 +108,7 @@ namespace dbaui ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdvancedDatabaseSettingsDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 7682a612250e..47ad0d93d140 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -55,7 +55,7 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS // ----------------------------------------------------------------------------- ::rtl::OUString OColumnControl::GetComponentServiceName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ColumnDescriptorControl")); + return ::rtl::OUString("com.sun.star.sdb.ColumnDescriptorControl"); } // ----------------------------------------------------------------------------- void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException ) diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 95dd38e4fa0d..a18510f0ef5b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -66,7 +66,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult //------------------------------------------------------------------------- ::rtl::OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } //------------------------------------------------------------------------- @@ -79,7 +79,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceTypeChangeDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 5ab3fb7d0dbe..31d30112d6be 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -52,10 +52,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XMultiServiceFacto ,m_bOpenDatabase(sal_True) ,m_bStartTableWizard(sal_False) { - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenDatabase")), 3, PropertyAttribute::TRANSIENT, + registerProperty(::rtl::OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, &m_bOpenDatabase, getBooleanCppuType()); - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartTableWizard")), 4, PropertyAttribute::TRANSIENT, + registerProperty(::rtl::OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, &m_bStartTableWizard, getBooleanCppuType()); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< //------------------------------------------------------------------------- ::rtl::OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialogSetup")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } //------------------------------------------------------------------------- @@ -94,7 +94,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseWizardDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatabaseWizardDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index b39d12693b3f..7538e8e44448 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu //------------------------------------------------------------------------- ::rtl::OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableFilterDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableFilterDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableFilterDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 6284fe40f9cb..0ccace7fd67f 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM //------------------------------------------------------------------------- ::rtl::OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OUserSettingsDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.UserAdministrationDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.UserAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index e054018dc8c3..613a2822d548 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen //------------------------------------------------------------------------- ::rtl::OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODatasourceAdministrationDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatasourceAdministrationDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); return aSupported; } diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 8816d068289a..a0c093953e76 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -48,17 +48,17 @@ void Test::test() { }; static Data const data[] = { { rtl::OUString(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0000.00.0")), + rtl::OUString("0.0000.00.0"), ::dp_misc::EQUAL }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".01")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.1")), + { rtl::OUString(".01"), + rtl::OUString("0.1"), ::dp_misc::EQUAL }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")), + { rtl::OUString("10"), + rtl::OUString("2"), ::dp_misc::GREATER }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775808")), + { rtl::OUString("9223372036854775808"), // 2^63 - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775807")), + rtl::OUString("9223372036854775807"), ::dp_misc::GREATER } }; for (::std::size_t i = 0; i < sizeof data / sizeof (Data); ++i) { diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx index ffeb643fb179..ba8eb064dc06 100644 --- a/desktop/unx/source/officeloader/officeloader.cxx +++ b/desktop/unx/source/officeloader/officeloader.cxx @@ -37,7 +37,7 @@ SAL_IMPLEMENT_MAIN() osl_getExecutableFile( &sExecutableFile.pData ); - sExecutableFile += OUString( RTL_CONSTASCII_USTRINGPARAM(".bin") ); + sExecutableFile += OUString(".bin"); nCommandArgs = osl_getCommandArgCount(); pCommandArgs = new rtl_uString *[nCommandArgs]; diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 92e21d6736e3..b23d48f48d4e 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -87,7 +87,7 @@ namespace drawinglayer rtl::OUString XPrimitive2DRenderer_getImplementationName() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drawinglayer::unorenderer::XPrimitive2DRenderer" ) ); + return rtl::OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" ); } uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&) diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index 695fba7ac3b5..ad589d7b4958 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -59,7 +59,7 @@ namespace Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { - return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ) ) ) ); + return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( "" ) ) ) ); } } diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index f7cba0448461..7156590a3f7d 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -217,7 +217,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) } SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/AutoCorrect"))), + utl::ConfigItem(rtl::OUString("Office.Common/AutoCorrect")), rParent(rPar) { } @@ -526,7 +526,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) } SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/AutoFunction"))), + utl::ConfigItem(rtl::OUString("Office.Writer/AutoFunction")), rParent(rPar) { } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 3c78120bc0c3..cdc9d2ef13ef 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2403,7 +2403,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() try { ::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aContent.executeCommand ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "delete" ) ), makeAny ( sal_Bool (sal_True ) ) ); + aContent.executeCommand ( OUString( "delete" ), makeAny ( sal_Bool (sal_True ) ) ); } catch (...) { diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index d8937a746e3a..7440ca6af899 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -158,7 +158,7 @@ const char pSvxUnoNumberingRulesService[] = "com.sun.star.text.NumberingRules"; OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoNumberingRules" ) ); + return OUString( "SvxUnoNumberingRules" ); } sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) throw(RuntimeException) @@ -211,7 +211,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa sal_Unicode nCode = rFmt.GetBulletChar(); OUString aStr( &nCode, 1 ); aVal <<= aStr; - beans::PropertyValue aBulletProp( OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aBulletProp( OUString("BulletChar"), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aBulletProp; } @@ -233,7 +233,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa RTL_TEXTENCODING_ASCII_US); aVal <<= aURL; - const beans::PropertyValue aGraphicProp( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")), -1, aVal, beans::PropertyState_DIRECT_VALUE); + const beans::PropertyValue aGraphicProp( OUString("GraphicURL"), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aGraphicProp; } } @@ -242,7 +242,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa const Size aSize( rFmt.GetGraphicSize() ); const awt::Size aUnoSize( aSize.Width(), aSize.Height() ); aVal <<= aUnoSize; - const beans::PropertyValue aGraphicSizeProp(OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicSize")), -1, aVal, beans::PropertyState_DIRECT_VALUE ); + const beans::PropertyValue aGraphicSizeProp(OUString("GraphicSize"), -1, aVal, beans::PropertyState_DIRECT_VALUE ); pArray[nIdx++] = aGraphicSizeProp; } @@ -255,7 +255,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa aVal <<= (sal_Int32)rFmt.GetFirstLineOffset(); pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)), -1, aVal, beans::PropertyState_DIRECT_VALUE); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolTextDistance")), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString("SymbolTextDistance"), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor(); pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)), -1, aVal, beans::PropertyState_DIRECT_VALUE); diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index d7e1cf75b25d..30b35357314d 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -131,7 +131,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementati // XServiceInfo ::rtl::OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("SvxAccessibleTextPropertySet")); + return ::rtl::OUString("SvxAccessibleTextPropertySet"); } sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 659f0f163978..cc8cd4cd7bbb 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1669,7 +1669,7 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextRange::getText() OUString SAL_CALL SvxUnoTextRange::getImplementationName() throw(uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextRange")); + return OUString("SvxUnoTextRange"); } // ==================================================================== @@ -2091,8 +2091,8 @@ void SvxPropertyValuesToItemSet( if (pEntry->nFlags & beans::PropertyAttribute::READONLY) // should be PropertyVetoException which is not yet defined for the new import API's functions - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); - //throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); + throw uno::RuntimeException( OUString( "Property is read-only: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); + //throw PropertyVetoException ( OUString( "Property is read-only: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); if (pEntry->nWID == WID_FONTDESC) { @@ -2138,7 +2138,7 @@ void SvxPropertyValuesToItemSet( pPropSet->setPropertyValue( pProps[i].Name, pProps[i].Value, rItemSet ); } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) ); } } @@ -2266,7 +2266,7 @@ void SvxUnoTextBase::copyText( OUString SAL_CALL SvxUnoTextBase::getImplementationName() throw(uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextBase")); + return OUString("SvxUnoTextBase"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames( ) diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 886b99e23e7a..bf18992295e4 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -365,7 +365,7 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN OUString SAL_CALL SvxUnoTextContent::getImplementationName() throw(uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextContent") ); + return OUString("SvxUnoTextContent"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() @@ -677,7 +677,7 @@ void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno:: // lang::XServiceInfo OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextCursor")); + return OUString("SvxUnoTextCursor"); } sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index be9abc521060..974051b63a31 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -102,7 +102,7 @@ void OCommonEmbeddedObject::Deactivate() catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client could not store the object!" )), + ::rtl::OUString( "The client could not store the object!" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ), uno::makeAny( e ) ); } @@ -227,7 +227,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) { if ( !m_xClientSite.is() ) throw embed::WrongStateException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "client site not set, yet" ) ), + ::rtl::OUString( "client site not set, yet" ), *this ); @@ -387,7 +387,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) } } else - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -400,7 +400,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ break; if ( nCurInd == m_aAcceptedStates.getLength() ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nDestInd = 0; @@ -410,7 +410,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ if ( nDestInd == m_aAcceptedStates.getLength() ) throw embed::UnreachableStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The state either not reachable, or the object allows the state only as an intermediate one!\n" )), + ::rtl::OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), m_nObjectState, nNewState ); @@ -434,7 +434,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nOldState = m_nObjectState; @@ -487,7 +487,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) // let the object window be shown if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE ) - PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); + PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); } } @@ -500,7 +500,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aAcceptedStates; @@ -515,7 +515,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_nObjectState; @@ -546,7 +546,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for internal documents this call is just a duplicate of changeState @@ -579,7 +579,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aObjectVerbs; @@ -599,7 +599,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )), + ::rtl::OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -615,7 +615,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -632,10 +632,10 @@ void SAL_CALL OCommonEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); + PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); } //---------------------------------------------- @@ -648,7 +648,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx index 731603a6e8e9..d5aa627400b8 100644 --- a/embeddedobj/source/commonembedding/inplaceobj.cxx +++ b/embeddedobj/source/commonembedding/inplaceobj.cxx @@ -46,7 +46,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle& if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE && m_nObjectState != embed::EmbedStates::UI_ACTIVE ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not activated inplace!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not activated inplace!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect ); diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 44a344d8b352..6b09b0742b9b 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -503,7 +503,7 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw uno::RuntimeException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index b7e61e485f83..fcd148936a24 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans: if ( !bAsTemplateSet ) { aResult.realloc( nLength + 1 ); - aResult[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" )); + aResult[nLength].Name = ::rtl::OUString( "AsTemplate" ); aResult[nLength].Value <<= sal_True; } @@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor( } catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't copy storage!" )), + ::rtl::OUString( "Can't copy storage!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -224,7 +224,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c if ( xDocument.is() ) { uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" )); + aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; xDocument->attachResource( ::rtl::OUString(), aSeq ); @@ -382,14 +382,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() sal_Int32 nLen = 2; uno::Sequence< beans::PropertyValue > aArgs( nLen ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aArgs[0].Name = ::rtl::OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgs[1].Name = ::rtl::OUString( "FilterName" ); aArgs[1].Value <<= m_aLinkFilterName; if ( m_bLinkHasPassword ) { aArgs.realloc( ++nLen ); - aArgs[nLen-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ); + aArgs[nLen-1].Name = ::rtl::OUString( "Password" ); aArgs[nLen-1].Value <<= m_aLinkPassword; } @@ -518,7 +518,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -599,16 +599,16 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 4 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgs[0].Name = ::rtl::OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" )); + aArgs[1].Name = ::rtl::OUString( "OutputStream" ); aArgs[1].Value <<= xTempOut; - aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" )); + aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" )); + aArgs[3].Name = ::rtl::OUString( "HierarchicalDocumentName" ); aArgs[3].Value <<= aHierarchName; - xStorable->storeToURL( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aArgs ); + xStorable->storeToURL( ::rtl::OUString( "private:stream" ), aArgs ); try { xTempOut->closeOutput(); @@ -661,7 +661,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs(); for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ ) if ( aModelProps[nInd].Name.equals( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ) ) ) ) + ::rtl::OUString( "DocumentBaseURL" ) ) ) { aModelProps[nInd].Value >>= aBaseURL; break; @@ -677,7 +677,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() { for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ ) if ( m_aDocMediaDescriptor[nInd].Name.equals( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ) ) ) ) + ::rtl::OUString( "DocumentBaseURL" ) ) ) { m_aDocMediaDescriptor[nInd].Value >>= aBaseURL; break; @@ -761,11 +761,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgs[0].Name = ::rtl::OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" )); + aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" )); + aArgs[1].Name = ::rtl::OUString( "HierarchicalDocumentName" ); aArgs[1].Value <<= aHierarchName; xDoc->storeToStorage( xStorage, aArgs ); @@ -869,7 +869,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -877,21 +877,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ OSL_ENSURE( !aTempFileURL.isEmpty(), "Couldn't retrieve temporary file URL!\n" ); - aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); aTempMediaDescr[0].Value <<= aTempFileURL; - aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" )); + aTempMediaDescr[1].Name = ::rtl::OUString( "InputStream" ); aTempMediaDescr[1].Value <<= xTempStream; - aTempMediaDescr[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aTempMediaDescr[2].Name = ::rtl::OUString( "FilterName" ); aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat ); - aTempMediaDescr[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" )); + aTempMediaDescr[3].Name = ::rtl::OUString( "AsTemplate" ); aTempMediaDescr[3].Value <<= sal_True; } else { aTempMediaDescr.realloc( 2 ); - aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); aTempMediaDescr[0].Value <<= m_aLinkURL; - aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aTempMediaDescr[1].Name = ::rtl::OUString( "FilterName" ); aTempMediaDescr[1].Value <<= m_aLinkFilterName; } @@ -923,12 +923,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -943,7 +943,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )), + ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1124,7 +1124,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1150,7 +1150,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1278,7 +1278,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1325,7 +1325,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: OSL_FAIL( "Can not retrieve own storage media type!\n" ); } - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) ); + PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); sal_Bool bTryOptimization = sal_False; for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ ) @@ -1413,7 +1413,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1449,7 +1449,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) )); + PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" )); } else { @@ -1513,7 +1513,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1545,7 +1545,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1561,7 +1561,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == embed::EmbedStates::LOADED ) return; - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSave" )) ); + PostEvent_Impl( ::rtl::OUString( "OnSave" ) ); OSL_ENSURE( m_pDocHolder->GetComponent().is(), "If an object is activated or in running state it must have a document!\n" ); if ( !m_pDocHolder->GetComponent().is() ) @@ -1610,7 +1610,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" )) ); + PostEvent_Impl( ::rtl::OUString( "OnSaveDone" ) ); } //------------------------------------------------------ @@ -1625,7 +1625,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1657,7 +1657,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1665,7 +1665,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( { // the object is still not loaded throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in loaded state to be reloaded!\n" )), + ::rtl::OUString( "The object must be in loaded state to be reloaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1703,7 +1703,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( else { uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aArgs[0].Name = ::rtl::OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False ); } @@ -1779,7 +1779,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )), + ::rtl::OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } else @@ -1789,12 +1789,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt } if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1802,7 +1802,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )), + ::rtl::OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1880,7 +1880,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink() if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )), + ::rtl::OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aLinkURL; diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 19a53cb5d51c..c4e4e373109f 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -107,13 +107,13 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR // TODO: if object is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 || m_nObjectState == embed::EmbedStates::LOADED ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: return for the aspect of the document @@ -134,7 +134,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); maSize = aSize; @@ -153,11 +153,11 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -175,7 +175,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -204,7 +204,7 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( nVerbID == -7 ) diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 56cdc983f5d5..499507e07b7f 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -46,11 +46,11 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_bHasClonedSize = sal_False; @@ -86,7 +86,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); @@ -126,11 +126,11 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bHasClonedSize ) @@ -169,14 +169,14 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Bool bBackToLoaded = sal_False; @@ -206,7 +206,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe datatransfer::DataFlavor aDataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetaFile" )), + ::rtl::OUString( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); if( xTransferable->isDataFlavorSupported( aDataFlavor )) diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index adfd24552768..ba5af4a6ab69 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -40,15 +40,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoEmbeddedObjectFactory")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory")); + aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoEmbeddedObjectFactory"); + aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory")); + return ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -73,12 +73,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -103,7 +103,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta ::rtl::OUString aMediaType; try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ); + uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ) ); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -164,12 +164,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -231,12 +231,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -283,12 +283,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -352,7 +352,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -401,12 +401,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -418,7 +418,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -479,15 +479,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupported uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory")); + aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"); + aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory")); + return ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); } //------------------------------------------------------------------------- diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index ed0f7adf7d90..f953509a3e60 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& m_aOutplaceFrameProps.realloc( 3 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow")); + aArg.Name = ::rtl::OUString("TopWindow"); aArg.Value <<= sal_True; m_aOutplaceFrameProps[0] <<= aArg; - aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MakeVisible")); + aArg.Name = ::rtl::OUString("MakeVisible"); aArg.Value <<= sal_False; m_aOutplaceFrameProps[1] <<= aArg; @@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& } m_refCount--; - aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); + aArg.Name = ::rtl::OUString("ParentFrame"); aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame m_aOutplaceFrameProps[2] <<= aArg; } @@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager; + xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager; if ( xLayoutManager.is() ) { xLayoutManager->setVisible( bVisible ); @@ -434,7 +434,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& } awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("dockingwindow") ), + ::rtl::OUString("dockingwindow"), xMyParent, 0, awt::Rectangle(),//aOwnRectangle, @@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& uno::Sequence< uno::Any > aArgs( 2 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainerWindow")); + aArg.Name = ::rtl::OUString("ContainerWindow"); aArg.Value <<= xOwnWindow; aArgs[0] <<= aArg; uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY ); if ( xContFrame.is() ) { - aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); + aArg.Name = ::rtl::OUString("ParentFrame"); aArg.Value <<= xContFrame; aArgs[1] <<= aArg; } @@ -535,7 +535,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() if( xUIConfigManager.is()) { xResult = xUIConfigManager->getSettings( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ), + ::rtl::OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -557,7 +557,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() xModConfSupplier->getUIConfigurationManager( aModuleIdent ), uno::UNO_QUERY_THROW ); xResult = xModUIConfMan->getSettings( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ), + ::rtl::OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -656,7 +656,7 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star { uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings( xContLM->getElement( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ) ), + ::rtl::OUString( "private:resource/menubar/menubar" ) ), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True ); if ( !xContMenu.is() ) @@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM; + xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; xDocAreaAcc = xContainerLM->getDockingAreaAcceptor(); } catch( const uno::Exception& ){} @@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM; + xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM; + xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -972,18 +972,18 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) ::rtl::OUString sUrl; uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); if ( xServiceInfo.is() - && xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition"))) ) + && xServiceInfo->supportsService(::rtl::OUString("com.sun.star.report.ReportDefinition")) ) { - sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign")); + sUrl = ::rtl::OUString(".component:DB/ReportDesign"); } else if( xServiceInfo.is() - && xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")) )) - sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart")); + && xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.chart2.ChartDocument") )) + sUrl = ::rtl::OUString("private:factory/schart"); else - sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:object")); + sUrl = ::rtl::OUString("private:object"); xComponentLoader->loadComponentFromURL( sUrl, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), + rtl::OUString( "_self" ), 0, aArgs.getPropertyValues() ); @@ -1173,7 +1173,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) // if the component does not support document::XEventBroadcaster // the modify notifications are used as workaround, but only for running state if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING ) - m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) ); + m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); } //--------------------------------------------------------------------------- diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 04795ffa5761..9d62ae63ce91 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -44,7 +44,7 @@ void ODummyEmbeddedObject::CheckInit() throw lang::DisposedException(); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -228,7 +228,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_nCachedAspect = nAspect; @@ -249,12 +249,12 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bHasCachedSize || m_nCachedAspect != nAspect ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ), + ::rtl::OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aCachedSize; @@ -271,7 +271,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -288,7 +288,7 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep CheckInit(); // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -310,12 +310,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -323,7 +323,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( && ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) ) { throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )), + ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -348,13 +348,13 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( m_nObjectState = embed::EmbedStates::LOADED; } else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong entry is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong entry is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); } else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -400,7 +400,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) ); + PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -435,7 +435,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xParentStorage = m_xNewParentStorage; m_aEntryName = m_aNewEntryName; - PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" )) ); + PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ) ); } m_xNewParentStorage = uno::Reference< embed::XStorage >(); diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 88256898534e..a47ef9bed158 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -103,18 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) m_pDisposeEventListeners(0), m_pStatCL(0) { - m_aInterceptedURL[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); - m_aInterceptedURL[1] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll")); - m_aInterceptedURL[2] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - m_aInterceptedURL[3] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); - m_aInterceptedURL[4] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[5] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); + m_aInterceptedURL[0] = rtl::OUString(".uno:Save"); + m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll"); + m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc"); + m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin"); + m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame"); + m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs"); } @@ -172,12 +166,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" )); + aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" ); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 ); + URL, ::rtl::OUString( "_self" ), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } @@ -200,8 +194,7 @@ Interceptor::addStatusListener( { // Save frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Update")); + aStateEvent.FeatureDescriptor = rtl::OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); @@ -225,8 +218,7 @@ Interceptor::addStatusListener( { // Close and return frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Close and Return")); + aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); @@ -248,8 +240,7 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo")); + aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 2fdb868e0280..24f5bbd4c983 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -44,15 +44,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.EmbeddedObjectCreator")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator")); + aRet[0] = ::rtl::OUString("com.sun.star.embed.EmbeddedObjectCreator"); + aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator")); + return ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); } //------------------------------------------------------------------------- @@ -79,12 +79,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -93,7 +93,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta { // use system fallback // TODO: in future users factories can be tested - aEmbedFactory = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" )); + aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) ); @@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) )); + uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -184,10 +184,10 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) )); + uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); aAny >>= aMediaType; if ( aMediaType == "application/vnd.sun.star.oleobject" ) - aEmbedFactory = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) ); + aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } catch ( const uno::Exception& ) { @@ -243,12 +243,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // TODO: use lObjArgs if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -308,12 +308,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -357,7 +357,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -386,13 +386,13 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // was also extended. if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index a04dbb64fd6c..f6c801aa8a4b 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -131,7 +131,7 @@ public: rtl::OUString GetTitle() const { - return m_aContainerName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " - " )) + m_aDocumentNamePart; + return m_aContainerName + ::rtl::OUString( " - " ) + m_aDocumentNamePart; } rtl::OUString GetContainerName() const { return m_aContainerName; } diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index b1f69c4cdf6a..7d3855884836 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf, { uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext())); uno::Sequence< beans::PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" )); + aMediaProperties[0].Name = ::rtl::OUString( "InputStream" ); aMediaProperties[0].Value <<= xIn; uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); if( xGraphic.is() ) @@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf, SvMemoryStream aNewStream( 65535, 65535 ); uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream ); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 ); - aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" )); + aOutMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MimeType" )); + aOutMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); aOutMediaProperties[1].Value <<= aMimeType; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index f7da74084f8c..4222d489ea19 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -190,27 +190,27 @@ struct OleComponentNative_Impl { m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Enhanced Metafile" )), + ::rtl::OUString( "Windows Enhanced Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[1] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )), + ::rtl::OUString( "Windows Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[2] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )), + ::rtl::OUString( "Bitmap" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[3] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PNG" )), + ::rtl::OUString( "image/png" ), + ::rtl::OUString( "PNG" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetafile" )), + ::rtl::OUString( "GDIMetafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); } @@ -246,11 +246,11 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) ::rtl::OUString aResult; if ( nAsp == DVASPECT_THUMBNAIL ) - aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=THUMBNAIL" )); + aResult = ::rtl::OUString( ";Aspect=THUMBNAIL" ); else if ( nAsp == DVASPECT_ICON ) - aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=ICON" )); + aResult = ::rtl::OUString( ";Aspect=ICON" ); else if ( nAsp == DVASPECT_DOCPRINT ) - aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=DOCPRINT" )); + aResult = ::rtl::OUString( ";Aspect=DOCPRINT" ); // no suffix for DVASPECT_CONTENT @@ -292,7 +292,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile { - aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-wmf")); + aFormat = ::rtl::OUString("image/x-wmf"); METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict ); if ( pMF ) { @@ -323,7 +323,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile { - aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-emf")); + aFormat = ::rtl::OUString("image/x-emf"); nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) ) @@ -337,7 +337,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_GDI ) // Bitmap { - aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-MS-bmp")); + aFormat = ::rtl::OUString("image/x-MS-bmp"); nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) ) @@ -408,7 +408,7 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe { if ( *pStr == '&' ) { - aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "~" )); + aResult += ::rtl::OUString( "~" ); while( *( ++pStr ) == '&' ); } else @@ -1405,7 +1405,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect ) { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )), + ::rtl::OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() ); } @@ -1426,7 +1426,7 @@ void OleComponent::OnClose_Impl() { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )), + ::rtl::OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() ); } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 44f6585f419f..f4abfbf6a57c 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -209,7 +209,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ ) { ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TMPSTOR" ) ); + aName += ::rtl::OUString( "TMPSTOR" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -234,7 +234,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ ) { ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TMPSTREAM" ) ); + aName += ::rtl::OUString( "TMPSTREAM" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -275,7 +275,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() && ( aFilterName == "Calc MS Excel 2007 XML" || aFilterName == "Impress MS PowerPoint 2007 XML" || aFilterName == "MS Word 2007 XML" ) ) { uno::Reference< container::XNameAccess > xFilterFactory( - m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) )), + m_xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.FilterFactory" )), uno::UNO_QUERY_THROW ); ::rtl::OUString aDocServiceName; @@ -292,7 +292,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { // create the model uno::Sequence< uno::Any > aArguments(1); - aArguments[0] <<= beans::NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EmbeddedObject" ) ), uno::makeAny( (sal_Bool)sal_True )); + aArguments[0] <<= beans::NamedValue( ::rtl::OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); @@ -301,21 +301,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // let the model behave as embedded one uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" )); + aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; xModel->attachResource( ::rtl::OUString(), aSeq ); // load the model from the stream uno::Sequence< beans::PropertyValue > aArgs( 5 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" )); + aArgs[0].Name = ::rtl::OUString( "HierarchicalDocumentName" ); aArgs[0].Value <<= m_aEntryName; - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" )); + aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgs[2].Name = ::rtl::OUString( "FilterName" ); aArgs[2].Value <<= aFilterName; - aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); - aArgs[3].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" )); - aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" )); + aArgs[3].Name = ::rtl::OUString( "URL" ); + aArgs[3].Value <<= ::rtl::OUString( "private:stream" ); + aArgs[4].Name = ::rtl::OUString( "InputStream" ); aArgs[4].Value <<= m_xObjectStream->getInputStream(); xSeekable->seek( 0 ); @@ -327,7 +327,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() xDocument->close( sal_True ); uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW ); ::rtl::OUString aMediaType; - xStorProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ) >>= aMediaType; + xStorProps->getPropertyValue( ::rtl::OUString( "MediaType" ) ) >>= aMediaType; xTmpStorage->dispose(); // look for the related embedded object factory @@ -463,7 +463,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // in case the object is already in requested state @@ -619,7 +619,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -661,7 +661,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: Shouldn't we ask object? ( I guess no ) @@ -705,7 +705,7 @@ namespace aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")), + ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), aArgs ), uno::UNO_QUERY_THROW ); uno::Reference< io::XStream > xCONTENTS; @@ -729,9 +729,9 @@ namespace if (bCopied) { - xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")), + xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), uno::makeAny(sal_False)); - uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri"))); + uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString("Uri")); aUrl >>= sUrl; xNativeTempFile = uno::Reference<beans::XPropertySet>(); @@ -743,7 +743,7 @@ namespace } else { - xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")), + xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), uno::makeAny(sal_True)); } #else @@ -779,7 +779,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -914,7 +914,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT if ( m_pOleComponent ) @@ -959,7 +959,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )), + ::rtl::OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -985,7 +985,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -1012,7 +1012,7 @@ void SAL_CALL OleEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nUpdateMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE ) @@ -1046,7 +1046,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE @@ -1076,7 +1076,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in running state!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object must be in running state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int64 nResult = 0; diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index b0fddcaa3df2..a71944bd4cea 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -376,7 +376,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent() if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED ) { // the object is still not running - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 165f2dd2832e..4e56995221e7 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -86,8 +86,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: uno::UNO_QUERY_THROW ); try { - xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) )); + xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); aUrl >>= aResult; } catch ( const uno::Exception& ) @@ -166,8 +166,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: xParentStorage->copyStreamElementData( aEntryName, xTempStream ); - xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) )); + xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); aUrl >>= aResult; } catch( const uno::RuntimeException& ) @@ -191,7 +191,7 @@ void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, cons if ( !xPropSet.is() ) throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet - xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )), uno::makeAny( aMediaType ) ); + xPropSet->setPropertyValue( ::rtl::OUString( "MediaType" ), uno::makeAny( aMediaType ) ); } #endif //------------------------------------------------------ @@ -201,7 +201,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre if ( !xPropSet.is() ) throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface - xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" )), + xPropSet->setPropertyValue( ::rtl::OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( (sal_Bool)sal_True ) ); } #ifdef WNT @@ -379,7 +379,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), + ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -502,7 +502,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea throw io::IOException(); // TODO: // insert the result file as replacement image - ::rtl::OUString aCacheName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres000" )); + ::rtl::OUString aCacheName = ::rtl::OUString( "\002OlePres000" ); if ( xNameContainer->hasByName( aCacheName ) ) xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) ); else @@ -528,7 +528,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), + ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -597,7 +597,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), + ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -644,7 +644,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { xNameContainer = uno::Reference< container::XNameContainer >( m_xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), + ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); } @@ -673,7 +673,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres if ( nInd == 0 ) { // to be compatible with the old versions Ole10Native is checked after OlePress000 - aStreamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\001Ole10Native" ) ); + aStreamName = ::rtl::OUString( "\001Ole10Native" ); try { if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() ) @@ -871,7 +871,7 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow ) void OleEmbeddedObject::OnIconChanged_Impl() { // TODO/LATER: currently this notification seems to be impossible - // MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnIconChanged" )) ); + // MakeEventListenerNotification_Impl( ::rtl::OUString( "OnIconChanged" ) ); } //------------------------------------------------------ @@ -901,7 +901,7 @@ void OleEmbeddedObject::OnViewChanged_Impl() // The view is changed while the object is in running state, save the new object m_xCachedVisualRepresentation = uno::Reference< io::XStream >(); SaveObject_Impl(); - MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" )) ); + MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); } // =============================================================== } @@ -1082,7 +1082,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1170,7 +1170,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( !xTargetStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) )); + SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = xTargetStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1317,12 +1317,12 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1337,7 +1337,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )), + ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1443,7 +1443,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( if ( aURL.isEmpty() ) throw lang::IllegalArgumentException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty URL is provided in the media descriptor!\n" )), + ::rtl::OUString( "Empty URL is provided in the media descriptor!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -1465,7 +1465,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1483,7 +1483,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // do nothing, the object has already switched it's persistence } else - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -1583,7 +1583,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1648,13 +1648,13 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) aGuard.clear(); if ( bUseNew ) { - MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) )); + MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveAsDone" )); // the object can be changed only on windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) { - MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) )); + MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); } } } @@ -1709,7 +1709,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1754,7 +1754,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1780,7 +1780,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( !m_xObjectStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) )); + SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = m_xObjectStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1834,12 +1834,12 @@ void SAL_CALL OleEmbeddedObject::storeOwn() aGuard.clear(); - MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" ) )); + MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveDone" )); // the object can be changed only on Windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) - MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) )); + MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); } //------------------------------------------------------ @@ -1863,7 +1863,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1904,7 +1904,7 @@ void SAL_CALL OleEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1943,12 +1943,12 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1957,7 +1957,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )), + ::rtl::OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -2086,7 +2086,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink() if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )), + ::rtl::OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: probably the link URL can be retrieved from OLE diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index c517a7445248..1628a36c853d 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -55,7 +55,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo // it's a bitmap aVisualRepr.Flavor = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )), + ::rtl::OUString( "Bitmap" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } else @@ -63,7 +63,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo // it's a metafile aVisualRepr.Flavor = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )), + ::rtl::OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } @@ -100,11 +100,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -180,11 +180,11 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -218,7 +218,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ), + ::rtl::OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -261,7 +261,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) if ( !bSuccess ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ), + ::rtl::OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); aGuard.reset(); @@ -280,7 +280,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch ( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ), + ::rtl::OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -296,7 +296,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) else { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ), + ::rtl::OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -328,13 +328,13 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: if the object has cached representation then it should be returned // TODO: if the object has no cached representation and is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); embed::VisualRepresentation aVisualRepr; @@ -362,7 +362,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres datatransfer::DataFlavor aDataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )), + ::rtl::OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor ); @@ -394,7 +394,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres if ( !m_xCachedVisualRepresentation.is() ) { // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -421,11 +421,11 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )), + throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 8b4dbf8ca58f..1f5fb367b2fb 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -120,28 +120,28 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL ) uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aArgs[0].Name = ::rtl::OUString( "URL" ); aArgs[0].Value <<= aFileURL; - aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" )); + aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); + aArgs[2].Name = ::rtl::OUString( "InteractionHandler" ); aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >( static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY ); - aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DontEdit" )); + aArgs[3].Name = ::rtl::OUString( "DontEdit" ); aArgs[3].Value <<= sal_True; if ( !m_aFilterName.isEmpty() ) { - aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgs[4].Name = ::rtl::OUString( "FilterName" ); aArgs[4].Value <<= m_aFilterName; } uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL( aFileURL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), + ::rtl::OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY ); @@ -202,7 +202,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative ) throw uno::RuntimeException(); uno::Reference< document::XTypeDetection > xTypeDetection( - xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) )), + xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.TypeDetection" )), uno::UNO_QUERY_THROW ); ::rtl::OUString aTypeName; @@ -210,18 +210,18 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative ) if ( !aNameWithExtention.isEmpty() ) { ::rtl::OUString aURLToAnalyze = - ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "file:///" ) ) + aNameWithExtention ); + ( ::rtl::OUString( "file:///" ) + aNameWithExtention ); aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze ); } uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); - aArgs[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ); - aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) ); + aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Value <<= ::rtl::OUString( "private:stream" ); + aArgs[1].Name = ::rtl::OUString( "InputStream" ); aArgs[1].Value <<= xInputStream; if ( !aTypeName.isEmpty() ) { - aArgs[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeName" ) ); + aArgs[2].Name = ::rtl::OUString( "TypeName" ); aArgs[2].Value <<= aTypeName; } @@ -273,8 +273,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io throw uno::RuntimeException(); try { - xNativeTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) ); - uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) )); + xNativeTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); aUrl >>= aNativeTempURL; } catch ( uno::Exception& ) @@ -421,11 +421,11 @@ void OwnView_Impl::CreateNative() aArgs[0] <<= xInStream; uno::Reference< container::XNameAccess > xNameAccess( m_xFactory->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), + ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aSubStreamName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\1Ole10Native" )); + ::rtl::OUString aSubStreamName = ::rtl::OUString( "\1Ole10Native" ); uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW ); uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID(); diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index 3ec9206e82ac..ea7947a58a49 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -108,15 +108,15 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator")); + aRet[0] = ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator"); + aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator")); + return ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); } //------------------------------------------------------------------------- @@ -142,12 +142,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -170,11 +170,11 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia ::osl::Module aOleDlgLib; - if( !aOleDlgLib.load( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "oledlg" ) ) )) + if( !aOleDlgLib.load( ::rtl::OUString( "oledlg" ) )) throw uno::RuntimeException(); OleUIInsertObjectA_Type * pInsertFct = (OleUIInsertObjectA_Type *) - aOleDlgLib.getSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OleUIInsertObjectA" ) )); + aOleDlgLib.getSymbol( ::rtl::OUString( "OleUIInsertObjectA" )); if( !pInsertFct ) throw uno::RuntimeException(); @@ -214,7 +214,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia throw uno::RuntimeException(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aMediaDescr[0].Name = ::rtl::OUString( "URL" ); aMediaDescr[0].Value <<= aFileURL; // TODO: use config helper for type detection @@ -253,13 +253,13 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia { datatransfer::DataFlavor aFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Image WMF" )), + ::rtl::OUString( "Image WMF" ), getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) ); aObjectInfo.Options.realloc( 2 ); - aObjectInfo.Options[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Icon" )); + aObjectInfo.Options[0].Name = ::rtl::OUString( "Icon" ); aObjectInfo.Options[0].Value <<= aMetafile; - aObjectInfo.Options[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IconFormat" )); + aObjectInfo.Options[1].Name = ::rtl::OUString( "IconFormat" ); aObjectInfo.Options[1].Value <<= aFlavor; } @@ -294,12 +294,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntryName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 2d5b35a0863f..558092573d71 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -39,15 +39,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLEEmbeddedObjectFactory")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory")); + aRet[0] = ::rtl::OUString("com.sun.star.embed.OLEEmbeddedObjectFactory"); + aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory")); + return ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -72,12 +72,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -144,12 +144,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -186,12 +186,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitNew" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -227,13 +227,13 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceLink" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -274,12 +274,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )), + throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index ab21864711c6..d1d55a9ed520 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -62,9 +62,9 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Reference< registry::XRegistryKey > xNewKey; - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + xNewKey = xKey->createKey( ::rtl::OUString("/") + UNOMainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); + ::rtl::OUString( "/UNO/SERVICES") ); uno::Sequence< ::rtl::OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames(); for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index 33f98dc272d7..7ef94d2cf6df 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -76,17 +76,17 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Sequence< ::rtl::OUString > rServices; sal_Int32 ind = 0; - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + xNewKey = xKey->createKey( ::rtl::OUString("/") + MainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); + ::rtl::OUString( "/UNO/SERVICES") ); rServices = MainThreadExecutor::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + xNewKey = xKey->createKey( ::rtl::OUString("/") + VCLBitmapCreator::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); + ::rtl::OUString( "/UNO/SERVICES") ); rServices = VCLBitmapCreator::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index acd4d57ec440..d78d01702e17 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -120,24 +120,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aAny <<= uno::Reference<uno::XInterface>( m_xDocument, uno::UNO_QUERY); aSeq[0] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Model")), + rtl::OUString("Model"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= sal_False; aSeq[1] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("ReadOnly")), + rtl::OUString("ReadOnly"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= (sal_Bool) sal_True; aSeq[2] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")), + rtl::OUString("NoAutoSave"), -1, aAny, beans::PropertyState_DIRECT_VALUE); @@ -147,8 +144,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aSeq.realloc( ++nLen ); aAny <<= (sal_Int16) 3; aSeq[nLen-1] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("PluginMode")), + rtl::OUString("PluginMode"), -1, aAny, beans::PropertyState_DIRECT_VALUE); @@ -157,24 +153,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aSeq.realloc( nLen+=2 ); aAny <<= xHandler; aSeq[nLen-2] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")), + rtl::OUString("InteractionHandler"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= m_nMacroExecMode; aSeq[nLen-1] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")), + rtl::OUString("MacroExecutionMode"), -1, aAny, beans::PropertyState_DIRECT_VALUE); xComponentLoader->loadComponentFromURL( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("private:object")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), + rtl::OUString("private:object"), + rtl::OUString("_self"), 0, aSeq); @@ -375,7 +368,7 @@ HRESULT DocumentHolder::InPlaceActivate( if( xPS.is() ) { aAny = xPS->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))); + rtl::OUString("LayoutManager")); aAny >>= m_xLayoutManager; } @@ -392,8 +385,8 @@ HRESULT DocumentHolder::InPlaceActivate( if(m_xLayoutManager.is()) { uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl( m_xLayoutManager->getElement( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "private:resource/menubar/menubar")))); + rtl::OUString( + "private:resource/menubar/menubar"))); OSL_ENSURE(xUIEl.is(),"no menubar"); uno::Reference<awt::XSystemDependentMenuPeer> xSDMP( xUIEl->getRealInterface(), @@ -405,8 +398,7 @@ HRESULT DocumentHolder::InPlaceActivate( m_nMenuHandle = HMENU(tmp); m_xLayoutManager->hideElement( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "private:resource/menubar/menubar" ))); + "private:resource/menubar/menubar" )); } } @@ -744,7 +736,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s { // set the document mode to embedded uno::Sequence< beans::PropertyValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" )); + aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; m_xDocument->attachResource(::rtl::OUString(),aSeq); } @@ -805,7 +797,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame() // this is so only for outplace activation if( xFrame.is() ) m_xFrame = xFrame->findFrame( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")),0); + rtl::OUString("_blank"),0); uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xFrame, uno::UNO_QUERY ); @@ -881,11 +873,11 @@ void DocumentHolder::show() if ( xProps.is() ) { uno::Reference< frame::XLayoutManager > xLayoutManager; - xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ) >>= xLayoutManager; + xProps->getPropertyValue( rtl::OUString( "LayoutManager" ) ) >>= xLayoutManager; uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY ); if ( xLMProps.is() ) { - xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MenuBarCloser" )), + xLMProps->setPropertyValue( ::rtl::OUString( "MenuBarCloser" ), uno::makeAny( uno::Reference< frame::XStatusListener >() ) ); } } @@ -981,8 +973,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) for(sal_Int32 j = 0; j < aSeq.getLength(); ++j) { if(aSeq[j].Name == - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("FilterName"))) + rtl::OUString("FilterName")) { aSeq[j].Value >>= aFilterName; break; @@ -994,8 +985,8 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) { uno::Reference<container::XNameAccess> xNameAccess( m_xFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.document.FilterFactory"))), + rtl::OUString( + "com.sun.star.document.FilterFactory")), uno::UNO_QUERY); try { if(xNameAccess.is() && @@ -1003,8 +994,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) { for(sal_Int32 j = 0; j < aSeq.getLength(); ++j) if(aSeq[j].Name == - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("UIName"))) + rtl::OUString("UIName")) { aSeq[j].Value >>= m_aFilterName; break; @@ -1031,7 +1021,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) aAny <<= aTotalName; try { xPropSet->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), + rtl::OUString("Title"), aAny); } catch( const uno::Exception& ) { diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index c62f6eae8cbe..d76d3aa3bc65 100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx @@ -49,13 +49,13 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta ) { aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) ); - aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enhanced Windows MetaFile" ) ); + aFlavor.HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); } else { aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) ); - aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Windows GDIMetaFile" ) ); + aFlavor.HumanPresentableName = ::rtl::OUString( "Windows GDIMetaFile" ); } aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 ); diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 3ff0ab75b390..aad96c614439 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -206,19 +206,19 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp uno::Sequence< beans::PropertyValue > aArgs( 3 ); sal_Int32 nInd = 0; // must not be bigger than the preset size - aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) ); + aArgs[nInd].Name = ::rtl::OUString( "FilterName" ); aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) ); + aArgs[nInd].Name = ::rtl::OUString( "InputStream" ); aArgs[nInd++].Value <<= xStream; - aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) ); - aArgs[nInd++].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) ); + aArgs[nInd].Name = ::rtl::OUString( "URL" ); + aArgs[nInd++].Value <<= ::rtl::OUString( "private:stream" ); } else { - aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) ); + aArgs[nInd].Name = ::rtl::OUString( "URL" ); rtl::OUString sDocUrl; if ( pFilePath ) @@ -237,7 +237,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp aArgs.realloc( nInd ); - // aArgs[].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ReadOnly" ) ); + // aArgs[].Name = ::rtl::OUString( "ReadOnly" ); // aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False ); return aArgs; @@ -247,12 +247,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp { uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) ); + aArgs[0].Name = ::rtl::OUString( "FilterName" ); aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) ); + aArgs[1].Name = ::rtl::OUString( "OutputStream" ); aArgs[1].Value <<= xStream; } @@ -631,7 +631,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad ) { try { - xStorable->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) ), + xStorable->storeToURL( ::rtl::OUString( "private:stream" ), fillArgsForStoring_Impl( xTempOut ) ); hr = copyXTempOutToIStream( xTempOut, pTargetStream ); if ( SUCCEEDED( hr ) ) diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx index b7520cd51552..6827d650db4e 100644 --- a/embedserv/source/embed/guid.cxx +++ b/embedserv/source/embed/guid.cxx @@ -27,34 +27,34 @@ ::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarWriterDocument.6" ) ); + return ::rtl::OUString( "soffice.StarWriterDocument.6" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.WriterDocument.1" ) ); + return ::rtl::OUString( "LibreOffice.WriterDocument.1" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarCalcDocument.6" ) ); + return ::rtl::OUString( "soffice.StarCalcDocument.6" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.CalcDocument.1" ) ); + return ::rtl::OUString( "LibreOffice.CalcDocument.1" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarDrawDocument.6" ) ); + return ::rtl::OUString( "soffice.StarDrawDocument.6" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.DrawDocument.1" ) ); + return ::rtl::OUString( "LibreOffice.DrawDocument.1" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarImpressDocument.6" ) ); + return ::rtl::OUString( "soffice.StarImpressDocument.6" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.ImpressDocument.1" ) ); + return ::rtl::OUString( "LibreOffice.ImpressDocument.1" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarMathDocument.6" ) ); + return ::rtl::OUString( "soffice.StarMathDocument.6" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.MathDocument.1" ) ); + return ::rtl::OUString( "LibreOffice.MathDocument.1" ); return ::rtl::OUString(); } @@ -62,34 +62,34 @@ ::rtl::OUString getServiceNameFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); return ::rtl::OUString(); } @@ -100,31 +100,31 @@ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer8" ) ); + return ::rtl::OUString( "writer8" ); if ( *guid == OID_CalcServer ) return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "calc8" ) ); + return ::rtl::OUString( "calc8" ); if ( *guid == OID_DrawingServer ) return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw8" ) ); + return ::rtl::OUString( "draw8" ); if ( *guid == OID_PresentationServer ) return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "impress8" ) ); + return ::rtl::OUString( "impress8" ); if ( *guid == OID_MathServer ) return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "math8" ) ); + return ::rtl::OUString( "math8" ); return ::rtl::OUString(); } @@ -132,34 +132,34 @@ ::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxw" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxw" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odt" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.odt" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxc" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxc" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.ods" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.ods" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxd" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxd" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odg" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.odg" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxi" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxi" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odp" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.odp" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxm" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxm" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odf" ) ); + return ::rtl::OUString( "file:///d:/OLE_TEST/test.odf" ); return ::rtl::OUString(); } diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index e048eecf1446..e617ca1f3eb9 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -127,18 +127,12 @@ Interceptor::Interceptor( m_pDisposeEventListeners(0), m_bLink( bLink ) { - m_aInterceptedURL[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); - m_aInterceptedURL[1] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll")); - m_aInterceptedURL[2] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - m_aInterceptedURL[3] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); - m_aInterceptedURL[4] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[5] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); + m_aInterceptedURL[0] = rtl::OUString(".uno:Save"); + m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll"); + m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc"); + m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin"); + m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame"); + m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs"); } @@ -215,12 +209,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" )); + aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" ); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 ); + URL, ::rtl::OUString( "_self" ), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } @@ -266,8 +260,7 @@ void Interceptor::generateFeatureStateEvent() { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Update")); + aStateEvent.FeatureDescriptor = rtl::OUString("Update"); aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + aTitle); @@ -276,16 +269,14 @@ void Interceptor::generateFeatureStateEvent() else if ( i == 5 ) { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo")); + aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); } else { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Close and Return")); + aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + aTitle); @@ -334,8 +325,7 @@ Interceptor::addStatusListener( frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Update")); + aStateEvent.FeatureDescriptor = rtl::OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( @@ -375,8 +365,7 @@ Interceptor::addStatusListener( frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Close and Return")); + aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( @@ -400,8 +389,7 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo")); + aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index 1ce0a67b5350..1a58ad5f8b94 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -45,14 +45,14 @@ throw (uno::Exception) ::rtl::OUString SAL_CALL EmbedServer_getImplementationName() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.EmbedServer") ); + return ::rtl::OUString("com.sun.star.comp.ole.EmbedServer"); } uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw() { uno::Sequence< ::rtl::OUString > aServiceNames( 1 ); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OleEmbeddedServerRegistration" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.document.OleEmbeddedServerRegistration" ); return aServiceNames; } diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 7d5195075ba0..5459bc5a3b5c 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -84,7 +84,7 @@ protected: deployment::UpdateInformationEntry aEntry; if ( aUpdateInfoEnumeration->nextElement() >>= aEntry ) { - CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "description" ) ) ); + CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( "description" ) ); uno::Reference< dom::XNodeList> xChildNodes = aEntry.UpdateDocument->getChildNodes(); CPPUNIT_ASSERT( xChildNodes.is() ); @@ -104,8 +104,8 @@ protected: //uno::Reference< dom::XElement > xChildId( xChildNodes->item( 0 ), uno::UNO_QUERY ); //CPPUNIT_ASSERT( xChildId.is() ); - //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LibreOffice_3.4" ) ) ); - //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test" ) ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); + //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( "LibreOffice_3.4" ) ); + //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); //fprintf( stderr, "Value == %s\n", rtl::OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); // TODO check more deeply } @@ -120,14 +120,14 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ), + rtl::OUString( "Linux" ), + rtl::OUString( "x86" ), m_aRepositoryList, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "111111-222222-333333-444444" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) ) + rtl::OUString( "111111-222222-333333-444444" ), + rtl::OUString( "InstallSetID" ) ) ) { CPPUNIT_ASSERT( aInfo.Sources.size() == 1 ); - CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.libreoffice.org/download/" ) ) ); + CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( "http://www.libreoffice.org/download/" ) ); } else CPPUNIT_FAIL( "Calling checkForUpdates() failed." ); @@ -140,11 +140,11 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ), + rtl::OUString( "Linux" ), + rtl::OUString( "x86" ), m_aRepositoryList, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "123456-abcdef-1a2b3c-4d5e6f" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) ) + rtl::OUString( "123456-abcdef-1a2b3c-4d5e6f" ), + rtl::OUString( "InstallSetID" ) ) ) { CPPUNIT_ASSERT( aInfo.Sources.empty() ); } diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 003f70bb4736..87bf790b5a80 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -67,8 +67,8 @@ namespace abp try { // the service name of the administration dialog - const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatasourceAdministrationDialog")); - const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceTypeChangeDialog")); + const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); + const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); // the parameters for the call Sequence< Any > aArguments(3); @@ -76,14 +76,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index ca82fb997aef..25d1d12d1b9d 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -125,7 +125,7 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )), + ::rtl::OUString( "URL" ), makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) ) ); } diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index c872943400d6..d0af8438ccf2 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -104,7 +104,7 @@ namespace abp #ifdef DBG_UTIL sal_Bool bSuccess = #endif - xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping; + xDialogProps->getPropertyValue( ::rtl::OUString( "FieldMapping" ) ) >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -170,7 +170,7 @@ namespace abp // access the configuration information which the driver uses for determining it's column names ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); - sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" )); + sDriverAliasesNodeName += ::rtl::OUString( "/ColumnAliases" ); // create a config node for this OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithComponentContext( @@ -230,7 +230,7 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) ); + OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString( "Fields" ) ); // loop through all existent fields Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames(); @@ -307,9 +307,9 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString( "DataSourceName" ), makeAny( _rDataSourceName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString( "Command" ), makeAny( _rTableName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); // commit the changes done aAddressBookSettings.commit(); @@ -326,7 +326,7 @@ namespace abp _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); // set the flag - aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); // commit the changes done aAddressBookSettings.commit(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index d57fef8eef09..34563504581b 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -100,7 +100,7 @@ namespace abp try { // check whether Evolution is available - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:evolution:local")) ); if ( xDriver.is() ) bHaveEvolution = true; } @@ -111,7 +111,7 @@ namespace abp // check whether KDE address book is available try { - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab"))) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:kab")) ); if ( xDriver.is() ) bHaveKab = true; } @@ -122,7 +122,7 @@ namespace abp try { // check whether Mac OS X address book is available - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab"))) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:macab")) ); if ( xDriver.is() ) bHaveMacab = true; } diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 797bae2b9050..f6799253653a 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -47,7 +47,7 @@ namespace abp OABSPilotUno::OABSPilotUno(const Reference< XMultiServiceFactory >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , + registerProperty( ::rtl::OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) ); } @@ -110,7 +110,7 @@ namespace abp //--------------------------------------------------------------------- ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot")); + return ::rtl::OUString("org.openoffice.comp.abp.OAddressBookSourcePilot"); } //--------------------------------------------------------------------- @@ -123,7 +123,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"); return aSupported; } @@ -179,7 +179,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); + lProtocol[0].Name = ::rtl::OUString("Deactivate"); lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 15a510e71bd6..4a9f607eaec2 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -318,7 +318,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: { try { - Any a = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + Any a = xPropSet->getPropertyValue( OUString( "LayoutManager" )); a >>= xLayoutManager; } catch ( const uno::Exception& ) @@ -327,7 +327,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: } if ( xLayoutManager.is() ) - xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ))); + xLayoutManager->createElement( OUString( "private:resource/menubar/menubar" )); } BibDataManager* BibliographyLoader::GetDataManager()const diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 60450e199794..9891fe077fff 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -915,7 +915,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); ::rtl::OUString aString("SELECT * FROM "); @@ -1075,7 +1075,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) aPropertySet->setPropertyValue("ActiveConnection", aVal); Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); if(xOldConnection.is()) xOldConnection->dispose(); @@ -1168,7 +1168,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); ::rtl::OUString aString("SELECT * FROM "); @@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName); xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) ); - xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeWidgetLook" ) ), makeAny( (sal_Bool)sal_True ) ); + xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) ); Reference< XFormComponent > aFormComp(xModel,UNO_QUERY ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 26925ebaea65..9dfd994a031b 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -204,7 +204,7 @@ BibFrameController_Impl::~BibFrameController_Impl() ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography")); + return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography"); } sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) @@ -217,7 +217,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography")); + lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography"); return lNames; } diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 4ca43379e4e7..cc1992b2229e 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -249,8 +249,7 @@ void LdapConnection::initConnection() if (aUser.isEmpty()) { throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM - ("LdapConnection::findUserDn -User id is empty")), + rtl::OUString("LdapConnection::findUserDn -User id is empty"), NULL, 0) ; } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 88cb1b316172..b3b2fdc0d07e 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -61,7 +61,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex xContext, &aDefinition, &loggedOnUser)) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")), + rtl::OUString("LdapUserProfileBe- LDAP not configured"), NULL); } @@ -107,7 +107,7 @@ bool LdapUserProfileBe::readLdapConfiguration( uno::Reference< lang::XMultiServiceFactory > xCfgProvider( css::configuration::theDefaultProvider::get(context)); - css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(rtl::OUString("nodepath"), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -177,8 +177,7 @@ void LdapUserProfileBe::setPropertyValue( css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } @@ -213,7 +212,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( //------------------------------------------------------------------------------ rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe")); + return rtl::OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } //------------------------------------------------------------------------------ @@ -227,7 +226,7 @@ rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) { uno::Sequence<rtl::OUString> aServices(1) ; - aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LdapUserProfileBe")) ; + aServices[0] = rtl::OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; return aServices ; } //------------------------------------------------------------------------------ diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index bb4716e33abb..ce57a349cda5 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -300,14 +300,14 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.ConsoleHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.ConsoleHandler" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.ConsoleHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 26dfc9de8636..704b4527e0ff 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -108,8 +108,8 @@ namespace logging namespace { const sal_Unicode quote_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); - const sal_Unicode comma_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")).toChar(); - const ::rtl::OUString dos_newline = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n")); + const sal_Unicode comma_char = ::rtl::OUString(",").toChar(); + const ::rtl::OUString dos_newline = ::rtl::OUString("\r\n"); inline bool needsQuoting(const ::rtl::OUString& str) { @@ -150,7 +150,7 @@ namespace ::com::sun::star::uno::Sequence< ::rtl::OUString> initialColumns() { com::sun::star::uno::Sequence< ::rtl::OUString> result = ::com::sun::star::uno::Sequence< ::rtl::OUString>(1); - result[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("message")); + result[0] = ::rtl::OUString("message"); return result; }; } @@ -341,13 +341,13 @@ namespace logging ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.CsvFormatter" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.CsvFormatter" ); } Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.CsvFormatter" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.CsvFormatter" ); return aServiceNames; } diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 845bb1e1b3bd..8c56f74ecb95 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -402,14 +402,14 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL FileHandler::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FileHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.FileHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.FileHandler" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.FileHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 8052d618d69f..7e120e878e70 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -285,7 +285,7 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EventLogger" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.EventLogger" ); } //-------------------------------------------------------------------- @@ -298,7 +298,7 @@ namespace logging Sequence< ::rtl::OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.Logger" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.Logger" ); return aServiceNames; } @@ -332,7 +332,7 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL LoggerPool::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.LoggerPool" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.LoggerPool" ); } //-------------------------------------------------------------------- @@ -346,7 +346,7 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString LoggerPool::getSingletonName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.LoggerPool" ) ); + return ::rtl::OUString( "com.sun.star.logging.LoggerPool" ); } //-------------------------------------------------------------------- @@ -375,7 +375,7 @@ namespace logging //-------------------------------------------------------------------- Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException) { - return getNamedLogger( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.logging.DefaultLogger" ) ) ); + return getNamedLogger( ::rtl::OUString( "org.openoffice.logging.DefaultLogger" ) ); } //-------------------------------------------------------------------- diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 8c4e08a33fa0..609742b891ec 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -209,11 +209,11 @@ namespace logging // write access to the "Settings" node (which includes settings for all loggers) Sequence< Any > aArguments(1); aArguments[0] <<= NamedValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), - makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Logging/Settings" ) ) ) + ::rtl::OUString( "nodepath" ), + makeAny( ::rtl::OUString( "/org.openoffice.Office.Logging/Settings" ) ) ); Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ), + ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), aArguments ), UNO_QUERY_THROW ); @@ -233,7 +233,7 @@ namespace logging // the log level sal_Int32 nLogLevel( LogLevel::OFF ); - OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LogLevel" ) ) ) >>= nLogLevel ); + OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( "LogLevel" ) ) >>= nLogLevel ); _rxLogger->setLevel( nLogLevel ); // the default handler, if any diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index dcba3ba995b2..716be61967a5 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -83,10 +83,10 @@ namespace logging m_rMutex.acquire(); if ( !getIsInitialized() ) - throw DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "component not initialized" ) ), NULL ); + throw DisposedException( ::rtl::OUString( "component not initialized" ), NULL ); if ( m_rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "component already disposed" ) ), NULL ); + throw DisposedException( ::rtl::OUString( "component already disposed" ), NULL ); // fallback settings, in case they weren't passed at construction time if ( !getFormatter().is() ) diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index b23aed57b816..239705003bc4 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -186,14 +186,14 @@ namespace logging //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName_static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.PlainTextFormatter" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.PlainTextFormatter" ) ); + aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.PlainTextFormatter" ); return aServiceNames; } diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 37a9f523b688..c244a07c12a3 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -175,7 +175,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )), + mxRemoteMSF->createInstance( ::rtl::OUString("com.sun.star.frame.Frame")), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -191,9 +191,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps; + xFrameProps->getPropertyValue( ::rtl::OUString("LayoutManager") ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( ::rtl::OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); } catch( const uno::Exception& ) {} @@ -233,11 +233,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // prepare to load document debug_fprintf(NSP_LOG_APPEND, "try to load document\n"); Sequence< ::com::sun::star::beans::PropertyValue > setPropValues(3); - setPropValues[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") ); + setPropValues[0].Name = OUString("ViewOnly"); setPropValues[0].Value <<= sal_True; - setPropValues[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ); + setPropValues[1].Name = OUString("ReadOnly"); setPropValues[1].Value <<= sal_True; - setPropValues[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); + setPropValues[2].Name = OUString("InputStream"); setPropValues[2].Value <<= xInputStream; /* setPropValues[ 3 ].Name = "FilterName"; @@ -249,11 +249,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // load document Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3); - setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") ); + setPropValues2[0].Name = OUString("ViewOnly"); setPropValues2[0].Value <<= sal_True; - setPropValues2[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ); + setPropValues2[1].Name = OUString("ReadOnly"); setPropValues2[1].Value <<= sal_True; - setPropValues2[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("AsTemplate") ); + setPropValues2[2].Name = OUString("AsTemplate"); setPropValues2[2].Value <<= sal_False; m_xComponent = xLoader->loadComponentFromURL( m_sURL, @@ -290,10 +290,10 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) //try to enable toolbar and tool windows Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); - propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") ); + propertyValue[0].Name = OUString("FunctionBarVisible"); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")), + ::rtl::OUString(".uno:FunctionBarVisible"), m_xFrame->getName(), 0, propertyValue ); @@ -309,7 +309,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) uno::Reference< presentation::XPresentationSupplier > xPresSuppl( m_xComponent, uno::UNO_QUERY_THROW ); uno::Reference< presentation::XPresentation > xPres( xPresSuppl->getPresentation(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xPresSuppl->getPresentation(), uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( ::rtl::OUString( "IsFullScreen" ), uno::makeAny( sal_False ) ); xPres->start(); } catch( const uno::Exception& ) @@ -400,7 +400,7 @@ sal_Bool SoPluginInstance::Destroy(void) aArgs[0] <<= m_xFrame; uno::Reference< lang::XComponent > xDocumentCloser( mxRemoteMSF->createInstanceWithArguments( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.DocumentCloser" ) ), + ::rtl::OUString( "com.sun.star.embed.DocumentCloser" ), aArgs ), uno::UNO_QUERY_THROW ); @@ -441,7 +441,7 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")), + ::rtl::OUString(".uno:PrintDefault"), m_xFrame->getName(), 0, propertyValue ); return sal_True; diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 8710478b9229..2814850ff221 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -408,15 +408,15 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )) ; break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::UNKNOWN, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_UNKNOWNINTERFACE: @@ -426,7 +426,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -489,7 +489,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( pInfo && m_sTypeName.getLength() == 0 ) { - m_sTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ); + m_sTypeName = rtl::OUString("IDispatch"); CComBSTR sName; if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) @@ -506,7 +506,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); - m_sTypeName = sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sTmp ); + m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp ); } } @@ -1177,7 +1177,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } if( !bConvRet) // conversion of return or out parameter failed - throw CannotConvertException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Call to COM object failed. Conversion of return or out value failed")), + throw CannotConvertException( rtl::OUString("Call to COM object failed. Conversion of return or out value failed"), Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY ), TypeClass_UNKNOWN, FailReason::UNKNOWN, 0);// lookup error code // conversion of return or out parameter failed @@ -1201,15 +1201,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw IllegalArgumentException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr); break; case DISP_E_UNKNOWNINTERFACE: @@ -1219,7 +1219,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw RuntimeException() ; break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>( + throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -1528,7 +1528,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")), + throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; @@ -2160,7 +2160,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")), + throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 4aa61c85a551..66333dd0f820 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -78,28 +78,28 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFacto if (pServiceManager && aImplName.equals( reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverter2") )) { xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverter2")), + OUString("com.sun.star.comp.ole.OleConverter2"), ConverterProvider_CreateInstance2, seqServiceNames, &globalModuleCount.modCnt ); } else if (pServiceManager && aImplName.equals( reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverterVar1") )) { xFactory= createSingleFactory( reinterpret_cast<XMultiServiceFactory*>(pServiceManager), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverterVar1")), + OUString("com.sun.star.comp.ole.OleConverterVar1"), ConverterProvider_CreateInstanceVar1, seqServiceNames, &globalModuleCount.modCnt ); } else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleClient"))) { xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleClient")), + OUString("com.sun.star.comp.ole.OleClient"), OleClient_CreateInstance, seqServiceNames, &globalModuleCount.modCnt); } else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleServer"))) { xFactory= createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleServer")), + OUString("com.sun.star.comp.ole.OleServer"), OleServer_CreateInstance, seqServiceNames, &globalModuleCount.modCnt); } diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index e50853d9296f..6e10027b8053 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -315,7 +315,7 @@ public: static rtl::OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginManager" )); + return rtl::OUString( "com.sun.star.extensions.PluginManager" ); } }; Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index f0acad737e14..c315b298118b 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -105,7 +105,7 @@ class PluginModel : public BroadcasterHelperHolder, static rtl::OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginModel" )); + return rtl::OUString( "com.sun.star.extensions.PluginModel" ); } // OPropertySetHelper diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 023cd4e0716c..d399925c3c59 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -411,7 +411,7 @@ namespace pcr Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); Sequence< PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMediaProperties[0].Name = ::rtl::OUString( "URL" ); aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index a0a910612df7..bef8d73f25bb 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -53,7 +53,7 @@ namespace pcr DBG_CTOR( ButtonNavigationHandler, NULL ); m_aContext.createComponent( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.FormComponentPropertyHandler" ) ), + ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), m_xSlaveHandler ); if ( !m_xSlaveHandler.is() ) throw RuntimeException(); @@ -68,14 +68,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.ButtonNavigationHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.ButtonNavigationHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); return aSupported; } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index aeaf6b47d2db..4162df9970b1 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -63,14 +63,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.CellBindingPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); return aSupported; } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 6eb58e3a35b3..f31ca74a7c0a 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -66,14 +66,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EditPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.EditPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); return aSupported; } @@ -285,7 +285,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE ); - _rxInspectorUI->showCategory( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ), nTextType != TEXTTYPE_RICHTEXT ); + _rxInspectorUI->showCategory( ::rtl::OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index fd26dde08c83..848f6f52c47e 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -74,14 +74,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EFormsPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); return aSupported; } @@ -468,7 +468,7 @@ namespace pcr } aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ); + aDescriptor.Category = ::rtl::OUString( "Data" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } @@ -512,15 +512,15 @@ namespace pcr if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormModel" ) ), makeAny( xModel ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Binding" ) ), makeAny( xBinding ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FacetName" ) ), makeAny( sFacetName ) ); + xDialogProps->setPropertyValue( ::rtl::OUString( "FormModel" ), makeAny( xModel ) ); + xDialogProps->setPropertyValue( ::rtl::OUString( "Binding" ), makeAny( xBinding ) ); + xDialogProps->setPropertyValue( ::rtl::OUString( "FacetName" ), makeAny( sFacetName ) ); if ( !xDialog->execute() ) // cancelled return InteractiveSelectionResult_Cancelled; - _rData = xDialogProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConditionValue" ) ) ); + _rData = xDialogProps->getPropertyValue( ::rtl::OUString( "ConditionValue" ) ); return InteractiveSelectionResult_ObtainedValue; } catch( const Exception& ) diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index ebd18a1885a9..00878035854b 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -315,14 +315,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FormGeometryHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.FormGeometryHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); return aSupported; } @@ -601,7 +601,7 @@ namespace pcr if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) ) return false; Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW ); - if ( xSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Shape" ) ) ) ) + if ( xSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.Shape" ) ) ) return true; } catch( const Exception& ) diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index d38b2475e50f..cefae712007f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -518,7 +518,7 @@ namespace pcr { xKeys->getByIndex( key ) >>= xKey; sal_Int32 nKeyType = 0; - xKey->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= nKeyType; + xKey->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nKeyType; if ( nKeyType != KeyType::FOREIGN ) continue; @@ -542,7 +542,7 @@ namespace pcr if ( xKeyColumn.is() ) { xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName; - xKeyColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelatedColumn" ) ) ) >>= sRelatedColumnName; + xKeyColumn->getPropertyValue( ::rtl::OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; _rLeftFields[ column ] = sColumnName; _rRightFields[ column ] = sRelatedColumnName; diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 134c3c7af3f3..703c0985c9a2 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -103,7 +103,7 @@ namespace pcr if ( _rxContext.is() ) { Reference< XHierarchicalNameAccess > xTypeDescProv( - _rxContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) ), + _rxContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), UNO_QUERY_THROW ); m_xTypeDescription = Reference< XEnumTypeDescription >( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW ); @@ -283,14 +283,14 @@ namespace pcr void UrlClickHandler::impl_dispatch_throw( const ::rtl::OUString& _rURL ) { Reference< XURLTransformer > xTransformer( URLTransformer::create(m_aContext.getUNOContext()) ); - URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenHyperlink" ) ); + URL aURL; aURL.Complete = ::rtl::OUString( ".uno:OpenHyperlink" ); xTransformer->parseStrict( aURL ); Reference< XDesktop2 > xDispProv = Desktop::create( m_aContext.getUNOContext() ); Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, ::rtl::OUString(), 0 ), UNO_QUERY_THROW ); Sequence< PropertyValue > aDispatchArgs(1); - aDispatchArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aDispatchArgs[0].Name = ::rtl::OUString("URL"); aDispatchArgs[0].Value <<= _rURL; xDispatch->dispatch( aURL, aDispatchArgs ); @@ -340,14 +340,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.GenericPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.GenericPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); return aSupported; } @@ -380,7 +380,7 @@ namespace pcr Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) ); if ( !xIntrospectionAccess.is() ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The introspection service could not handle the given component." ) ), *this ); + throw RuntimeException( ::rtl::OUString( "The introspection service could not handle the given component." ), *this ); m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW ); // now that we survived so far, remember m_xComponentIntrospectionAccess @@ -667,7 +667,7 @@ namespace pcr if ( !aDescriptor.Control.is() ) PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory ); - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) ); + aDescriptor.Category = ::rtl::OUString( "General" ); return aDescriptor; } diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index d346b16f4e81..05ac138abb86 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -99,25 +99,25 @@ namespace pcr ,m_bIsReadOnly( sal_False ) { registerProperty( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasHelpSection" ) ), + ::rtl::OUString( "HasHelpSection" ), MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, &m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection ) ); registerProperty( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MinHelpTextLines" ) ), + ::rtl::OUString( "MinHelpTextLines" ), MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines ) ); registerProperty( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxHelpTextLines" ) ), + ::rtl::OUString( "MaxHelpTextLines" ), MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines ) ); registerProperty( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), + ::rtl::OUString( "IsReadOnly" ), MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, &m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly ) diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 61f116a90e93..287ba8b2cb2b 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -170,7 +170,7 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.extensions.ObjectInspectorModel" ) ); + return ::rtl::OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } //-------------------------------------------------------------------- @@ -190,7 +190,7 @@ namespace pcr void ObjectInspectorModel::createDefault() { m_aFactories.realloc( 1 ); - m_aFactories[0] <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.GenericPropertyHandler" ) ); + m_aFactories[0] <<= ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 54a50c0476ba..4da3b9426245 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -219,9 +219,9 @@ namespace pcr aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ); + aDescriptor.Category = ::rtl::OUString( "Data" ); else - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) ); + aDescriptor.Category = ::rtl::OUString( "General" ); return aDescriptor; } @@ -379,28 +379,28 @@ namespace pcr ::rtl::OUString sConfigurationProperty; if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.WriterWeb/Layout/Other" ) ); - sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MeasureUnit" ) ); + sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); + sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Writer/Layout/Other" ) ); - sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MeasureUnit" ) ); + sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Writer/Layout/Other" ); + sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) ) { // calc - sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ) ); - sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) ); + sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); + sConfigurationProperty = ::rtl::OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ) ); - sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) ); + sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); + sConfigurationProperty = ::rtl::OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ) ); - sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) ); + sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); + sConfigurationProperty = ::rtl::OUString( "Metric" ); } // read the measurement unit from the configuration diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index c419ec7f8ee6..bff49b1b3d0c 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -244,12 +244,12 @@ namespace pcr aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING; aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing(); - aArgs[4].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicalDesign" ) ); + aArgs[4].Name = ::rtl::OUString( "GraphicalDesign" ); aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/QueryDesign" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ), + ::rtl::OUString( ".component:DB/QueryDesign" ), + ::rtl::OUString( "_self" ), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -296,7 +296,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW ); - xFrame = xDesktop->findFrame( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( ::rtl::OUString( "_blank" ), FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -330,11 +330,11 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc" ) ), + const UnoURL aCloseURL( ::rtl::OUString( ".uno:CloseDoc" ), Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_top" ) ), FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( "_top" ), FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index eb01b058d209..b90a4a11b4dc 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -466,7 +466,7 @@ namespace pcr //------------------------------------------------------------------ IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ ) { - ActionEvent aEvent( *this, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "clicked" ) ) ); + ActionEvent aEvent( *this, ::rtl::OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( boost::bind( &XActionListener::actionPerformed, diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 5772daa67106..394ad17454c7 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -240,7 +240,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & if ( m_xContext.is() ) { uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv( - m_xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) ), + m_xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), uno::UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW ); @@ -600,15 +600,15 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ namespace comp_StringRepresentation { ::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "StringRepresentation")); + return ::rtl::OUString( + "StringRepresentation"); } uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() { uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.inspection.StringRepresentation")); + s[0] = ::rtl::OUString( + "com.sun.star.inspection.StringRepresentation"); return s; } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 5612e18bf07c..1dd05f7b962b 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -106,14 +106,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.SubmissionPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); return aSupported; } @@ -312,7 +312,7 @@ namespace pcr LineDescriptor aDescriptor; aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) ); + aDescriptor.Category = ::rtl::OUString( "General" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 83bd64d60a9a..8b7e0e98a4e9 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -243,7 +243,7 @@ namespace pcr { Reference< XTabController > xTabController; if ( m_xORB.is() ) - xTabController = xTabController.query( m_xORB->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ) ) ); + xTabController = xTabController.query( m_xORB->createInstance( ::rtl::OUString( "com.sun.star.form.FormController" ) ) ); DBG_ASSERT( xTabController.is(), "TabOrderDialog::AutoOrderClickHdl: could not instantiate a tab controller!" ); if ( !xTabController.is() ) return 0; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 346ff55d5698..be9ec1e83fff 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -88,14 +88,14 @@ namespace pcr //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ) ); + return ::rtl::OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ) ); + aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); return aSupported; } @@ -323,8 +323,8 @@ namespace pcr aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; - aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonplus.png" ) ); - aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonminus.png" ) ); + aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); + aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); break; case PROPERTY_ID_XSD_WHITESPACES: @@ -419,7 +419,7 @@ namespace pcr break; } - aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ); + aDescriptor.Category = ::rtl::OUString( "Data" ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 66c263df941c..c9b9a581b36e 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -122,7 +122,7 @@ Reference<XInterface> initResourceIndexAccess(ResourceIndexAccess* pResourceInde // and will crash on getByIndex calls, better just give back an empty Reference // so that such ResourceStringIndexAccess instances are never release into the wild throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager could not get initialized")), + OUString("resource manager could not get initialized"), /* xResult */ Reference<XInterface>()); return xResult; } @@ -153,8 +153,8 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( ) if( aResult.getLength() == 0) { aResult.realloc(2); - aResult[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("String")); - aResult[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("StringList")); + aResult[0] = OUString("String"); + aResult[1] = OUString("StringList"); } return aResult; } @@ -174,7 +174,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) SolarMutexGuard aGuard; if(!m_pResMgr.get()) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager not available")), + OUString("resource manager not available"), Reference<XInterface>()); const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr); @@ -182,7 +182,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) if(!m_pResMgr->IsAvailable(aId)) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("string resource for id not available")), + OUString("string resource for id not available"), Reference<XInterface>()); return makeAny(OUString(String(aId))); @@ -197,14 +197,14 @@ Any SAL_CALL ResourceStringListIndexAccess::getByIndex(sal_Int32 nIdx) if(!m_pResMgr.get()) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager not available")), + OUString("resource manager not available"), Reference<XInterface>()); const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr); aId.SetRT(RSC_STRINGARRAY); if(!m_pResMgr->IsAvailable(aId)) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("string list resource for id not available")), + OUString("string list resource for id not available"), Reference<XInterface>()); const ResStringArray aStringList(aId); Sequence<PropertyValue> aPropList(aStringList.Count()); diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 2c0920c954cf..25900c823f62 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -202,7 +202,7 @@ namespace extensions { namespace resource } // supported resource types so far: strings - m_aResourceTypes[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) ) ] = + m_aResourceTypes[ ::rtl::OUString( "string" ) ] = ResourceTypePtr( new StringResourceAccess ); } diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 5d3e437cab64..11327284ef41 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -79,7 +79,7 @@ SEQ( sal_Int8 ) SAL_CALL ScannerManager::getMaskDIB() throw() OUString ScannerManager::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) ); + return ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); } // ----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw () { SEQ( OUString ) aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) ); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); return aSNS; } diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 8079d76a58f4..9d7a0ce5f922 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -1045,7 +1045,7 @@ Reference<XInvocation > SAL_CALL OComponent::in_methodInvocation( const Referenc Sequence<sal_Int16> outIndex; Sequence<Any> outParams; try{ - inv->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("disposing")), + inv->invoke( OUString("disposing"), params, outIndex, outParams); }catch(IllegalArgumentException &) { } @@ -1065,8 +1065,8 @@ SimpleStruct SAL_CALL OComponent::in_methodStruct( const SimpleStruct& aStruct ) throw (RuntimeException) { SimpleStruct& s= const_cast<SimpleStruct&>(aStruct); - s.message= s.message + OUString(RTL_CONSTASCII_USTRINGPARAM( - "This string was set in OleTest")); + s.message= s.message + OUString( + "This string was set in OleTest"); return aStruct; } void SAL_CALL OComponent::in_methodAll( @@ -1493,7 +1493,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); + pStruct->message= OUString("This struct was created in OleTest"); SimpleStruct aStruct; any >>= aStruct; @@ -1641,7 +1641,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); + pStruct->message= OUString("This struct was created in OleTest"); any >>= aStruct; } } @@ -1797,7 +1797,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); + pStruct->message= OUString("This struct was created in OleTest"); any >>= aStruct; } } diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx index f07f8b48a059..435042c6f115 100644 --- a/extensions/test/ole/unloading/unloadTest.cxx +++ b/extensions/test/ole/unloading/unloadTest.cxx @@ -61,7 +61,7 @@ sal_Bool test1() { printf("\n Test1: com.sun.star.bridge.oleautomation.BridgeSupplier\n"); Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")), + xreg->open( OUString("services.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); @@ -96,7 +96,7 @@ sal_Bool test2() { printf("Test2: com.sun.star.bridge.OleBridgeSupplierVar1\n"); Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")), + xreg->open( OUString("services.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); @@ -129,7 +129,7 @@ sal_Bool test3() { printf("Test3: com.sun.star.bridge.oleautomation.Factory\n"); Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")), + xreg->open( OUString("services.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); @@ -173,7 +173,7 @@ sal_Bool test4() { printf("Test4: com.sun.star.bridge.oleautomation.ApplicationRegistration\n"); Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")), + xreg->open( OUString("services.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 8cc09e6c0ba8..5d15a3ff1ad8 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -168,15 +168,15 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == 16 ) { (void)memcpy( mpnKey, aKey.getConstArray(), 16 ); bResult = sal_True; - mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ), (sal_Int16)0 ); - mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ), (sal_Int16)0 ); + mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95BaseKey" ), (sal_Int16)0 ); + mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95PasswordHash" ), (sal_Int16)0 ); } else OSL_FAIL( "Unexpected key size!\n" ); @@ -187,9 +187,9 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Xor95::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 ); - aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ) ] <<= (sal_Int16)mnKey; - aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ) ] <<= (sal_Int16)mnHash; + aHashData[ ::rtl::OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 ); + aHashData[ ::rtl::OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey; + aHashData[ ::rtl::OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash; return aHashData.getAsConstNamedValueList(); } @@ -293,12 +293,12 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 ) { (void)memcpy( m_pDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 ); - uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() ); if ( aUniqueID.getLength() == 16 ) { (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 ); @@ -318,8 +318,8 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Std97::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); - aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); + aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); + aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); return aHashData.getAsConstNamedValueList(); } diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index ae48fd679322..5a06d41358ab 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -158,17 +158,17 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW ); // set name for menubar - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( rName ) ); + xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( rName ) ); if ( xPopup.is() ) { uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); - aPopupMenu[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ); - aPopupMenu[0].Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.openoffice.org:") ) + rName ); - aPopupMenu[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ); + aPopupMenu[0].Name = rtl::OUString("CommandURL"); + aPopupMenu[0].Value = uno::makeAny( rtl::OUString("vnd.openoffice.org:") + rName ); + aPopupMenu[1].Name = rtl::OUString("Label"); aPopupMenu[1].Value <<= rName; - aPopupMenu[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") ); + aPopupMenu[2].Name = rtl::OUString("ItemDescriptorContainer"); aPopupMenu[2].Value = uno::makeAny( xMenuDesc ); - aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type" ) ); + aPopupMenu[3].Name = rtl::OUString("Type" ); aPopupMenu[3].Value <<= sal_Int32( 0 ); xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) ); @@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect bBeginGroup = rHeader.isBeginGroup(); controlGeneralInfo.ImportToolBarControlData( helper, props ); beans::PropertyValue aProp; - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ; + aProp.Name = rtl::OUString("Visible") ; aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored props.push_back( aProp ); if ( rHeader.getTct() == 0x01 @@ -348,7 +348,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } else if ( rHeader.getTct() == 0x0a ) { - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ; + aProp.Name = rtl::OUString("CommandURL") ; rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") ); TBCMenuSpecific* pMenu = getMenuSpecific(); @@ -359,7 +359,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } short icontext = ( rHeader.getTbct() & 0x03 ); - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style") ) ; + aProp.Name = rtl::OUString("Style") ; if ( bIsMenuBar ) { nStyle |= ui::ItemStyle::TEXT; @@ -495,24 +495,24 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command if ( !extraInfo.getOnAction().isEmpty() ) { - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ); + aProp.Name = rtl::OUString("CommandURL"); ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true ); if ( aMacroInf.mbFound ) aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro ); else - aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) ); + aProp.Value <<= rtl::OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( rtl::OUString( "]" ) ); sControlData.push_back( aProp ); } - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ); + aProp.Name = rtl::OUString("Label"); aProp.Value = uno::makeAny( customText.getString().replace('&','~') ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") ); + aProp.Name = rtl::OUString("Type"); aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") ); + aProp.Name = rtl::OUString("Tooltip"); aProp.Value = uno::makeAny( tooltip.getString() ); sControlData.push_back( aProp ); /* diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index f776d3e2869b..649b83ad94f0 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -204,14 +204,14 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, OUString OdfFlatXml::impl_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.filter.OdfFlatXml")); + return OUString("com.sun.star.comp.filter.OdfFlatXml"); } Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames() { Sequence< OUString > lServiceNames(2); - lServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ImportFilter" )); - lServiceNames[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" )); + lServiceNames[0] = OUString( "com.sun.star.document.ImportFilter" ); + lServiceNames[1] = OUString( "com.sun.star.document.ExportFilter" ); return lServiceNames; } diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index f019f52093ca..f2096d6105c5 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -290,7 +290,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < { sal_Bool bRet = sal_False; - mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ) ); + mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString("com.sun.star.drawing.GraphicExportFilter") ) ); Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY); if(!xDrawPagesSupplier.is()) return sal_False; @@ -301,7 +301,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < if(xStatusIndicator.is()) { - xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "PlaceWare:" )),xDrawPages->getCount()); + xStatusIndicator->start(OUString( "PlaceWare:" ),xDrawPages->getCount()); } Reference< XDrawPage > xDrawPage; @@ -346,7 +346,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < OUString aName( RTL_CONSTASCII_USTRINGPARAM("i") ); aName += OUString::valueOf( nPage ); - aName += OUString( RTL_CONSTASCII_USTRINGPARAM(".gif") ); + aName += OUString(".gif"); pEntry->setURL( aName ); if(xStatusIndicator.is()) @@ -485,17 +485,17 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) Reference< XFilter > xFilter( mxGraphicExporter, UNO_QUERY ); Sequence< PropertyValue > aFilterData( 2 ); - aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ); + aFilterData[0].Name = OUString("Width"); aFilterData[0].Value <<= (sal_Int32)704; - aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Translucent") ); + aFilterData[1].Name = OUString("Translucent"); aFilterData[1].Value <<= (sal_Bool)sal_False; Sequence< PropertyValue > aDescriptor( 3 ); - aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") ); - aDescriptor[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("GIF") ); - aDescriptor[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ); + aDescriptor[0].Name = OUString("FilterName"); + aDescriptor[0].Value <<= OUString("GIF"); + aDescriptor[1].Name = OUString("URL"); aDescriptor[1].Value <<= OUString( pEntry->getTempURL() ); - aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") ); + aDescriptor[2].Name = OUString("FilterData"); aDescriptor[2].Value <<= aFilterData; mxGraphicExporter->setSourceDocument( xComp ); xFilter->filter( aDescriptor ); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index deb97bdbfa3c..6ad7e8733d6c 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -144,7 +144,7 @@ void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Se OUString PlaceWareExportFilter_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Impress.PlaceWareExportFilter" ) ); + return OUString( "com.sun.star.comp.Impress.PlaceWareExportFilter" ); } // ----------------------------------------------------------------------------- diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index 2cbf2b4f45e7..6168d2271f9c 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -147,9 +147,9 @@ OUString TempFile::createTempFileURL() u %= (nRadix*nRadix*nRadix); OUString aTmp( aTempDirURL ); if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) ) - aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )); + aTmp += OUString( "/" ); aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix ); - aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( ".tmp" )); + aTmp += OUString( ".tmp" ); osl::File aFile( aTmp ); osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create); diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 2570fee33b30..6b7245192d16 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -295,12 +295,12 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes ) - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") ); + return rtl::OUString("svg_Scalable_Vector_Graphics"); sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes ) - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") ); + return rtl::OUString("svg_Scalable_Vector_Graphics"); return rtl::OUString(); } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 588207b0bd86..62b7bb575f55 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2173,7 +2173,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( "userSpaceOnUse") ); { SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True ); @@ -2264,7 +2264,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) ); + rtl::OUString( "userSpaceOnUse" ) ); } { diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ed2901bfbbed..f32c3dd85922 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -82,7 +82,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >())); if (xStatusIndicator.is()){ - xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Loading :" )),nProgressRange); + xStatusIndicator->start(OUString( "Loading :" ),nProgressRange); } OUString sXMLImportService ( udImport ); @@ -90,7 +90,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star Sequence< Any > aAnys(1); OUString aBaseURI; - if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI) + if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI) { INetURLObject aURLObj(aBaseURI); // base URI in this case is the URI of the actual saving location @@ -108,7 +108,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); xInfoSet->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI )); + OUString( "BaseURI" ), makeAny( aBaseURI )); aAnys[0] <<= xInfoSet; @@ -159,12 +159,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star Sequence<com::sun::star::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions(); //Load the Styles from the Template URL Supplied in the TypeDetection file - if(msTemplateName.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "file:" )))==-1) + if(msTemplateName.indexOf(OUString( "file:" ))==-1) { Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), UNO_QUERY ); + OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY ); OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)")))); - PathString = PathString.concat(OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ))); + PathString = PathString.concat(OUString( "/" )); msTemplateName=PathString.concat(msTemplateName); } @@ -221,7 +221,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >())); if (xStatusIndicator.is()) - xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Saving :" )),nProgressRange); + xStatusIndicator->start(OUString( "Saving :" ),nProgressRange); // Set up converter bridge. Reference< com::sun::star::xml::XExportFilter > xConverter(mxMSF->createInstance(udConvertClass ), UNO_QUERY); @@ -261,7 +261,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star // get the base URI, so we can use relative links OUString aBaseURI; - if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI) + if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI) { INetURLObject aURLObj(aBaseURI); // base URI in this case is the URI of the actual saving location @@ -281,12 +281,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star Reference< XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) ); xInfoSet->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrettyPrinting" )), makeAny( bPrettyPrint )); + OUString( "UsePrettyPrinting" ), makeAny( bPrettyPrint )); xInfoSet->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportTextNumberElement" )), + OUString( "ExportTextNumberElement" ), makeAny( bExportTextNumberElementForListItems )); xInfoSet->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI )); + OUString( "BaseURI" ), makeAny( aBaseURI )); aAnys[1] <<= xInfoSet; Reference< XExporter > xExporter( mxMSF->createInstanceWithArguments ( @@ -365,17 +365,17 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments ) { comphelper::SequenceAsHashMap aMap(aAnySeq); msFilterName = aMap.getUnpackedValueOrDefault( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" )), OUString()); + OUString( "Type" ), OUString()); msUserData = aMap.getUnpackedValueOrDefault( - OUString( RTL_CONSTASCII_USTRINGPARAM( "UserData" )), Sequence< OUString >()); + OUString( "UserData" ), Sequence< OUString >()); msTemplateName = aMap.getUnpackedValueOrDefault( - OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateName" )), OUString()); + OUString( "TemplateName" ), OUString()); } } OUString XmlFilterAdaptor_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ); + return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" ); } #define SERVICE_NAME1 "com.sun.star.document.ExportFilter" #define SERVICE_NAME2 "com.sun.star.document.ImportFilter" diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index bec453d8ae08..953a3dc7c7f8 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -255,7 +255,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments ) OUString FilterDetect_getImplementationName () { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.filters.XMLFilterDetect" ) ); + return OUString( "com.sun.star.comp.filters.XMLFilterDetect" ); } #define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection" diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index ac7118459c8b..9fb075306486 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -100,10 +100,10 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML xHandler->setOutputStream( xOS ); ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:oor" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://openoffice.org/2001/registry" )) ); - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:xs" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.w3.org/2001/XMLSchema" )) ); - pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection" )) ); - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:package" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office" )) ); + pAttrList->AddAttribute ( OUString( "xmlns:oor" ), sCdataAttribute, OUString( "http://openoffice.org/2001/registry" ) ); + pAttrList->AddAttribute ( OUString( "xmlns:xs" ), sCdataAttribute, OUString( "http://www.w3.org/2001/XMLSchema" ) ); + pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "TypeDetection" ) ); + pAttrList->AddAttribute ( OUString( "oor:package" ), sCdataAttribute, OUString( "org.openoffice.Office" ) ); Reference < XAttributeList > xAttrList (pAttrList); xHandler->startDocument(); @@ -113,7 +113,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML // export types { xAttrList = pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Types" )) ); + pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Types" ) ); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->startElement( sNode, xAttrList ); @@ -156,7 +156,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML // export filters { xAttrList = pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Filters" )) ); + pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Filters" ) ); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->startElement( sNode, xAttrList ); @@ -233,8 +233,8 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName ); - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) ); + pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName ); + pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) ); Reference < XAttributeList > xAttrList (pAttrList); xHandler->ignorableWhitespace ( sWhiteSpace ); @@ -263,14 +263,14 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName ); - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) ); + pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName ); + pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) ); Reference < XAttributeList > xAttrList (pAttrList); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->startElement( sProp, xAttrList ); xAttrList = pAttrList = new ::comphelper::AttributeList; - pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xml:lang" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" )) ); + pAttrList->AddAttribute ( OUString( "xml:lang" ), sCdataAttribute, OUString( "en-US" ) ); xHandler->ignorableWhitespace ( sWhiteSpace ); xHandler->startElement( sValue, xAttrList ); xHandler->characters( rValue ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 3bf4119c00b3..91691d68e4bf 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -190,7 +190,7 @@ void SAL_CALL XMLFilterDialogComponent::release() throw () OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLFilterDialogComponent" ) ); + return OUString( "XMLFilterDialogComponent" ); } //------------------------------------------------------------------------- diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 8bf0f710a829..5947131be136 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -72,7 +72,7 @@ XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF { try { - Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY ); + Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( "com.sun.star.config.SpecialConfigManager" )), UNO_QUERY ); if( xCfgMgr.is() ) { sProgPath = xCfgMgr->substituteVariables( sProgPath ); @@ -135,7 +135,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference { OUString aFileURL( rSourceFile ); - if( !aFileURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("file://") ) ) ) + if( !aFileURL.matchIgnoreAsciiCase( OUString("file://") ) ) { aFileURL = URIHelper::SmartRel2Abs( sProgPath, aFileURL, Link(), false ); } @@ -162,13 +162,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) ); + aArg.Name = ::rtl::OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )), + rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) @@ -262,13 +262,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) ); + aArg.Name = ::rtl::OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )), + rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) @@ -341,8 +341,8 @@ bool XMLFilterJarHelper::copyFile( Reference< XHierarchicalNameAccess > xIfc, OU { OUString szPackagePath( encodeZipUri( rURL.copy( sVndSunStarPackage.getLength() ) ) ); - if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) ) - || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) ) + if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( ".." ) ) + || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( "." ) ) ) throw lang::IllegalArgumentException(); if( xIfc->hasByHierarchicalName( szPackagePath ) ) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 4e387b9397f9..15b86e1eccda 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1345,7 +1345,7 @@ OUString getApplicationUIName( const OUString& rServiceName ) OUString aRet = RESIDSTR(STR_UNKNOWN_APPLICATION); if( !rServiceName.isEmpty() ) { - aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " (" )); + aRet += OUString( " (" ); aRet += rServiceName; aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); } @@ -1620,7 +1620,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const { Sequence< OUString > aUserData(8); - aUserData[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) ); + aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" ); aUserData[1] = OUString::valueOf( mbNeedsXSLT2 ); aUserData[2] = maImportService; aUserData[3] = maExportService; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 727b5d46a6ef..b90b9cfc748c 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -117,7 +117,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString if ( rServiceName == "com.sun.star.drawing.DrawingDocument" ) { // so if we want a draw we need to check if its not an impress - if( !xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument") ) ) ) + if( !xInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument") ) ) return true; } else @@ -297,8 +297,8 @@ void XMLFilterTestDialog::onExportBrowse() com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); - Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY ); - Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), UNO_QUERY ); + Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY ); + Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( "com.sun.star.document.TypeDetection" ) ), UNO_QUERY ); if( xFilterContainer.is() && xTypeDetection.is() ) { Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() ); @@ -372,7 +372,7 @@ void XMLFilterTestDialog::onExportBrowse() { if( n > 0 ) aExtension += OUString( sal_Unicode(';') ); - aExtension += OUString( RTL_CONSTASCII_USTRINGPARAM( "*." )); + aExtension += OUString( "*." ); aExtension += (*pExtensions++); } } @@ -406,7 +406,7 @@ void XMLFilterTestDialog::onExportBrowse() Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) ); OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); Sequence< PropertyValue > aArguments(1); - aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); + aArguments[0].Name = OUString( "InteractionHandler" ); aArguments[0].Value <<= xInter; Reference< XComponent > xComp( xLoader->loadComponentFromURL( m_sExportRecentFile, aFrame, 0, aArguments ) ); if( xComp.is() ) @@ -453,19 +453,19 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp ) int i = 0; - aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) ); + aSourceData[i ].Name = OUString( "OutputStream" ); aSourceData[i++].Value <<= xIS; - aSourceData[i].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ) ); + aSourceData[i].Name = OUString( "Indent" ); aSourceData[i++].Value <<= (sal_Bool)sal_True; if( bUseDocType ) { - aSourceData[i ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_Public")); + aSourceData[i ].Name = OUString("DocType_Public"); aSourceData[i++].Value <<= m_pFilterInfo->maDocType; } - Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY ); + Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY ); Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY ); if( xHandler.is() ) { @@ -481,8 +481,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp ) { try { - xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportGraphicObjectResolver" )) ) ); - xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportEmbeddedObjectResolver" )) ) ); + xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportGraphicObjectResolver" ) ) ); + xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportEmbeddedObjectResolver" ) ) ); } catch( const Exception& ) { @@ -506,7 +506,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp ) xExporter2->setSourceDocument( xComp ); Sequence< PropertyValue > aDescriptor( 1 ); - aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) ); + aDescriptor[0].Name = OUString( "FileName" ); aDescriptor[0].Value <<= aTempFileURL; if( xFilter->filter( aDescriptor ) ) @@ -592,9 +592,9 @@ void XMLFilterTestDialog::import( const OUString& rURL ) OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); Sequence< PropertyValue > aArguments(2); - aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArguments[0].Name = OUString( "FilterName" ); aArguments[0].Value <<= m_pFilterInfo->maFilterName; - aArguments[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); + aArguments[1].Name = OUString( "InteractionHandler" ); aArguments[1].Value <<= xInter; xLoader->loadComponentFromURL( rURL, aFrame, 0, aArguments ); @@ -606,7 +606,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) TempFile aTempFile(lead, &ext); OUString aTempFileURL( aTempFile.GetURL() ); - Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY ); + Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY ); if( xImporter.is() ) { osl::File aInputFile( rURL ); @@ -617,13 +617,13 @@ void XMLFilterTestDialog::import( const OUString& rURL ) Sequence< PropertyValue > aSourceData( 3 ); int i = 0; - aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" )); + aSourceData[i ].Name = OUString( "InputStream" ); aSourceData[i++].Value <<= xIS; - aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" )); + aSourceData[i ].Name = OUString( "FileName" ); aSourceData[i++].Value <<= rURL; - aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" )); + aSourceData[i ].Name = OUString( "Indent" ); aSourceData[i++].Value <<= (sal_Bool)sal_True; Reference< XWriter > xWriter = Writer::create( comphelper::getComponentContext(mxMSF) ); diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 395bc8192d75..eb4336479545 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -108,8 +108,7 @@ namespace XSLT //create an com.sun.star.embed.OLESimpleStorage from the temp stream Sequence<Any> args(1); args[0] <<= xSeek; - Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), args), UNO_QUERY); + Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString( "com.sun.star.embed.OLESimpleStorage" ), args), UNO_QUERY); m_storage = cont; } diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 0b8f7f1a014a..5895bc8ad571 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -70,16 +70,16 @@ const StringSequence& getColumnTypes() if (aColumnTypes.getConstArray()[0].isEmpty()) { ::rtl::OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) ); - pNames[TYPE_COMBOBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) ); - pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) ); - pNames[TYPE_DATEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) ); - pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) ); - pNames[TYPE_LISTBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) ); - pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) ); - pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) ); - pNames[TYPE_TEXTFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ); - pNames[TYPE_TIMEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) ); + pNames[TYPE_CHECKBOX] = ::rtl::OUString( "CheckBox" ); + pNames[TYPE_COMBOBOX] = ::rtl::OUString( "ComboBox" ); + pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( "CurrencyField" ); + pNames[TYPE_DATEFIELD] = ::rtl::OUString( "DateField" ); + pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( "FormattedField" ); + pNames[TYPE_LISTBOX] = ::rtl::OUString( "ListBox" ); + pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( "NumericField" ); + pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( "PatternField" ); + pNames[TYPE_TEXTFIELD] = ::rtl::OUString( "TextField" ); + pNames[TYPE_TIMEFIELD] = ::rtl::OUString( "TimeField" ); } return aColumnTypes; } @@ -341,7 +341,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN ); aForbiddenProperties.insert( PROPERTY_IMAGE_URL ); aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION ); - aForbiddenProperties.insert( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) ); + aForbiddenProperties.insert( ::rtl::OUString( "EnableVisible" ) ); if ( !bAllowDropDown ) aForbiddenProperties.insert( PROPERTY_DROPDOWN ); diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index fb19bccf50b2..29abbe3a7af8 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -521,7 +521,7 @@ void OComboBoxModel::loadData( bool _bForce ) // otherwise look for the alias Reference<XPropertySet> xFormProp(xForm,UNO_QUERY); Reference< XColumnsSupplier > xSupplyFields; - xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields; + xFormProp->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !"); diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 4536b207ea69..6076fc64b7d2 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -110,11 +110,11 @@ void OCurrencyModel::implConstruct() bPrependCurrencySymbol = sal_False; break; case 2: // $ 1 - sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ); + sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(" "); bPrependCurrencySymbol = sal_True; break; case 3: // 1 $ - sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); + sCurrencySymbol = ::rtl::OUString(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); bPrependCurrencySymbol = sal_False; break; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 24d07499bbf6..378febb070ff 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -404,7 +404,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) catch(const Exception&) { throw WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given database form." ) ), + ::rtl::OUString( "Could not clone the given database form." ), *const_cast< ODatabaseForm* >( &_cloneSource ), ::cppu::getCaughtException() ); @@ -2165,7 +2165,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor if (xDisp.is()) { Sequence<PropertyValue> aArgs(2); - aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; // build a sequence from the to-be-submitted string @@ -2174,7 +2174,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength()); Reference< XInputStream > xPostData = new SequenceInputStream(aPostData); - aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); + aArgs.getArray()[1].Name = ::rtl::OUString("PostData"); aArgs.getArray()[1].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -2259,7 +2259,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: if (xDisp.is()) { Sequence<PropertyValue> aArgs(1); - aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()->Name = ::rtl::OUString("Referer"); aArgs.getArray()->Value <<= aReferer; xDisp->dispatch(aURL, aArgs); } @@ -2292,15 +2292,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: return; Sequence<PropertyValue> aArgs(3); - aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; - aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType") ); + aArgs.getArray()[1].Name = ::rtl::OUString("ContentType"); aArgs.getArray()[1].Value <<= aContentType; // build a sequence from the to-be-submitted string Reference< XInputStream > xPostData = new SequenceInputStream(aData); - aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); + aArgs.getArray()[2].Name = ::rtl::OUString("PostData"); aArgs.getArray()[2].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -3781,7 +3781,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.ODatabaseForm" ); } //------------------------------------------------------------------------------ @@ -3802,7 +3802,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati ::rtl::OUString* pServices = aServices.getArray(); *pServices++ = FRM_SUN_FORMCOMPONENT; - *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); + *pServices++ = ::rtl::OUString("com.sun.star.form.FormComponents"); *pServices++ = FRM_SUN_COMPONENT_FORM; *pServices++ = FRM_SUN_COMPONENT_HTMLFORM; *pServices++ = FRM_SUN_COMPONENT_DATAFORM; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index c69a23e1e4b7..b6e43b54b4c0 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -619,7 +619,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm ) if ( !m_bMaxTextLenModified ) { sal_Int32 nFieldLen = 0; - xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen; + xField->getPropertyValue(::rtl::OUString("Precision") ) >>= nFieldLen; if (nFieldLen && nFieldLen <= USHRT_MAX) { diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 9afc606ecfeb..d2bc3239260b 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -158,22 +158,22 @@ namespace frm switch (m_nControlClass) { case FormComponentType::RADIOBUTTON: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") ); + aServiceName = rtl::OUString("radiobutton"); break; case FormComponentType::CHECKBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") ); + aServiceName = rtl::OUString("checkbox"); break; case FormComponentType::COMBOBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") ); + aServiceName = rtl::OUString("combobox"); break; case FormComponentType::LISTBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") ); + aServiceName = rtl::OUString("listbox"); break; default: if (m_bMultiLine) - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") ); + aServiceName = rtl::OUString("MultiLineEdit"); else - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") ); + aServiceName = rtl::OUString("Edit"); } return aServiceName; } @@ -405,7 +405,7 @@ namespace frm // create a query composer Reference< XColumnsSupplier > xSuppColumns; - xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSuppColumns; + xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns; const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW ); const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW ); @@ -899,15 +899,15 @@ namespace frm //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" ); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aNames( 2 ); - aNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.FilterControl" ) ); - aNames[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); + aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" ); + aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); return aNames; } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 569fe435554c..ac5b96c92a17 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -772,7 +772,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta { Sequence< ::rtl::OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; - aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") ); + aServiceNames[ 1 ] = ::rtl::OUString("com.sun.star.form.FormControlModel"); return aServiceNames; } @@ -1656,7 +1656,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< ::rtl::OUString > aOwnServiceNames( 1 ); - aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.DataAwareControlModel") ); + aOwnServiceNames[ 0 ] = ::rtl::OUString("com.sun.star.form.DataAwareControlModel"); return ::comphelper::concatSequences( OControlModel::getSupportedServiceNames_Static(), diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index dd918461eb04..a371c69e1729 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -601,7 +601,7 @@ void OFormattedModel::updateFormatterNullDate() // calc the current NULL date Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() ); if ( xSupplier.is() ) - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= m_aNullDate; } //------------------------------------------------------------------------------ @@ -774,7 +774,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier(); m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) ); m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey ); - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString("NullDate") ) >>= m_aNullDate; OEditBaseModel::onConnectedDbColumn( _rxForm ); } diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index ebd40a4f4c3d..e634bbf8ed7c 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -195,7 +195,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw //------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") ); + return ::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper"); } //------------------------------------------------------------------ diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index a31e15c368e6..e997ef77b948 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -108,7 +108,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") ); + return ::rtl::OUString("com.sun.star.comp.forms.OFormsCollection"); } //------------------------------------------------------------------------------ @@ -128,7 +128,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti StringSequence aReturn(2); aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION; - aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); + aReturn.getArray()[1] = ::rtl::OUString("com.sun.star.form.FormComponents"); return aReturn; } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 005c7199340a..d25212629ec5 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -202,7 +202,7 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept aSupported.realloc(aSupported.getLength() + 2); ::rtl::OUString*pArray = aSupported.getArray(); - pArray[aSupported.getLength()-2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel")); + pArray[aSupported.getLength()-2] = ::rtl::OUString("com.sun.star.awt.UnoControlModel"); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL; return aSupported; } diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index da407cf8e544..caa015af2d0b 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -257,7 +257,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const DBG_NAME(OGroupManager); //------------------------------------------------------------------ OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer) - :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) ) + :m_pCompGroup( new OGroup( ::rtl::OUString("AllComponentGroup") ) ) ,m_xContainer(_rxContainer) { DBG_CTOR(OGroupManager,NULL); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8100ce2551dc..801d833c9341 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -294,7 +294,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con ::rtl::OUString sNewImageURL; if ( m_xGraphicObject.is() ) { - sNewImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); + sNewImageURL = ::rtl::OUString( "vnd.sun.star.GraphicObject:" ); sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); } m_sImageURL = sNewImageURL; @@ -795,7 +795,7 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce ) if ( sOldImageURL.isEmpty() ) // the ImageURL is already empty, so simply setting a new empty one would not suffice // (since it would be ignored) - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:emptyImage" ) ) ) ); + xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( "private:emptyImage" ) ) ); // (the concrete URL we're passing here doens't matter. It's important that // the model cannot resolve it to a a valid resource describing an image stream } @@ -879,7 +879,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const { Reference< XPropertySet > xModelProps( const_cast< OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW ); Reference< XGraphic > xGraphic; - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ) >>= xGraphic ); + OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "Graphic" ) ) >>= xGraphic ); bIsEmpty = !xGraphic.is(); } catch( const Exception& ) diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 306829e9ce7c..a448416a80a7 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -719,7 +719,7 @@ namespace frm { // otherwise look for the alias Reference< XColumnsSupplier > xSupplyFields; - xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields; + xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !"); @@ -741,15 +741,15 @@ namespace frm ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); if (aBoundFieldName.isEmpty()) // act like a combobox - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") ); + aStatement += ::rtl::OUString("DISTINCT "); aStatement += quoteName(aQuote,aFieldName); if (!aBoundFieldName.isEmpty()) { - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") ); + aStatement += ::rtl::OUString(", "); aStatement += quoteName(aQuote, aBoundFieldName); } - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") ); + aStatement += ::rtl::OUString(" FROM "); ::rtl::OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation ); @@ -841,7 +841,7 @@ namespace frm try { Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW ); - OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType ); + OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString("Type") ) >>= m_nBoundColumnType ); } catch( const Exception& ) { diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 12c205c9a436..97b06d6b9309 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -305,7 +305,7 @@ namespace frm Sequence<PropertyValue> aArgs(1); PropertyValue& rProp = aArgs.getArray()[0]; - rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + rProp.Name = ::rtl::OUString("Referer"); rProp.Value <<= xModel->getURL(); if (xDisp.is()) @@ -320,13 +320,13 @@ namespace frm if ( xDisp.is() ) { Sequence<PropertyValue> aProps(3); - aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aProps[0].Name = ::rtl::OUString("URL"); aProps[0].Value <<= aURL.Complete; - aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")); + aProps[1].Name = ::rtl::OUString("FrameName"); aProps[1].Value = xSet->getPropertyValue(PROPERTY_TARGET_FRAME); - aProps[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + aProps[2].Name = ::rtl::OUString("Referer"); aProps[2].Value <<= xModel->getURL(); xDisp->dispatch( aHyperLink, aProps ); @@ -679,7 +679,7 @@ namespace frm ImageProducer *pImgProd = GetImageProducer(); // grab the ImageURL rtl::OUString sURL; - getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL; + getPropertyValue( rtl::OUString("ImageURL") ) >>= sURL; if (!m_pMedium) { if ( ::svt::GraphicAccess::isSupportedURL( sURL ) ) diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index cd4c527d5c25..f2f133688fa7 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -173,7 +173,7 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarModel" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarModel" ); } //------------------------------------------------------------------ @@ -183,7 +183,7 @@ namespace frm aSupported.realloc( aSupported.getLength() + 2 ); ::rtl::OUString* pArray = aSupported.getArray(); - pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlModel" ) ); + pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlModel" ); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR; return aSupported; } @@ -447,7 +447,7 @@ namespace frm break; case PROPERTY_ID_DEFAULTCONTROL: - aDefault <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) ); + aDefault <<= ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); break; case PROPERTY_ID_HELPTEXT: diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 8d34774d6fa1..dd8a6673af9d 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -287,8 +287,8 @@ namespace frm Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) ); + ::rtl::OUString( "ScrollValueMin" ), + ::rtl::OUString( "ScrollValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 0b764009d02f..77fe5439fa61 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -243,8 +243,8 @@ namespace frm Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) ); + ::rtl::OUString( "SpinValueMin" ), + ::rtl::OUString( "SpinValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 3403df8c2308..b0b71fa35ddb 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -93,7 +93,7 @@ namespace frm // old macro for quickly implementing XServiceInfo::getImplementationName #define IMPLEMENTATION_NAME(ImplName) \ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ - { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } + { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } class OControlModel; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 4e09785d15ee..b8c7a1c04505 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn break; Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW ); - Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider") ) ), UNO_QUERY ); + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY ); if ( !xNameQuery.is() ) break; @@ -146,9 +146,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW ); ::rtl::OUString sServiceName; - xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl") ) ) >>= sServiceName; + xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName; - Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBAToOOEventDesc") ) ), UNO_QUERY_THROW ); + Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW ); Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName ); // register the vba script events m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents ); @@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource ) catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given interface hierarchy." ) ), + ::rtl::OUString( "Could not clone the given interface hierarchy." ), static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ), ::cppu::getCaughtException() ); @@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper bool bHandleVbaEvents = false; try { - _rxElement->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GenerateVbaEvents") ) ) >>= bHandleVbaEvents; + _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents; } catch( const Exception& ) { diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 06bba11583b7..8a3597c16f7c 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -54,8 +54,8 @@ namespace frm //--------------------------------------------------------------------- static const Locale& getLocale(LocaleType _eType) { - static const Locale s_aEnglishUS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("us") ), ::rtl::OUString() ); - static const Locale s_aGerman( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE") ), ::rtl::OUString() ); + static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() ); + static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() ); static const ::rtl::OUString s_sEmptyString; static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString ); diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 844b6c2c4437..0ba171fcd1a7 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -123,7 +123,7 @@ void registerClassInfo( //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ + ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ aServices, \ frm::classImplName##_CreateInstance) @@ -218,7 +218,7 @@ void ensureClassInfos() aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD; aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD; - registerClassInfo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted") ), + registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"), aServices, frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted); diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 097ab031b30b..72e078973f6d 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -44,13 +44,13 @@ namespace frm switch ( _eFunc ) { case OClipboardDispatcher::eCut: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Cut" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Cut" ); break; case OClipboardDispatcher::eCopy: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Copy" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Copy" ); break; case OClipboardDispatcher::ePaste: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Paste" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Paste" ); break; } return aURL; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 053abd151116..93e8497eec4c 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -280,15 +280,15 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ORichTextControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ORichTextControl" ); } //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices( 3 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEdit" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlEdit" ); aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL; return aServices; } diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 2d8f431ef4ac..5799ca8a90af 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -244,13 +244,13 @@ namespace frm //-------------------------------------------------------------------- IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel, FRM_SUN_COMPONENT_RICHTEXTCONTROL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextRange" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphProperties" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesAsian" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesComplex" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesAsian" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesComplex" ) ) + ::rtl::OUString( "com.sun.star.text.TextRange" ), + ::rtl::OUString( "com.sun.star.style.CharacterProperties" ), + ::rtl::OUString( "com.sun.star.style.ParagraphProperties" ), + ::rtl::OUString( "com.sun.star.style.CharacterPropertiesAsian" ), + ::rtl::OUString( "com.sun.star.style.CharacterPropertiesComplex" ), + ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesAsian" ), + ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesComplex" ) ) //------------------------------------------------------------------------------ @@ -409,7 +409,7 @@ namespace frm // forward to our aggregate, so the EditEngine knows about it if ( m_xAggregateSet.is() ) m_xAggregateSet->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), _rValue ); + ::rtl::OUString( "WritingMode" ), _rValue ); } break; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 529a43ea8546..d1c810e86a54 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -144,14 +144,14 @@ namespace frm //-------------------------------------------------------------------- ::rtl::OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.FormOperations" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.FormOperations" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormOperations" ) ); + aNames[0] = ::rtl::OUString( "com.sun.star.form.runtime.FormOperations" ); return aNames; } @@ -402,7 +402,7 @@ namespace frm ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) ); if ( !bFinalCount ) - sValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" *") ); + sValue += ::rtl::OUString(" *"); aState.State <<= sValue; aState.Enabled = sal_True; @@ -1137,7 +1137,7 @@ namespace frm Reference< XMultiServiceFactory > xFactory( ::dbtools::getConnection( m_xCursor ), UNO_QUERY ); if ( xFactory.is() ) { - m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); OSL_ENSURE( m_xParser.is(), "FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a parser for us!" ); } } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 001b711d250c..56f54c19d202 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -219,15 +219,15 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarControl" ); } //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); return aServices; } diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 3222f4d69f2e..2d102247b080 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -89,7 +89,7 @@ namespace frm case FormFeature::RemoveFilterAndSort : pAsciiCommandName = "RemoveFilterSort"; break; } if ( pAsciiCommandName != NULL ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + ::rtl::OUString::createFromAscii( pAsciiCommandName ); + return ::rtl::OUString( ".uno:" ) + ::rtl::OUString::createFromAscii( pAsciiCommandName ); OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" ); return ::rtl::OUString(); diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 0b6131021db0..c209a7f92c6a 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -157,7 +157,7 @@ namespace xforms Repository::iterator aTypePos = implLocate( typeName ); if ( aTypePos->second->getIsBasic() ) - throw VetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is a built-in type and cannot be removed." ) ), *this ); + throw VetoException( ::rtl::OUString( "This is a built-in type and cannot be removed." ), *this ); // TODO: localize this error message m_aRepository.erase( aTypePos ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 8b458fcbdfbe..94f6fa8828a5 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -289,7 +289,7 @@ namespace xforms RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) { - _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is no valid pattern." ) ); + _rErrorMessage = ::rtl::OUString( "This is no valid pattern." ); return false; } } @@ -547,7 +547,7 @@ namespace xforms sal_Int32 nValue( 0 ); OSL_VERIFY( _rNewValue >>= nValue ); if ( nValue <= 0 ) - _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Length limits must denote positive integer values." ) ); + _rErrorMessage = ::rtl::OUString( "Length limits must denote positive integer values." ); // TODO/eforms: localize the error message } break; diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 8cd3f09c09f4..cc4d8ddcb52d 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -502,7 +502,7 @@ void SAL_CALL Submission::submitWithInteraction( if ( !xModel.is() || msID.isEmpty() ) throw RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is not a valid submission object." ) ), + ::rtl::OUString( "This is not a valid submission object." ), *this ); diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index f08b3f628a7e..27bcd4baee84 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -63,13 +63,13 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla // open the stream from the result... // build media descriptor Sequence< PropertyValue > descriptor(2); - descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ), + descriptor[0] = PropertyValue(::rtl::OUString("InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); - descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ), + descriptor[1] = PropertyValue(::rtl::OUString("ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); - ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") ); + ::rtl::OUString aTarget = ::rtl::OUString("_default"); xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); return CSubmission::SUCCESS; diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index f64e1ac19ce1..462972018cd7 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -60,7 +60,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< aPostArgument.Source = apSerialization->getInputStream(); CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink); aPostArgument.Sink = aSink; - aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml")); + aPostArgument.MediaType = OUString("application/xml"); aPostArgument.Referer = OUString(); Any aCommandArgument; aCommandArgument <<= aPostArgument; diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 5e567f78c1fd..75c6922e109f 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -41,13 +41,13 @@ Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create( ::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") ); + return ::rtl::OUString("com.sun.star.comp.xml.xpath.XFormsExtension"); } Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aSequence(1); - aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") ); + aSequence[0] = ::rtl::OUString("com.sun.star.xml.xpath.XPathExtension"); return aSequence; } diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index fc0ec2c98dde..3ae91cdafc09 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -93,7 +93,7 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings( // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "simple.formula.FormulaOpCodeMapperObj" ) ); + return rtl::OUString( "simple.formula.FormulaOpCodeMapperObj" ); } // -------------------------------------------------------------------------------- uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException) @@ -103,7 +103,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedSe uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FormulaOpCodeMapper" )); + aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.FormulaOpCodeMapper" ); return aSeq; } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index aec7824cae43..414c6fc23d13 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -434,9 +434,9 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength(); uno::Sequence< ::rtl::OUString > aArgs(3); - aArgs[TOKEN_OPEN] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")); + aArgs[TOKEN_OPEN] = ::rtl::OUString("("); aArgs[TOKEN_CLOSE] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); - aArgs[TOKEN_SEP] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + aArgs[TOKEN_SEP] = ::rtl::OUString(";"); m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF); m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL); @@ -1171,7 +1171,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) for(i=0;i<=nEd;i++) { if ( m_aArguments[i].isEmpty() ) - m_aArguments[i] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + m_aArguments[i] = ::rtl::OUString(" "); } if(pParaWin->GetArgument(nEd).Len()!=0) m_aArguments[nEd] = pParaWin->GetArgument(nEd); diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 359ef6f7f2f4..d4c6769015aa 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -93,7 +93,7 @@ static Reference< css::uno::XInterface > FilePicker_createInstance ( { // Always fall back to OfficeFilePicker. xResult = xFactory->createInstanceWithContext ( - OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker")), + OUString( "com.sun.star.ui.dialogs.OfficeFilePicker"), rxContext); } if (xResult.is()) @@ -106,14 +106,14 @@ static Reference< css::uno::XInterface > FilePicker_createInstance ( static OUString FilePicker_getImplementationName() { - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FilePicker")); + return OUString("com.sun.star.comp.fpicker.FilePicker"); } static Sequence< OUString > FilePicker_getSupportedServiceNames() { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker")); + OUString( "com.sun.star.ui.dialogs.FilePicker"); return aServiceNames; } @@ -125,13 +125,13 @@ static OUString FolderPicker_getSystemPickerServiceName() OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); #ifdef UNX if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker")); + return OUString("com.sun.star.ui.dialogs.TDEFolderPicker"); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker")); + return OUString("com.sun.star.ui.dialogs.KDEFolderPicker"); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx"))) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker")); + return OUString("com.sun.star.ui.dialogs.AquaFolderPicker"); #endif - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker")); + return OUString("com.sun.star.ui.dialogs.SystemFolderPicker"); } static Reference< css::uno::XInterface > FolderPicker_createInstance ( @@ -164,7 +164,7 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance ( { // Always fall back to OfficeFolderPicker. xResult = xFactory->createInstanceWithContext ( - OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker")), + OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker"), rxContext); } if (xResult.is()) @@ -177,14 +177,14 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance ( static OUString FolderPicker_getImplementationName() { - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FolderPicker")); + return OUString("com.sun.star.comp.fpicker.FolderPicker"); } static Sequence< OUString > FolderPicker_getSupportedServiceNames() { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker")); + OUString( "com.sun.star.ui.dialogs.FolderPicker"); return aServiceNames; } diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index acc3fc677949..de1f84a156ed 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -56,8 +56,8 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); return aRet; } } @@ -93,7 +93,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke { if ( rBHelper.bDisposed ) throw lang::DisposedException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )), + rtl::OUString( "object is already disposed" ), static_cast< XFilePicker2* >( this ) ); if ( !rBHelper.bInDispose && !rBHelper.bDisposed ) @@ -109,7 +109,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi { if ( rBHelper.bDisposed ) throw lang::DisposedException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )), + rtl::OUString( "object is already disposed" ), static_cast< XFilePicker2* >( this ) ); rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener ); @@ -432,7 +432,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException) OSL_FAIL("Could not start event notifier thread!"); throw uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")), + rtl::OUString("Error executing dialog"), static_cast<XFilePicker2*>(this)); } @@ -600,7 +600,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) uno::Any aAny; if ( 0 == aArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast<XFilePicker2*>(this), 1); aAny = aArguments[0]; @@ -608,7 +608,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) && (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")), + rtl::OUString("invalid argument type"), static_cast<XFilePicker2*>(this), 1); sal_Int16 templateId = -1; @@ -670,7 +670,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 40c2fa37d548..bc02fa0109c6 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -75,8 +75,8 @@ namespace css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[0] = ::rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = ::rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); return aRet; } } @@ -606,7 +606,7 @@ void SAL_CALL VistaFilePicker::cancel() ::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName() throw(css::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog")); + return ::rtl::OUString("com.sun.star.comp.fpicker.VistaFileDialog"); } // ------------------------------------------------- diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 75a3f797f4de..95b12b3e805b 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -885,7 +885,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest) ::rtl::OUString aFileURL(m_sDirectory); sal_Int32 nIndex = aFileURL.lastIndexOf('/'); if (nIndex != aFileURL.getLength()-1) - aFileURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/")); + aFileURL += ::rtl::OUString("/"); aFileURL += m_sFilename; TFileDialogCustomize iCustom = impl_getCustomizeInterface(); diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index fcea195267f6..d55a4eae29e2 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -118,7 +118,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory) if ( ::osl::FileBase::E_None != ::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory)) throw IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")), + rtl::OUString("Invalid directory"), static_cast<XFilePicker2*>(m_FilePicker), 1); // we ensure that there is a trailing '/' at the end of @@ -189,7 +189,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException) rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; else throw uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")), + rtl::OUString("Error executing dialog"), static_cast<XFilePicker2*>(m_FilePicker)); return rc; @@ -208,7 +208,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const if (!bRet) throw IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")), + rtl::OUString("filter already exists"), static_cast<XFilePicker2*>(m_FilePicker), 1); // #95345# see MSDN OPENFILENAME @@ -233,7 +233,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle) if (filterPos < 0) throw IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")), + rtl::OUString("filter doesn't exist"), static_cast<XFilePicker2*>(m_FilePicker), 1); // filter index of the base class starts with 1 diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index 7c4b6bb6f88c..b20b65d020cc 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -79,12 +79,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& { if ( m_rBroadcastHelper.bDisposed ) throw lang::DisposedException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )), + ::rtl::OUString( "FilePicker is already disposed" ), uno::Reference< uno::XInterface >() ); if ( m_rBroadcastHelper.bInDispose ) throw lang::DisposedException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )), + ::rtl::OUString( "FilePicker will be disposed now." ), uno::Reference< uno::XInterface >() ); m_rBroadcastHelper.aLC.addInterface( aType, xListener ); @@ -99,7 +99,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& { if ( m_rBroadcastHelper.bDisposed ) throw lang::DisposedException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )), + ::rtl::OUString( "FilePicker is already disposed." ), uno::Reference< uno::XInterface >() ); m_rBroadcastHelper.aLC.removeInterface( aType, xListener ); diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index db176f7cc7b6..0488b4ed10a1 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -80,11 +80,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s { if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1); + OUString("unsupported image format"), 0, 1); if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0))) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2); + OUString("invalid image data"), 0, 2); // save the new image data and force a redraw m_ImageData = aImage; diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index 7a3eca82f13d..9d3347893fd4 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -273,9 +273,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) if ( xFPNotifier.is( ) ) xFPNotifier->addFilePickerListener( xFPListener ); - xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple..."))); + xFilePicker->setTitle( OUString("FileOpen Simple...")); xFilePicker->setMultiSelectionMode( sal_True ); - xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw"))); + xFilePicker->setDefaultName( OUString("d:\\test2.sxw")); OUString aDirURL; OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) ); diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index 953c50d665b3..de5f714a0fc3 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -52,7 +52,7 @@ namespace Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFolderPicker")); + aRet[0] = OUString("com.sun.star.ui.dialogs.SystemFolderPicker"); return aRet; } } diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 6f49d07d17bf..97c29ec25273 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -78,7 +78,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect if ( ::osl::FileBase::E_None != rc ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )), + OUString( "directory is not a valid file url" ), static_cast< cppu::OWeakObject * >( m_pFolderPicker ), 1 ); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 93c9244227b5..8a993306b03f 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -139,7 +139,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt if ( !aItem.hasValue( ) || aItem.getValueType( ) != getCppuType((OUString*)0) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), + OUString( "invalid value type or any has no value" ), rXInterface, aArgPos ); @@ -161,7 +161,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< if ( !aItemList.hasValue( ) || aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), + OUString( "invalid value type or any has no value" ), rXInterface, aArgPos ); @@ -189,7 +189,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), + OUString( "invalid value type or any has no value" ), rXInterface, aArgPos ); @@ -202,7 +202,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc // index was not correct if ( CB_ERR == lRet ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid item position" )), + OUString( "invalid item position" ), rXInterface, aArgPos ); } @@ -241,7 +241,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), + OUString( "invalid value type or any has no value" ), rXInterface, aArgPos ); @@ -250,7 +250,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( nPos < -1 ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), + OUString("invalid index"), rXInterface, aArgPos ); @@ -258,7 +258,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( (CB_ERR == lRet) && (-1 != nPos) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), + OUString("invalid index"), rXInterface, aArgPos ); } @@ -351,7 +351,7 @@ void SAL_CALL CheckboxSetState( if ( !aState.hasValue( ) || aState.getValueType( ) != getCppuType((sal_Bool*)0) ) throw IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), + OUString( "invalid value type or any has no value" ), rXInterface, aArgPos ); diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index e9bc6ed74915..2e83bd4c04c2 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -70,7 +70,7 @@ String aEmptyStr; SAL_IMPLEMENT_MAIN() { Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + xMS = cppu::createRegistryServiceFactory( rtl::OUString( "applicat.rdb" ), sal_True ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMSch; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext; diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index a1b38ab6425a..3e274743c231 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -309,7 +309,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."); throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")), + ::rtl::OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."), m_xOwner); } @@ -714,7 +714,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.addInterface(aURL.Complete, xListener); @@ -749,7 +749,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.removeInterface(aURL.Complete, xListener); } @@ -1123,7 +1123,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume if (rInfo.AppModule.isEmpty()) { throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find out the default filter and its extension, if no application module is known!")), + ::rtl::OUString("Cant find out the default filter and its extension, if no application module is known!"), static_cast< css::frame::XDispatch* >(this)); } @@ -1166,11 +1166,11 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume css::uno::Sequence< ::rtl::OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(rtl::OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< ::rtl::OUString >()); if (lExtensions.getLength()) { - rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); + rInfo.Extension = ::rtl::OUString("."); rInfo.Extension += lExtensions[0]; } else - rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".unknown")); + rInfo.Extension = ::rtl::OUString(".unknown"); } catch(const css::uno::Exception&) { @@ -3624,7 +3624,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL) try { ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getComponentContext(m_xSMGR)); - aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), css::uno::makeAny(sal_True)); + aContent.executeCommand(::rtl::OUString("delete"), css::uno::makeAny(sal_True)); } catch(const css::uno::Exception&) { diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 6d98722542d4..4cfa131ae101 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -134,7 +134,7 @@ namespace framework ); void dispatchURL( const rtl::OUString& i_rURL, - const rtl::OUString& i_rTarget = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), + const rtl::OUString& i_rTarget = rtl::OUString( "_default" ), const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(), const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >() ); diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index 05db910f7e17..06e542a57c61 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -47,8 +47,8 @@ HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module, { d_indexDir = rtl::OUStringBuffer(outDir).append('/'). append(module).appendAscii(RTL_CONSTASCII_STRINGPARAM(".idxl")).toString(); - d_captionDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/caption")); - d_contentDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/content")); + d_captionDir = srcDir + rtl::OUString("/caption"); + d_contentDir = srcDir + rtl::OUString("/content"); } bool HelpIndexer::indexDocuments() @@ -117,7 +117,7 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) { osl::Directory dir(path); if (osl::FileBase::E_None != dir.open()) { - d_error = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error reading directory ")) + path; + d_error = rtl::OUString("Error reading directory ") + path; return true; } @@ -136,8 +136,8 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) { bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) { // Add the help path as an indexed, untokenized field. - rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#HLP#")) + - d_module + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + fileName; + rtl::OUString path = rtl::OUString("#HLP#") + + d_module + rtl::OUString("/") + fileName; std::vector<TCHAR> aPath(OUStringToTCHARVec(path)); doc->add(*_CLNEW Field(_T("path"), &aPath[0], Field::STORE_YES | Field::INDEX_UNTOKENIZED)); @@ -146,11 +146,11 @@ bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) { rtl_UriCharClassUric, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); // Add the caption as a field. - rtl::OUString captionPath = d_captionDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName; + rtl::OUString captionPath = d_captionDir + rtl::OUString("/") + sEscapedFileName; doc->add(*_CLNEW Field(_T("caption"), helpFileReader(captionPath), Field::STORE_NO | Field::INDEX_TOKENIZED)); // Add the content as a field. - rtl::OUString contentPath = d_contentDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName; + rtl::OUString contentPath = d_contentDir + rtl::OUString("/") + sEscapedFileName; doc->add(*_CLNEW Field(_T("content"), helpFileReader(contentPath), Field::STORE_NO | Field::INDEX_TOKENIZED)); return true; diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index 88a09a0d6671..b96f4a0110de 100644 --- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx +++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx @@ -64,8 +64,8 @@ namespace test::BootstrapFixture::setUp(); m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.comp.hwpimport.HwpImportFilter"))), + ::rtl::OUString( + "com.sun.comp.hwpimport.HwpImportFilter")), uno::UNO_QUERY_THROW); } @@ -74,7 +74,7 @@ namespace unsigned int, unsigned int, unsigned int) { uno::Sequence< beans::PropertyValue > aDescriptor(1); - aDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aDescriptor[0].Name = rtl::OUString("URL"); aDescriptor[0].Value <<= rURL; return m_xFilter->filter(aDescriptor); } diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 665747b5fc01..288a2374f446 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -93,8 +93,8 @@ void TestBreakIterator::testLineBreaking() { rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); { //Here we want the line break to leave text here) on the next line @@ -115,8 +115,8 @@ void TestBreakIterator::testLineBreaking() rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); + aLocale.Language = rtl::OUString("he"); + aLocale.Country = rtl::OUString("IL"); { //Here we want the line break to happen at the whitespace @@ -129,8 +129,8 @@ void TestBreakIterator::testLineBreaking() { rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("foo /bar/baz")); - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); { //Here we want the line break to leave /bar/ba clumped together on the next line @@ -144,8 +144,8 @@ void TestBreakIterator::testLineBreaking() { rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("aaa]aaa")); - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); { //Here we want the line break to move the whole lot to the next line @@ -160,8 +160,8 @@ void TestBreakIterator::testLineBreaking() void TestBreakIterator::testWordBoundaries() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); i18n::Boundary aBounds; @@ -393,8 +393,8 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=13451 { - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ES")); + aLocale.Language = rtl::OUString("ca"); + aLocale.Country = rtl::OUString("ES"); rtl::OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!"); @@ -578,8 +578,8 @@ void TestBreakIterator::testWordBoundaries() void TestBreakIterator::testGraphemeIteration() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bn")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN")); + aLocale.Language = rtl::OUString("bn"); + aLocale.Country = rtl::OUString("IN"); { const sal_Unicode BA_HALANT_LA[] = { 0x09AC, 0x09CD, 0x09AF }; @@ -623,8 +623,8 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0); } - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN")); + aLocale.Language = rtl::OUString("ta"); + aLocale.Country = rtl::OUString("IN"); { const sal_Unicode KA_VIRAMA_SSA[] = { 0x0B95, 0x0BCD, 0x0BB7 }; @@ -700,8 +700,8 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1); } - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN")); + aLocale.Language = rtl::OUString("hi"); + aLocale.Country = rtl::OUString("IN"); { const sal_Unicode SHA_VOWELSIGNII[] = { 0x936, 0x940 }; @@ -725,8 +725,8 @@ void TestBreakIterator::testGraphemeIteration() void TestBreakIterator::testWeak() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); { const sal_Unicode WEAKS[] = @@ -766,8 +766,8 @@ void TestBreakIterator::testWeak() void TestBreakIterator::testAsian() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = rtl::OUString("en"); + aLocale.Country = rtl::OUString("US"); { const sal_Unicode ASIANS[] = @@ -802,8 +802,8 @@ void TestBreakIterator::testAsian() void TestBreakIterator::testThai() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); + aLocale.Language = rtl::OUString("th"); + aLocale.Country = rtl::OUString("TH"); //See http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html { @@ -855,8 +855,8 @@ void TestBreakIterator::testThai() void TestBreakIterator::testNorthernThai() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); + aLocale.Language = rtl::OUString("nod"); + aLocale.Country = rtl::OUString("TH"); const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); @@ -876,8 +876,8 @@ void TestBreakIterator::testNorthernThai() void TestBreakIterator::testKhmer() { lang::Locale aLocale; - aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("km")); - aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KH")); + aLocale.Language = rtl::OUString("km"); + aLocale.Country = rtl::OUString("KH"); const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 }; diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 69b6c9f2eaa8..7e99ec2fd419 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -59,8 +59,8 @@ private: void TestCharacterClassification::testTitleCase() { lang::Locale aLocale; - aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = ::rtl::OUString("en"); + aLocale.Country = ::rtl::OUString("US"); { //basic example diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index efce89b1b8ca..684555ce75b3 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -304,7 +304,7 @@ sal_Bool AstService::dump(RegistryKey& rKey) if (m_defaultConstructor) { writer.setMethodData( constructorIndex++, emptyStr, RT_MODE_TWOWAY, - emptyStr, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), + emptyStr, rtl::OUString("void"), 0, 0); } sal_uInt32 size; @@ -396,7 +396,7 @@ void AstAttribute::dumpExceptions( writer.setMethodData( idx, documentation, flags, OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), 0, + rtl::OUString("void"), 0, static_cast< sal_uInt16 >(exceptions.size())); sal_uInt16 exceptionIndex = 0; for (DeclList::const_iterator i(exceptions.begin()); diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx index f1d11174a057..b4aa3f74354e 100644 --- a/idlc/source/astoperation.cxx +++ b/idlc/source/astoperation.cxx @@ -48,7 +48,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index) rtl::OUString returnTypeName; if (m_pReturnType == 0) { - returnTypeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")); + returnTypeName = rtl::OUString("void"); } else { returnTypeName = rtl::OStringToOUString( m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8); diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 1acbf8440ede..13a8b3fa63c1 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -289,7 +289,7 @@ sal_Int32 compileFile(const OString * pathname) } while( nIndex != -1 ); } - lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-o"))); + lCppArgs.push_back(OUString("-o")); cppArgs.append(preprocFile); lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); @@ -308,9 +308,9 @@ sal_Int32 compileFile(const OString * pathname) cpp = cpp.copy(0, idx); #if defined(SAL_W32) - cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp.exe")); + cpp += OUString("ucpp.exe"); #else - cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp")); + cpp += OUString("ucpp"); #endif #else // SYSTEM_UCPP cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP)); diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index 67eef0311b5f..44f6244a0915 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -153,7 +153,7 @@ void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInte { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); ERROR_ASSERT( ! info->supportsService( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb") ) ), "XServiceInfo test failed" ); + OUString("bla bluzb") ), "XServiceInfo test failed" ); } } @@ -165,7 +165,7 @@ sal_Int32 OPipeTest::test( sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) == TestName ) { + if( OUString("com.sun.star.io.Pipe") == TestName ) { try { if( 0 == hTestHandle ) { diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index 4887a066718a..99f9a1404826 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -46,57 +46,57 @@ sal_Bool SAL_CALL component_writeInfo( Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey * >( pRegistryKey ) ); - OUString str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + OUString str = OUString("/") + OPipeTest_getImplementationName() + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); Reference< XRegistryKey > xNewKey = xKey->createKey( str ); xNewKey->createKey( OPipeTest_getServiceName() ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OPumpTest_getImplementationName() + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OPumpTest_getServiceName() ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + ODataStreamTest_getImplementationName(1) + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( ODataStreamTest_getServiceName(1) ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + ODataStreamTest_getImplementationName(2) + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( ODataStreamTest_getServiceName(2) ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OObjectStreamTest_getImplementationName(1) + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OObjectStreamTest_getServiceName(1) ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OObjectStreamTest_getImplementationName(2) + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OObjectStreamTest_getServiceName(2) ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OMarkableOutputStreamTest_getImplementationName() + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OMarkableOutputStreamTest_getServiceName() ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OMarkableInputStreamTest_getImplementationName() + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OMarkableInputStreamTest_getServiceName() ); - str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + str = OUString("/") + OMyPersistObject_getImplementationName() + - OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); + OUString("/UNO/SERVICES"); xNewKey = xKey->createKey( str ); xNewKey->createKey( OMyPersistObject_getServiceName() ); diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index d73a058f2348..fdcad2711a4a 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -74,13 +74,11 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "UnoVirtualMachine" ) ), + rtl::OUString( "UnoVirtualMachine" ), css::uno::makeAny( handle ) ) ) ); return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.java.JavaVirtualMachine")), + "com.sun.star.java.JavaVirtualMachine"), css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext ); } @@ -90,8 +88,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith { return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.java.JavaVirtualMachine")), + "com.sun.star.java.JavaVirtualMachine"), args, xContext ); } @@ -126,8 +123,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); ::cppu::ContextEntry_Init entry( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.java.theJavaVirtualMachine")), + "/singletons/com.sun.star.java.theJavaVirtualMachine"), css::uno::makeAny( xFac ), true ); return ::cppu::createComponentContext( &entry, 1, xContext ); } diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx index 5fc4a7e38ea7..f0513352c550 100644 --- a/jvmaccess/source/classpath.cxx +++ b/jvmaccess/source/classpath.cxx @@ -72,8 +72,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls( } catch (const css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.lang.IllegalArgumentException: ")) + "com.sun.star.lang.IllegalArgumentException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index e0339eb3f409..0723910b566f 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -168,7 +168,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) return false; if (m_sJavaHome.isEmpty()) - m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")); + m_sJavaHome = rtl::OUString("file:///usr/lib"); // init m_sRuntimeLibrary OSL_ASSERT(!m_sHome.isEmpty()); @@ -233,9 +233,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) #ifdef X86_64 //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead - if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"))) + if (!bRt && m_sJavaHome != rtl::OUString("file:///usr/lib")) { - m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64")); + m_sHome = rtl::OUString("file:///usr/lib64"); for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 662f66d6f2d2..7b6901aed5ec 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -394,7 +394,7 @@ bool getJavaProps(const OUString & exePath, //prepare the arguments sal_Int32 cArgs = 3; - OUString arg1 = OUString(RTL_CONSTASCII_USTRINGPARAM("-classpath"));// + sClassPath; + OUString arg1 = OUString("-classpath");// + sClassPath; OUString arg2 = sClassPath; OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties")); OUString arg4 = "noaccessibility"; @@ -904,7 +904,7 @@ rtl::Reference<VendorBase> getJREInfoByPath( sFullPath = sResolvedDir + (*i); else sFullPath = sResolvedDir + - OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + (*i); + OUString("/") + (*i); sFilePath = resolveFilePath(sFullPath); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx index ffc7d7e5fcc9..cab102757f64 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx @@ -74,7 +74,7 @@ struct SameOrSubDirJREMap if (s1 == s2.first) return true; rtl::OUString sSub; - sSub = s2.first + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + sSub = s2.first + rtl::OUString("/"); if (s1.match(sSub) == sal_True) return true; return false; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 6bfe53af7b62..03a575a5708d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -157,7 +157,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi } jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos"))); + rtl::OUString("jfw_plugin_getAllJavaInfos")); #else jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = jfw_plugin_getAllJavaInfos; @@ -193,7 +193,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi #ifndef DISABLE_DYNLOADING jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); + rtl::OUString("jfw_plugin_getJavaInfoByPath")); OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); if (jfw_plugin_getJavaInfoByPathFunc == NULL) return JFW_E_ERROR; @@ -543,7 +543,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos"))); + rtl::OUString("jfw_plugin_getAllJavaInfos")); #else jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = jfw_plugin_getAllJavaInfos; @@ -629,7 +629,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) //get the function from the plugin jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); + rtl::OUString("jfw_plugin_getJavaInfoByPath")); #else jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = jfw_plugin_getJavaInfoByPath; @@ -872,7 +872,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); + rtl::OUString("jfw_plugin_getJavaInfoByPath")); #else jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = jfw_plugin_getJavaInfoByPath; diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 0ec6231f726e..c9da3c947729 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -228,10 +228,10 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , rtl::OUString sSourceText( pXMLElement->ToOUString(). replaceAll( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")), + rtl::OUString("\n"), rtl::OUString()). replaceAll( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")), + rtl::OUString("\t"), rtl::OUString())); // re-add spaces to the beginning of translated string, // important for indentation of Basic code examples diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index 172c7753d574..b31c88c74385 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -152,7 +152,7 @@ public: inline OUString SpellChecker::getImplementationName_Static() throw() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" )); + return ::rtl::OUString( "com.sun.star.lingu.examples.SpellChecker" ); } diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 898c1584adbd..22e94a0a983e 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1497,7 +1497,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes() const char * table_types[] = {"TABLE", "VIEW"}; sal_Int32 requiredVersion[] = {0, 50000}; - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); @@ -1519,7 +1519,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getTypeInfo"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1563,7 +1563,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() { OSL_TRACE("ODatabaseMetaData::getCatalogs"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; try { @@ -1598,7 +1598,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() { OSL_TRACE("ODatabaseMetaData::getSchemas"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; try { @@ -1643,7 +1643,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getColumnPrivileges"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1686,7 +1686,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getColumns"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), @@ -1739,7 +1739,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > xResultSet(getOwnConnection(). getDriver().getFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1811,7 +1811,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getProcedures"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1856,7 +1856,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getVersionColumns"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; lcl_setRows_throw(xResultSet, 16,rRows); return xResultSet; @@ -1872,7 +1872,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getExportedKeys"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), @@ -1913,7 +1913,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( { OSL_TRACE("ODatabaseMetaData::getImportedKeys"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1954,7 +1954,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getPrimaryKeys"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1997,7 +1997,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getIndexInfo"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -2040,7 +2040,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -2081,7 +2081,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getTablePrivileges"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -2146,7 +2146,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getCrossReference"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); + Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 1ee31493a154..bda703152022 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -36,11 +36,11 @@ namespace mysqlc_sdbc_driver void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException ) throw (SQLException) { - const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": feature not implemented." ) ); + const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": feature not implemented." ); throw SQLException( sMessage, _rxContext, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")), + ::rtl::OUString("HYC00"), 0, _pNextException ? *_pNextException : Any() ); @@ -50,11 +50,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException ) throw (SQLException) { - const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": invalid arguments." ) ); + const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": invalid arguments." ); throw SQLException( sMessage, _rxContext, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")), + ::rtl::OUString("HYC00"), 0, _pNextException ? *_pNextException : Any() ); diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index e0659baf2d0d..c428dd7ab2ca 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -56,7 +56,7 @@ OUString SAL_CALL OResultSet::getImplementationName() throw (RuntimeException) { OSL_TRACE("OResultSet::getImplementationName"); - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.mysqlc.ResultSet" ) ); + return ::rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" ); } /* }}} */ @@ -67,8 +67,8 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() { OSL_TRACE("OResultSet::getSupportedServiceNames"); Sequence< OUString > aSupported(2); - aSupported[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.ResultSet" ) ); - aSupported[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.ResultSet" ) ); + aSupported[0] = OUString( "com.sun.star.sdbc.ResultSet" ); + aSupported[1] = OUString( "com.sun.star.sdbcx.ResultSet" ); return (aSupported); } /* }}} */ diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx index 8fac61698cca..ce483459483e 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx @@ -66,7 +66,7 @@ static void ShowMessageBox( const Reference< XToolkit >& rToolkit, const Referen // describe window properties. WindowDescriptor aDescriptor; aDescriptor.Type = WindowClass_MODALTOP; - aDescriptor.WindowServiceName = OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" )); + aDescriptor.WindowServiceName = OUString( "infobox" ); aDescriptor.ParentIndex = -1; aDescriptor.Parent = Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ); aDescriptor.Bounds = Rectangle(0,0,300,200); @@ -139,21 +139,21 @@ void SAL_CALL Addon::dispatch( const URL& aURL, const Sequence < PropertyValue > if ( aURL.Path.compareToAscii( "Function1" ) == 0 ) { ShowMessageBox( mxToolkit, mxFrame, - OUString( RTL_CONSTASCII_USTRINGPARAM( "SDK Add-On example" )), - OUString( RTL_CONSTASCII_USTRINGPARAM( "Function 1 activated" )) ); + OUString( "SDK Add-On example" ), + OUString( "Function 1 activated" ) ); } else if ( aURL.Path.compareToAscii( "Function2" ) == 0 ) { ShowMessageBox( mxToolkit, mxFrame, - OUString( RTL_CONSTASCII_USTRINGPARAM( "SDK Add-On example" )), - OUString( RTL_CONSTASCII_USTRINGPARAM( "Function 2 activated" )) ); + OUString( "SDK Add-On example" ), + OUString( "Function 2 activated" ) ); } else if ( aURL.Path.compareToAscii( "Help" ) == 0 ) { // Show info box ShowMessageBox( mxToolkit, mxFrame, - OUString( RTL_CONSTASCII_USTRINGPARAM( "About SDK Add-On example" )), - OUString( RTL_CONSTASCII_USTRINGPARAM( "This is the SDK Add-On example" )) ); + OUString( "About SDK Add-On example" ), + OUString( "This is the SDK Add-On example" ) ); } } } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx index 849667b74964..0dd690995dcd 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx @@ -61,11 +61,11 @@ SAL_IMPLEMENT_MAIN() my_module::MyService1::create(xContext); // call methodOne and print the return value on stdout - OUString s = xSomething->methodOne(OUString(RTL_CONSTASCII_USTRINGPARAM("Hello World!"))); + OUString s = xSomething->methodOne(OUString("Hello World!")); fprintf(stdout,"\nCreate new instance of MyService1\nCall of XSomething.methOne at MyService1 = %s", OUStringToOString( s, RTL_TEXTENCODING_ASCII_US ).getStr()); // create a new instance of MyService2 with the specified string argument - xSomething = my_module::MyService2::create(xContext, OUString(RTL_CONSTASCII_USTRINGPARAM("Hello My World!"))); + xSomething = my_module::MyService2::create(xContext, OUString("Hello My World!")); // call methodTwo and print the return value of methodTwo s = xSomething->methodTwo(); diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 606c8385f7c0..4eb89c3cd72d 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -54,14 +54,14 @@ namespace my_sc_impl Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl() { Sequence< OUString > names(1); - names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("my_module.MyService1")); + names[0] = OUString("my_module.MyService1"); return names; } OUString SAL_CALL getImplementationName_MyService1Impl() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "my_module.my_sc_implementation.MyService1") ); + return OUString( + "my_module.my_sc_implementation.MyService1"); } @@ -224,8 +224,8 @@ OUString MyService1Impl::getImplementationName() throw (RuntimeException) { // unique implementation name - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "my_module.my_sc_implementation.MyService1") ); + return OUString( + "my_module.my_sc_implementation.MyService1"); } sal_Bool MyService1Impl::supportsService( OUString const & serviceName ) throw (RuntimeException) diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index af999111d893..ba6bf5d29410 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -60,14 +60,14 @@ extern Reference< XInterface > SAL_CALL create_MyService1Impl( static Sequence< OUString > getSupportedServiceNames_MyService2Impl() { Sequence<OUString> names(1); - names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("my_module.MyService2")); + names[0] = OUString("my_module.MyService2"); return names; } static OUString getImplementationName_MyService2Impl() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "my_module.my_sc_implementation.MyService2") ); + return OUString( + "my_module.my_sc_implementation.MyService2"); } class MyService2Impl : public ::cppu::WeakImplHelper3< @@ -112,8 +112,8 @@ void MyService2Impl::initialize( Sequence< Any > const & args ) if (args.getLength() != 1) { throw lang::IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "give a string instanciating this component!") ), + OUString( + "give a string instanciating this component!"), // resolve to XInterface reference: static_cast< ::cppu::OWeakObject * >(this), 0 ); // argument pos @@ -121,8 +121,8 @@ void MyService2Impl::initialize( Sequence< Any > const & args ) if (! (args[ 0 ] >>= m_sData)) { throw lang::IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "no string given as argument!") ), + OUString( + "no string given as argument!"), // resolve to XInterface reference: static_cast< ::cppu::OWeakObject * >(this), 0 ); // argument pos @@ -150,8 +150,8 @@ OUString MyService2Impl::getImplementationName() throw (RuntimeException) { // unique implementation name - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "my_module.my_sc_implementation.MyService2") ); + return OUString( + "my_module.my_sc_implementation.MyService2"); } sal_Bool MyService2Impl::supportsService( OUString const & serviceName ) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index 71ccd97c0597..66432c73bcd4 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -208,7 +208,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments ) OUString FilterDetect_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "devguide.officedev.samples.filter.FlatXmlDetect" ) ); + return OUString( "devguide.officedev.samples.filter.FlatXmlDetect" ); } #define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection" diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx index 780c18ebcd5b..fe7354d48443 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx @@ -76,8 +76,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // open a spreadsheet document Reference< XComponent > xComponent( xComponentLoader->loadComponentFromURL( - OUString( RTL_CONSTASCII_USTRINGPARAM( "private:factory/scalc" ) ), - OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, + OUString( "private:factory/scalc" ), + OUString( "_blank" ), 0, Sequence < ::com::sun::star::beans::PropertyValue >() ) ); if ( !xComponent.is() ) { diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index efa527c89027..057fe46ef372 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -54,7 +54,7 @@ void BaseDispatch::ShowMessageBox( const Reference< XFrame >& rFrame, const ::rt Reference< XMessageBox > xMsgBox = xMsgBoxFactory->createMessageBox( Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ), Rectangle(0,0,300,200), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" ) ), + rtl::OUString( "infobox" ), MessageBoxButtons::BUTTONS_OK, aTitle, aMsgText ); diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index d4cf90cc066e..08a5ad2fb8e8 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -9483,41 +9483,41 @@ class ShapeCflowChartProcess : public CustomShapeProvider } // anonymous namespace void CustomShapeProperties::initializePresetsMap5() { - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout3" ) ) ) ] = new ShapeCaccentCallout3(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftCircularArrow" ) ) ) ] = new ShapeCleftCircularArrow(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightArrow" ) ) ) ] = new ShapeCrightArrow(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPunchedCard" ) ) ) ] = new ShapeCflowChartPunchedCard(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snip2DiagRect" ) ) ) ] = new ShapeCsnip2DiagRect(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "verticalScroll" ) ) ) ] = new ShapeCverticalScroll(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star7" ) ) ) ] = new ShapeCstar7(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chartX" ) ) ) ] = new ShapeCchartX(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cloud" ) ) ) ] = new ShapeCcloud(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cube" ) ) ) ] = new ShapeCcube(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "round2DiagRect" ) ) ) ] = new ShapeCround2DiagRect(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMultidocument" ) ) ) ] = new ShapeCflowChartMultidocument(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonDocument" ) ) ) ] = new ShapeCactionButtonDocument(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartTerminator" ) ) ) ] = new ShapeCflowChartTerminator(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDelay" ) ) ) ] = new ShapeCflowChartDelay(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector5" ) ) ) ] = new ShapeCcurvedConnector5(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "horizontalScroll" ) ) ) ] = new ShapeChorizontalScroll(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector4" ) ) ) ] = new ShapeCbentConnector4(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightCircularArrow" ) ) ) ] = new ShapeCleftRightCircularArrow(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wedgeRectCallout" ) ) ) ] = new ShapeCwedgeRectCallout(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout2" ) ) ) ] = new ShapeCaccentCallout2(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMagneticDrum" ) ) ) ] = new ShapeCflowChartMagneticDrum(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "corner" ) ) ) ] = new ShapeCcorner(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "borderCallout2" ) ) ) ] = new ShapeCborderCallout2(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "donut" ) ) ) ] = new ShapeCdonut(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartCollate" ) ) ) ] = new ShapeCflowChartCollate(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathNotEqual" ) ) ) ] = new ShapeCmathNotEqual(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector2" ) ) ) ] = new ShapeCbentConnector2(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathMultiply" ) ) ) ] = new ShapeCmathMultiply(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "heptagon" ) ) ) ] = new ShapeCheptagon(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rect" ) ) ) ] = new ShapeCrect(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentBorderCallout2" ) ) ) ] = new ShapeCaccentBorderCallout2(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "pieWedge" ) ) ) ] = new ShapeCpieWedge(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "upArrowCallout" ) ) ) ] = new ShapeCupArrowCallout(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartProcess" ) ) ) ] = new ShapeCflowChartProcess(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentCallout3" ) ) ] = new ShapeCaccentCallout3(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "leftCircularArrow" ) ) ] = new ShapeCleftCircularArrow(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "rightArrow" ) ) ] = new ShapeCrightArrow(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartPunchedCard" ) ) ] = new ShapeCflowChartPunchedCard(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "snip2DiagRect" ) ) ] = new ShapeCsnip2DiagRect(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "verticalScroll" ) ) ] = new ShapeCverticalScroll(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "star7" ) ) ] = new ShapeCstar7(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "chartX" ) ) ] = new ShapeCchartX(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "cloud" ) ) ] = new ShapeCcloud(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "cube" ) ) ] = new ShapeCcube(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "round2DiagRect" ) ) ] = new ShapeCround2DiagRect(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartMultidocument" ) ) ] = new ShapeCflowChartMultidocument(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "actionButtonDocument" ) ) ] = new ShapeCactionButtonDocument(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartTerminator" ) ) ] = new ShapeCflowChartTerminator(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartDelay" ) ) ] = new ShapeCflowChartDelay(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "curvedConnector5" ) ) ] = new ShapeCcurvedConnector5(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "horizontalScroll" ) ) ] = new ShapeChorizontalScroll(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "bentConnector4" ) ) ] = new ShapeCbentConnector4(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "leftRightCircularArrow" ) ) ] = new ShapeCleftRightCircularArrow(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "wedgeRectCallout" ) ) ] = new ShapeCwedgeRectCallout(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentCallout2" ) ) ] = new ShapeCaccentCallout2(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartMagneticDrum" ) ) ] = new ShapeCflowChartMagneticDrum(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "corner" ) ) ] = new ShapeCcorner(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "borderCallout2" ) ) ] = new ShapeCborderCallout2(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "donut" ) ) ] = new ShapeCdonut(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartCollate" ) ) ] = new ShapeCflowChartCollate(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "mathNotEqual" ) ) ] = new ShapeCmathNotEqual(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "bentConnector2" ) ) ] = new ShapeCbentConnector2(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "mathMultiply" ) ) ] = new ShapeCmathMultiply(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "heptagon" ) ) ] = new ShapeCheptagon(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "rect" ) ) ] = new ShapeCrect(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentBorderCallout2" ) ) ] = new ShapeCaccentBorderCallout2(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "pieWedge" ) ) ] = new ShapeCpieWedge(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "upArrowCallout" ) ) ] = new ShapeCupArrowCallout(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartProcess" ) ) ] = new ShapeCflowChartProcess(); } } } // oox // drawingml diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx index 0ceb8fcb1d5c..169550f3376a 100644 --- a/padmin/source/adddlg.hxx +++ b/padmin/source/adddlg.hxx @@ -85,7 +85,7 @@ class APChooseDriverPage : public APTabPage DECL_LINK( ClickBtnHdl, PushButton* ); DECL_LINK( DelPressedHdl, ListBox* ); - void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ); + void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( "SGENPRT" ) ); public: APChooseDriverPage( AddPrinterDialog* pParent ); ~APChooseDriverPage(); diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 3905360818ee..eb9667f10427 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -86,7 +86,7 @@ static PyRef getLoaderModule() throw( RuntimeException ) if( !module.is() ) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "pythonloader: Couldn't load pythonloader module" ) ), + OUString( "pythonloader: Couldn't load pythonloader module" ), Reference< XInterface > () ); } return PyRef( PyModule_GetDict( module.get() )); @@ -108,7 +108,7 @@ static PyRef getObjectFromLoaderModule( const char * func ) OUString getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.pyuno.Loader" ) ); + return OUString( "org.openoffice.comp.pyuno.Loader" ); } Sequence< OUString > getSupportedServiceNames() @@ -189,8 +189,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c rtl::Bootstrap bootstrap(path); // look for pythonhome - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome ); - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath ); + bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONHOME"), pythonHome ); + bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONPATH" ) , pythonPath ); // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console // sadly, there is no api for setting the pythonpath, we have to use the environment variable diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index efc1d62ba670..d42aa20589e6 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -72,7 +72,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef { OSL_ASSERT( pVal ); if (pTypeRef->eTypeClass == typelib_TypeClass_VOID) - return OUString( RTL_CONSTASCII_USTRINGPARAM("void") ); + return OUString("void"); OUStringBuffer buf( 64 ); buf.append( (sal_Unicode)'(' ); diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index 08b76ad78a25..968f52bb9f9e 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -138,8 +138,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName ) { throw RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "pyuno bridge: Couldn't get reflection for method ")) + "pyuno bridge: Couldn't get reflection for method ") + functionName), Reference< XInterface > () ); } diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index f8231045bcf2..de051b2727f7 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -101,7 +101,7 @@ public: , nMembersSet (0) { if ( ! used ) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("pyuno._createUnoStructHelper failed to create new dictionary")), Reference< XInterface > ()); + throw RuntimeException(OUString("pyuno._createUnoStructHelper failed to create new dictionary"), Reference< XInterface > ()); } ~fillStructState() { diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index a5577bea4de9..437cafe348ef 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -149,12 +149,12 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl ) Reference< XConnector > xConnector( _xSMgr->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector") ), + OUString("com.sun.star.connection.Connector"), _xCtx ), UNO_QUERY ); if (! xConnector.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no connector!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("no connector!" ), Reference< XInterface >() ); Reference< XConnection > xConnection( xConnector->connect( aConnectDescr ) ); diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 6cd65d95d73d..9d5e56f89c85 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -209,7 +209,7 @@ void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFixedLine")); + return ::rtl::OUString("com.sun.star.comp.report.OFixedLine"); } //-------------------------------------------------------------------------- @@ -526,7 +526,7 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper // XShapeDescriptor ::rtl::OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")); + return ::rtl::OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 2d127a1eac0f..de2ff89b7c82 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -99,7 +99,7 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFixedText")); + return ::rtl::OUString("com.sun.star.comp.report.OFixedText"); } //-------------------------------------------------------------------------- @@ -321,7 +321,7 @@ void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::Proper // XShapeDescriptor ::rtl::OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")); + return ::rtl::OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 4f42791f01a6..96d9df3c4c3b 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -64,7 +64,7 @@ void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFormatCondition")); + return ::rtl::OUString("com.sun.star.comp.report.OFormatCondition"); } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index a05fc557f320..9f5462fe01db 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -107,7 +107,7 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFormattedField")); + return ::rtl::OUString("com.sun.star.comp.report.OFormattedField"); } //-------------------------------------------------------------------------- @@ -120,7 +120,7 @@ uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; - aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel")); + aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.UnoControlFormattedFieldModel"); return aServices; } @@ -262,7 +262,7 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm { uno::Reference< beans::XPropertySet> xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY); if ( xProp.is() ) - m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatsSupplier"))),uno::UNO_QUERY); + m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString("NumberFormatsSupplier")),uno::UNO_QUERY); } } return m_xFormatsSupplier; @@ -364,7 +364,7 @@ void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::P // XShapeDescriptor ::rtl::OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")); + return ::rtl::OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- // ============================================================================= diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 4065403d4918..36bbd10b703e 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -64,7 +64,7 @@ void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFunction")); + return ::rtl::OUString("com.sun.star.comp.report.OFunction"); } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index 5e2288ffd14a..ba056faf96ba 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -80,7 +80,7 @@ IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet) //-------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Group")); + return ::rtl::OUString("com.sun.star.comp.report.Group"); } //------------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) @@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::GroupOn")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupOn") ,*this ,1 ,m_xContext); @@ -220,7 +220,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno: void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::KeepTogether")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::KeepTogether") ,*this ,1 ,m_xContext); diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 99081f7159c7..d083e8d9da2c 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -173,7 +173,7 @@ void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OImageControl")); + return ::rtl::OUString("com.sun.star.comp.report.OImageControl"); } //-------------------------------------------------------------------------- @@ -458,7 +458,7 @@ void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::Pro // XShapeDescriptor ::rtl::OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")); + return ::rtl::OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 33af30cbc1d0..4f87302f31de 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -83,11 +83,11 @@ OFormatProperties::OFormatProperties() SvtLinguConfig aLinguConfig; using namespace ::com::sun::star::i18n::ScriptType; - aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))) >>= aCharLocale; + aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale")) >>= aCharLocale; LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocale).getLanguageType(false), LATIN); - aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK"))) >>= aCharLocaleAsian; + aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian; LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleAsian).getLanguageType(false), ASIAN); - aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL"))) >>= aCharLocaleComplex; + aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex; LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleComplex).getLanguageType(false), COMPLEX); Font aLatin,aCJK,aCTL; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 09bf83fbdc74..c4cf461c3281 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -209,15 +209,15 @@ void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::b uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY); sal_Int32 nOpenMode = embed::ElementModes::READ; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode"))) >>= nOpenMode; + xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nOpenMode; _rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE); } void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs ) { - _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" ) ) ); - _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ) ); - _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ) ); + _rDescriptor.erase( ::rtl::OUString( "StatusIndicator" ) ); + _rDescriptor.erase( ::rtl::OUString( "InteractionHandler" ) ); + _rDescriptor.erase( ::rtl::OUString( "Model" ) ); _rDescriptor >> _rArgs; } // ----------------------------------------------------------------------------- @@ -515,13 +515,13 @@ namespace { uno::Sequence < beans::PropertyValue > aArgs( 3); sal_Int32 nLen = 0; - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")); + aArgs[nLen].Name = ::rtl::OUString("AsTemplate"); aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + aArgs[nLen].Name = ::rtl::OUString("ReadOnly"); aArgs[nLen++].Value <<= sal_True; - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden")); + aArgs[nLen].Name = ::rtl::OUString("Hidden"); aArgs[nLen++].Value <<= sal_True; ::comphelper::MimeConfigurationHelper aHelper(m_xContext); @@ -750,8 +750,8 @@ void OReportDefinition::init() m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM ); SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin(); rAdmin.NewStandardLayer(RPT_LAYER_FRONT); - rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("back")), RPT_LAYER_BACK); - rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenLayer")), RPT_LAYER_HIDDEN); + rAdmin.NewLayer(rtl::OUString("back"), RPT_LAYER_BACK); + rAdmin.NewLayer(rtl::OUString("HiddenLayer"), RPT_LAYER_HIDDEN); m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex ); m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() ); @@ -764,9 +764,9 @@ void OReportDefinition::init() if ( xStorProps.is()) { ::rtl::OUString sMediaType; - xStorProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"))) >>= sMediaType; + xStorProps->getPropertyValue( ::rtl::OUString("MediaType")) >>= sMediaType; if ( sMediaType.isEmpty() ) - xStorProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT)); + xStorProps->setPropertyValue( ::rtl::OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT)); } m_pImpl->m_pObjectContainer.reset( new comphelper::EmbeddedObjectContainer(m_pImpl->m_xStorage , static_cast<cppu::OWeakObject*>(this) ) ); } @@ -784,7 +784,7 @@ void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::disposing() { - notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnload"))); + notifyEvent(::rtl::OUString("OnUnload")); uno::Reference< frame::XModel > xHoldAlive( this ); @@ -837,7 +837,7 @@ void SAL_CALL OReportDefinition::disposing() // ----------------------------------------------------------------------------- ::rtl::OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportDefinition")); + return ::rtl::OUString("com.sun.star.comp.report.OReportDefinition"); } //-------------------------------------------------------------------------- @@ -926,7 +926,7 @@ void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) t void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException) { if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::GroupKeepTogether")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupKeepTogether") ,*this ,1 ,m_aProps->m_xContext); @@ -942,7 +942,7 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException) { if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ReportPrintOption")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption") ,*this ,1 ,m_aProps->m_xContext); @@ -958,7 +958,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException) { if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ReportPrintOption")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption") ,*this ,1 ,m_aProps->m_xContext); @@ -985,7 +985,7 @@ void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) t void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException) { if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::sdb::CommandType")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::sdb::CommandType") ,*this ,1 ,m_aProps->m_xContext); @@ -1293,11 +1293,11 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor) { uno::Sequence<beans::PropertyValue> aComponentData; - aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComponentData")),aComponentData); + aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("ComponentData"),aComponentData); if ( aComponentData.getLength() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) ) { ::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData ); - m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),m_pImpl->m_xActiveConnection); + m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),m_pImpl->m_xActiveConnection); m_pImpl->m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_pImpl->m_xActiveConnection); } if ( !m_pImpl->m_xNumberFormatsSupplier.is() ) @@ -1306,7 +1306,7 @@ void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor) } lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs ); ::rtl::OUString sCaption; - sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")),sCaption); + sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("DocumentTitle"),sCaption); setCaption(sCaption); } // ----------------------------------------------------------------------------- @@ -1395,7 +1395,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor ); fillArgs(aDescriptor); - aDescriptor.createItemIfMissing(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),uno::makeAny(_xStorageToLoadFrom)); + aDescriptor.createItemIfMissing(::rtl::OUString("Storage"),uno::makeAny(_xStorageToLoadFrom)); uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength()); uno::Any* pIter = aDelegatorArguments.getArray(); @@ -1407,7 +1407,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< sal_Int32 nPos = aDelegatorArguments.getLength(); aDelegatorArguments.realloc(nPos+1); beans::PropertyValue aPropVal; - aPropVal.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")); + aPropVal.Name = ::rtl::OUString("Storage"); aPropVal.Value <<= _xStorageToLoadFrom; aDelegatorArguments[nPos] <<= aPropVal; @@ -1415,7 +1415,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv); { uno::Reference< document::XFilter > xFilter( - m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportFilter")),aDelegatorArguments,m_aProps->m_xContext), + m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext), uno::UNO_QUERY_THROW ); uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW); @@ -1485,14 +1485,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); SvtSaveOptions aSaveOpt; - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")), uno::makeAny(aSaveOpt.IsPrettyPrinting())); + xInfoSet->setPropertyValue(rtl::OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting())); if ( aSaveOpt.IsSaveRelFSys() ) { const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) ); - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal)); + xInfoSet->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal)); } - const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) ); - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName)); + const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) ); + xInfoSet->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); sal_Int32 nArgsLen = aDelegatorArguments.getLength(); @@ -1515,7 +1515,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference<XComponent> xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY); if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml")))); + xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("settings.xml"))); if( !WriteThroughComponent( xCom, "settings.xml", "com.sun.star.comp.report.XMLSettingsExporter", @@ -1524,14 +1524,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml")); + sWarnFile = ::rtl::OUString("settings.xml"); } } } if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")))); + xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("meta.xml"))); if( !WriteThroughComponent( xCom, "meta.xml", "com.sun.star.comp.report.XMLMetaExporter", @@ -1540,14 +1540,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); + sWarnFile = ::rtl::OUString("meta.xml"); } } } if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")))); + xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("styles.xml"))); if( !WriteThroughComponent( xCom, "styles.xml", "com.sun.star.comp.report.XMLStylesExporter", @@ -1556,21 +1556,21 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")); + sWarnFile = ::rtl::OUString("styles.xml"); } } } if ( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")))); + xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("content.xml"))); if( !WriteThroughComponent( xCom, "content.xml", "com.sun.star.comp.report.ExportFilter", aDelegatorArguments, aProps, _xStorageToSaveTo ) ) { bErr = sal_True; - sErrFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")); + sErrFile = ::rtl::OUString("content.xml"); } } @@ -1844,7 +1844,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { if ( i == nLastOpenMode ) throw lang::WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occurred while creating the document storage." ) ), + ::rtl::OUString( "An error occurred while creating the document storage." ), // TODO: resource *this, ::cppu::getCaughtException() @@ -1968,7 +1968,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool _bModified ) throw (bea lang::EventObject aEvent(*this); aGuard.clear(); m_pImpl->m_aModifyListeners.notifyEach(&util::XModifyListener::modified,aEvent); - notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged"))); + notifyEvent(::rtl::OUString("OnModifyChanged")); } } // ----------------------------------------------------------------------------- @@ -2233,14 +2233,14 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co if ( aServiceSpecifier.indexOf( "com.sun.star.report." ) == 0 ) { if ( aServiceSpecifier == SERVICE_SHAPE ) - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW); else if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD || aServiceSpecifier == SERVICE_FIXEDTEXT || aServiceSpecifier == SERVICE_FIXEDLINE || aServiceSpecifier == SERVICE_IMAGECONTROL ) - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW); else - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW); } else if ( aServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) { @@ -2252,10 +2252,10 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co ) { uno::Reference< style::XStyle> xStyle = new OStyle(); - xStyle->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default"))); + xStyle->setName(::rtl::OUString("Default")); uno::Reference<beans::XPropertySet> xProp(xStyle,uno::UNO_QUERY); ::rtl::OUString sTray; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTray")))>>= sTray; + xProp->getPropertyValue(::rtl::OUString("PrinterPaperTray"))>>= sTray; return xStyle.get(); } @@ -2349,25 +2349,25 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableService { static const ::rtl::OUString aSvxComponentServiceNameList[] = { - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.NamespaceMap")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable")) + ::rtl::OUString("com.sun.star.form.component.FixedText"), + ::rtl::OUString("com.sun.star.form.component.DatabaseImageControl"), + ::rtl::OUString("com.sun.star.style.PageStyle"), + ::rtl::OUString("com.sun.star.style.GraphicStyle"), + ::rtl::OUString("com.sun.star.style.FrameStyle"), + ::rtl::OUString("com.sun.star.drawing.Defaults"), + ::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"), + ::rtl::OUString("com.sun.star.document.ExportEmbeddedObjectResolver"), + ::rtl::OUString("com.sun.star.document.ImportGraphicObjectResolver"), + ::rtl::OUString("com.sun.star.document.ExportGraphicObjectResolver"), + ::rtl::OUString("com.sun.star.chart2.data.DataProvider"), + ::rtl::OUString("com.sun.star.xml.NamespaceMap"), + ::rtl::OUString("com.sun.star.document.Settings"), + ::rtl::OUString("com.sun.star.drawing.GradientTable"), + ::rtl::OUString("com.sun.star.drawing.HatchTable"), + ::rtl::OUString("com.sun.star.drawing.BitmapTable"), + ::rtl::OUString("com.sun.star.drawing.TransparencyGradientTable"), + ::rtl::OUString("com.sun.star.drawing.DashTable"), + ::rtl::OUString("com.sun.star.drawing.MarkerTable") }; static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); @@ -2424,7 +2424,7 @@ void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans: // XShapeDescriptor ::rtl::OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")); + return ::rtl::OUString("com.sun.star.drawing.OLE2Shape"); } // ----------------------------------------------------------------------------- typedef ::cppu::WeakImplHelper2< container::XNameContainer, @@ -2571,18 +2571,18 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY); uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")),uno::makeAny(xPageStyles)); - uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle"))),uno::UNO_QUERY); + xStyles->insertByName(::rtl::OUString("PageStyles"),uno::makeAny(xPageStyles)); + uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY); xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle)); uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")),uno::makeAny(xFrameStyles)); - uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle"))),uno::UNO_QUERY); + xStyles->insertByName(::rtl::OUString("FrameStyles"),uno::makeAny(xFrameStyles)); + uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY); xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle)); uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")),uno::makeAny(xGraphicStyles)); - uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle"))),uno::UNO_QUERY); + xStyles->insertByName(::rtl::OUString("graphics"),uno::makeAny(xGraphicStyles)); + uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY); xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle)); } return m_pImpl->m_xStyles; @@ -2698,7 +2698,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis); - pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : "))); + pHelper->setUntitledPrefix (::rtl::OUString(" : ")); } return m_pImpl->m_xNumberedControllers; @@ -2853,8 +2853,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe { uno::Sequence< datatransfer::DataFlavor > aRet(1); - aRet[0] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PNG")), + aRet[0] = datatransfer::DataFlavor( ::rtl::OUString("image/png"), + ::rtl::OUString("PNG"), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 38b529baeed8..4a31c6b44bb7 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -89,7 +89,7 @@ void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportEngineJFree")); + return ::rtl::OUString("com.sun.star.comp.report.OReportEngineJFree"); } //-------------------------------------------------------------------------- @@ -190,9 +190,9 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task uno::Sequence< beans::NamedValue > aConvertedProperties(8); sal_Int32 nPos = 0; - aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStorage")); + aConvertedProperties[nPos].Name = ::rtl::OUString("InputStorage"); aConvertedProperties[nPos++].Value <<= xTemp; - aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStorage")); + aConvertedProperties[nPos].Name = ::rtl::OUString("OutputStorage"); ::rtl::OUString sFileURL; String sName = m_xReport->getCaption(); @@ -304,15 +304,15 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 ); sal_Int32 nLen = 0; - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")); + aArgs[nLen].Name = ::rtl::OUString("AsTemplate"); aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + aArgs[nLen].Name = ::rtl::OUString("ReadOnly"); aArgs[nLen++].Value <<= sal_True; if ( _bHidden ) { - aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden")); + aArgs[nLen].Name = ::rtl::OUString("Hidden"); aArgs[nLen++].Value <<= sal_True; } diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 12788fd0491e..265ed3e6121b 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -177,7 +177,7 @@ void SAL_CALL OSection::disposing() //-------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Section")); + return ::rtl::OUString("com.sun.star.comp.report.Section"); } //------------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) @@ -317,7 +317,7 @@ void OSection::checkNotPageHeaderFooter() void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ForceNewPage")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage") ,*this ,1 ,m_xContext); @@ -335,7 +335,7 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ForceNewPage")) + throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage") ,*this ,1 ,m_xContext); @@ -427,11 +427,11 @@ const ::std::vector< ::rtl::OUString >& lcl_getControlModelMap() static ::std::vector< ::rtl::OUString > s_sControlModels; if ( s_sControlModels.empty() ) { - s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedText")) ); - s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine")) ); - s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageControl")) ); - s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")) ); - s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shape")) ); + s_sControlModels.push_back( ::rtl::OUString("FixedText") ); + s_sControlModels.push_back( ::rtl::OUString("FixedLine") ); + s_sControlModels.push_back( ::rtl::OUString("ImageControl") ); + s_sControlModels.push_back( ::rtl::OUString("FormattedField") ); + s_sControlModels.push_back( ::rtl::OUString("Shape") ); } return s_sControlModels; @@ -450,19 +450,19 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon switch( aFind - aRet.begin() ) { case 0: - xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))),uno::UNO_QUERY); + xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY); break; case 1: - xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))),uno::UNO_QUERY); + xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY); break; case 2: - xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))),uno::UNO_QUERY); + xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY); break; case 3: - xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))),uno::UNO_QUERY); + xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY); break; case 4: - xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),uno::UNO_QUERY); + xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY); break; default: break; diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index d57fb95e278c..c875df30e1a0 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -120,7 +120,7 @@ void SAL_CALL OShape::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Shape")); + return ::rtl::OUString("com.sun.star.comp.report.Shape"); } //-------------------------------------------------------------------------- @@ -414,7 +414,7 @@ void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVe // XShapeDescriptor ::rtl::OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")); + return ::rtl::OUString("com.sun.star.drawing.CustomShape"); } // ----------------------------------------------------------------------------- ::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException) diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 137278a3b6b2..9e44dc25910c 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -104,7 +104,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb ::rtl::OUString sName; xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName ); + ::rtl::OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); /************************************************** diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index b951698d365c..05af0253be91 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -99,7 +99,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo return OBJ_DLG_IMAGECONTROL; if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; - if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) ) + if ( xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ) ) return OBJ_OLE2; if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; @@ -119,7 +119,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon case OBJ_DLG_FIXEDTEXT: { OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + ,::rtl::OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; @@ -130,18 +130,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") ,nType); break; case OBJ_CUSTOMSHAPE: @@ -293,7 +293,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); - s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); + s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter))); } return s_aNameMap; @@ -654,7 +654,7 @@ void OUnoObject::impl_initializeModel_nothrow() if ( xFormatted.is() ) { const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); - const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TreatAsNumber" ) ); + const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( "TreatAsNumber" ); xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) ); xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN)); } @@ -826,7 +826,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) ::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { sal_uInt16 nResId = 0; - ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!")); + ::rtl::OUString aDefaultName = ::rtl::OUString("HERE WE HAVE TO INSERT OUR NAME!"); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) { nResId = RID_STR_CLASS_FIXEDTEXT; @@ -1191,7 +1191,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod if( xReceiver.is() ) { uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY); - uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"))),uno::UNO_QUERY); + uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY); xReceiver->attachDataProvider( xDataProvider.get() ); } } @@ -1214,7 +1214,7 @@ void OOle2Obj::initializeOle() { uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY ); if ( xChartProps.is() ) - xChartProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate")),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900))); + xChartProps->setPropertyValue(::rtl::OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900))); } } } @@ -1241,7 +1241,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) ); + aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -1255,7 +1255,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport) { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); - uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY); + uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString("PageStyles")),uno::UNO_QUERY); uno::Reference< style::XStyle> xReturn; uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 118ef5012a5b..1f25cb715e88 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -147,10 +147,10 @@ namespace rptui for ( sal_Int32 i=0; i<nCount; ++i ) { xColumn.set( _rxColumns->getByIndex( i ), UNO_QUERY_THROW ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= aField.sName ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= aField.nDataType ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) >>= aField.nScale ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCurrency" ) ) ) >>= aField.bIsCurrency ); + OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= aField.sName ); + OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= aField.nDataType ); + OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= aField.nScale ); + OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "IsCurrency" ) ) >>= aField.bIsCurrency ); _inout_rFields.push_back( aField ); } } diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 72408c52d3a5..62c17447fd12 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -49,13 +49,13 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon { ::comphelper::SequenceAsHashMap aTemp(Descriptor); - ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),::rtl::OUString()); + ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString("URL"),::rtl::OUString()); if ( !sTemp.isEmpty() ) { INetURLObject aURL(sTemp); if ( aURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("orp")) ) - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); + return ::rtl::OUString("StarBaseReport"); else { try @@ -64,9 +64,9 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon if ( xProp.is() ) { ::rtl::OUString sMediaType; - xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= sMediaType; + xProp->getPropertyValue( ::rtl::OUString("MediaType") ) >>= sMediaType; if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); + return ::rtl::OUString("StarBaseReport"); ::comphelper::disposeComponent(xProp); } } @@ -107,7 +107,7 @@ Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection")); + aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExtendedTypeDetection"); return aSNS; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index ea6623d2f9d7..33dcfe8769f5 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -80,7 +80,7 @@ public: // static methods static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ORptTypeDetection")); + return ::rtl::OUString("com.sun.star.comp.report.ORptTypeDetection"); } static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 87df50d2b6ab..650b1c49cc46 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -204,7 +204,7 @@ void OXMLCell::EndElement() Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sText); + xControl->setDataField(::rtl::OUString("rpt:") + m_sText); OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 781c71304269..47327352352c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -78,13 +78,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLSettingsExporter")); + return ::rtl::OUString("com.sun.star.comp.report.XMLSettingsExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aSupported; } //--------------------------------------------------------------------- @@ -95,13 +95,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLContentExporter")); + return ::rtl::OUString("com.sun.star.comp.report.XMLContentExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -114,13 +114,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLStylesExporter")); + return ::rtl::OUString("com.sun.star.comp.report.XMLStylesExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -132,13 +132,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLMetaExporter")); + return ::rtl::OUString("com.sun.star.comp.report.XMLMetaExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -150,13 +150,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLFullExporter")); + return ::rtl::OUString("com.sun.star.comp.report.XMLFullExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -311,7 +311,7 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const // ----------------------------------------------------------------------------- ::rtl::OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportFilter")); + return ::rtl::OUString("com.sun.star.comp.report.ExportFilter"); } //-------------------------------------------------------------------------- @@ -323,7 +323,7 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aServices(1); - aServices.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aServices.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); return aServices; } @@ -1440,12 +1440,12 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor static const ::rtl::OUString s_sCurrent(RTL_CONSTASCII_USTRINGPARAM("current")); AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False); - Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"))); + Characters(::rtl::OUString("1")); } else if ( sToken == s_sPageCount ) { SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, sal_False, sal_False); - Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"))); + Characters(::rtl::OUString("1")); } else { @@ -1497,7 +1497,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SvXMLElementExport> pSubDocument; SAL_WNODEPRECATED_DECLARATIONS_POP - uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"))),uno::UNO_QUERY); + uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString("Model")),uno::UNO_QUERY); if ( xModel.is() ) // special handling for chart object { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); @@ -1531,55 +1531,55 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG switch(nGroupOn) { case report::GroupOn::PREFIX_CHARACTERS: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LEFT")); - sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); + sFunction = ::rtl::OUString("LEFT"); + sPrefix = ::rtl::OUString(";") + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); break; case report::GroupOn::YEAR: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YEAR")); + sFunction = ::rtl::OUString("YEAR"); break; case report::GroupOn::QUARTAL: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT((MONTH")); + sFunction = ::rtl::OUString("INT((MONTH"); sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1")); - sFunctionName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("QUARTAL_")) + sExpression; + sFunctionName = ::rtl::OUString("QUARTAL_") + sExpression; break; case report::GroupOn::MONTH: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH")); + sFunction = ::rtl::OUString("MONTH"); break; case report::GroupOn::WEEK: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WEEK")); + sFunction = ::rtl::OUString("WEEK"); break; case report::GroupOn::DAY: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DAY")); + sFunction = ::rtl::OUString("DAY"); break; case report::GroupOn::HOUR: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HOUR")); + sFunction = ::rtl::OUString("HOUR"); break; case report::GroupOn::MINUTE: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MINUTE")); + sFunction = ::rtl::OUString("MINUTE"); break; case report::GroupOn::INTERVAL: { - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT")); + sFunction = ::rtl::OUString("INT"); uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); - xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:0")))); - ::rtl::OUString sCountName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_count_")) + sExpression; + xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString("rpt:0"))); + ::rtl::OUString sCountName = sFunction + ::rtl::OUString("_count_") + sExpression; xCountFunction->setName(sCountName); - xCountFunction->setFormula(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[")) + sCountName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] + 1"))); + xCountFunction->setFormula(::rtl::OUString("rpt:[") + sCountName + ::rtl::OUString("] + 1")); exportFunction(xCountFunction); sExpression = sCountName; // The reference to sCountName in the formula of sFunctionName refers to the *old* value // so we need to expand the the formula of sCountName sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); - sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression; - sFunction = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")); - sInitialFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:0")); + sFunctionName = sFunction + ::rtl::OUString("_") + sExpression; + sFunction = sFunction + ::rtl::OUString("("); + sInitialFormula = ::rtl::OUString("rpt:0"); } break; default: ; } if ( sFunctionName.isEmpty() ) - sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression; + sFunctionName = sFunction + ::rtl::OUString("_") + sExpression; if ( !sFunction.isEmpty() ) { sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'}; @@ -1589,10 +1589,10 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG xFunction->setName(sFunctionName); if ( !sInitialFormula.isEmpty() ) xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True, sInitialFormula)); - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFunction; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("([")); + sFunction = ::rtl::OUString("rpt:") + sFunction; + sFunction += ::rtl::OUString("(["); sFunction += sExpression; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); + sFunction += ::rtl::OUString("]"); if ( !sPrefix.isEmpty() ) sFunction += sPrefix; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 94b44f9288ee..5762acc5d6e6 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -66,7 +66,7 @@ void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference if ( nPos != -1 ) { sCellAddress = sCellAddress.copy(0,nPos); - sCellAddress += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$65535")); + sCellAddress += ::rtl::OUString("$65535"); pList->RemoveAttribute(_sName); pList->AddAttribute(_sName,sCellAddress); } @@ -117,14 +117,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedSer //------------------------------------------------------------------------ ::rtl::OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportDocumentHandler")); + return ::rtl::OUString("com.sun.star.comp.report.ExportDocumentHandler"); } //------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ExportDocumentHandler")); + aSupported[0] = ::rtl::OUString("com.sun.star.report.ExportDocumentHandler"); return aSupported; } @@ -182,7 +182,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDelegatee->startElement(sTableCalc,NULL); pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xNullAttr = pList; - pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1900-01-01"))); + pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString("1900-01-01")); const ::rtl::OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE); m_xDelegatee->startElement(sNullDate,xNullAttr); @@ -216,7 +216,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName else if ( _sName == "chart:plot-area" ) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); - pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address"))); + pList->RemoveAttribute(::rtl::OUString("table:cell-range-address")); } else if ( _sName == "chart:categories" ) { @@ -306,8 +306,8 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee); - m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel); + m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee); + m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel); OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!"); if ( !m_xDelegatee.is() || !m_xModel.is() ) diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 01afab511ff3..523d4f6f4319 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -92,7 +92,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) switch( _nControl ) { case ControlCharacter::LINE_BREAK: - m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))); + m_pFixedContent->Characters(::rtl::OUString("\n")); break; default: OSL_FAIL("Not supported control character"); @@ -189,7 +189,7 @@ void OXMLFixedContent::EndElement() { uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sPageText); + xControl->setDataField(::rtl::OUString("rpt:") + m_sPageText); OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); m_pInP->m_xComponent = xControl.get(); m_xComponent = xControl.get(); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 90bcba28d0d2..240a03830c16 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -125,7 +125,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport const ::rtl::OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex); ::sal_Int16 nGroupOn = report::GroupOn::DEFAULT; - if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:LEFT"))) + if ( sFormula ==::rtl::OUString("rpt:LEFT")) { nGroupOn = report::GroupOn::PREFIX_CHARACTERS; ::rtl::OUString sInterval = sCompleteFormula.getToken(1,';',nIndex); @@ -133,30 +133,30 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sInterval = sInterval.getToken(0,')',nIndex); m_xGroup->setGroupInterval(sInterval.toInt32()); } - else if ( sFormula == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:YEAR"))) + else if ( sFormula == ::rtl::OUString("rpt:YEAR")) nGroupOn = report::GroupOn::YEAR; - else if ( sFormula == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:MONTH"))) + else if ( sFormula == ::rtl::OUString("rpt:MONTH")) { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString("rpt:INT((MONTH"),0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; } - else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:WEEK"))) + else if ( sFormula ==::rtl::OUString("rpt:WEEK")) nGroupOn = report::GroupOn::WEEK; - else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:DAY"))) + else if ( sFormula ==::rtl::OUString("rpt:DAY")) nGroupOn = report::GroupOn::DAY; - else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:HOUR"))) + else if ( sFormula ==::rtl::OUString("rpt:HOUR")) nGroupOn = report::GroupOn::HOUR; - else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:MINUTE"))) + else if ( sFormula ==::rtl::OUString("rpt:MINUTE")) nGroupOn = report::GroupOn::MINUTE; - else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT"))) + else if ( sFormula ==::rtl::OUString("rpt:INT")) { nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); - sExpression = sExpression.copy(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT_count_")).getLength()); + sExpression = sExpression.copy(::rtl::OUString("INT_count_").getLength()); nIndex = 0; ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 3892346c5997..51ea7ebb5303 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -87,14 +87,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ImportDocumentHandler::getSupportedSer //------------------------------------------------------------------------ ::rtl::OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ImportDocumentHandler")); + return ::rtl::OUString("com.sun.star.comp.report.ImportDocumentHandler"); } //------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ImportDocumentHandler")); + aSupported[0] = ::rtl::OUString("com.sun.star.report.ImportDocumentHandler"); return aSupported; } @@ -117,7 +117,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, { // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("all")) ); + aArgs.put( "CellRangeRepresentation", ::rtl::OUString("all") ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -270,7 +270,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName SvXMLAttributeList* pList = new SvXMLAttributeList(); xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); - pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536"))); + pList->AddAttribute(::rtl::OUString("table:cell-range-address"),::rtl::OUString("local-table.$A$1:.$Z$65536")); } @@ -328,8 +328,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee); - m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel); + m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee); + m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel); OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!"); if ( !m_xDelegatee.is() || !m_xModel.is() ) diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index c6da98c813c1..14d8a4ee9f56 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -78,7 +78,7 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport, const Reference< XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), - sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"))), + sNumberFormat(rtl::OUString("NumberFormat")), pStyles(&rStyles), m_nNumberFormat(-1), m_rImport(rImport), @@ -319,7 +319,7 @@ Reference < XNameContainer > xStyles.set(m_xTableStyles); else sName = - ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TableStyles" ) )); + ::rtl::OUString( rtl::OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -328,7 +328,7 @@ Reference < XNameContainer > xStyles.set(m_xCellStyles); else sName = - ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) )); + ::rtl::OUString( rtl::OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -337,7 +337,7 @@ Reference < XNameContainer > xStyles.set(m_xColumnStyles); else sName = - ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnStyles" ) )); + ::rtl::OUString( rtl::OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -346,7 +346,7 @@ Reference < XNameContainer > xStyles.set(m_xRowStyles); else sName = - ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowStyles" ) )); + ::rtl::OUString( rtl::OUString( "RowStyles" )); } break; case XML_STYLE_FAMILY_SD_GRAPHICS_ID: diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 71c8e679c577..b557e839af7f 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -247,7 +247,7 @@ sal_Int32 ReadThroughComponent( xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncrypted; + xProps->getPropertyValue( ::rtl::OUString("Encrypted") ) >>= bEncrypted; } catch (const packages::WrongPasswordException&) { @@ -408,7 +408,7 @@ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContex // ----------------------------------------------------------------------------- ::rtl::OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportFilter")); + return ::rtl::OUString("com.sun.star.comp.report.OReportFilter"); } //-------------------------------------------------------------------------- @@ -535,8 +535,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::UNO_QUERY ); uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY); - aArgs[0] <<= beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),uno::makeAny(xStorage)); - xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver")),aArgs) , uno::UNO_QUERY); + aArgs[0] <<= beans::NamedValue(::rtl::OUString("Storage"),uno::makeAny(xStorage)); + xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); static comphelper::PropertyMapEntry pMap[] = @@ -551,9 +551,9 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ::comphelper::MediaDescriptor aDescriptor(rDescriptor); uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) ); - xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal)); - const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) ); - xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName)); + xProp->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal)); + const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) ); + xProp->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY); static const ::rtl::OUString s_sMeta(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); @@ -582,7 +582,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml")))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("settings.xml"))); nRet = ReadThroughComponent( xStorage ,xModel ,"settings.xml" @@ -596,7 +596,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("styles.xml"))); nRet = ReadThroughComponent(xStorage ,xModel ,"styles.xml" @@ -610,7 +610,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("content.xml"))); nRet = ReadThroughComponent( xStorage ,xModel ,"content.xml" @@ -674,7 +674,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, const SvXMLStylesContext* pAutoStyles = GetAutoStyles(); if ( pAutoStyles ) { - XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pm1")))); + XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString("pm1"))); if ( pAutoStyle ) { pAutoStyle->FillPropertySet(getReportDefinition().get()); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 41e74f2b2768..61a6f1741257 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -65,7 +65,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed m_pSubEdit->EnableRTL( sal_False ); m_pSubEdit->SetPosPixel( Point() ); - m_aFormula.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."))); + m_aFormula.SetText(::rtl::OUString("...")); m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) ); m_aFormula.Show(); m_pSubEdit->Show(); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 38e2ec561268..aa393881f7c2 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -182,7 +182,7 @@ short ODateTimeDialog::Execute() uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat; + xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; double nValue = 0; if ( _bTime ) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index af7aa178936a..61b9dcbc3293 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(Window* pParent ,m_pAddField(NULL) ,m_xRowSet(_xRowSet) ,m_pEdit(NULL) - ,m_sFormula(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="))) + ,m_sFormula(::rtl::OUString("=")) ,m_nStart(0) ,m_nEnd(1) { @@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent else m_sFormula = _sFormula; } - m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOFormulaParser"))),uno::UNO_QUERY); + m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY); if ( m_xParser.is() ) m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper(); fill(); @@ -225,7 +225,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) aDescriptor[ ::svx::daColumnName ] >>= sName; if ( !sName.isEmpty() ) { - sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("[")) + sName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); + sName = ::rtl::OUString("[") + sName + ::rtl::OUString("]"); m_pEdit->SetText(sName); } } diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index a60c093aced1..9680fb8584ca 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -89,7 +89,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY); if ( xFixedText.is() ) { - sName.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : "))); + sName.append(::rtl::OUString(" : ")); sName.append(xFixedText->getLabel()); } else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) ) @@ -97,7 +97,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle ReportFormula aFormula( xReportModel->getDataField() ); if ( aFormula.isValid() ) { - sName.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : "))); + sName.append(::rtl::OUString(" : ")); sName.append( aFormula.getUndecoratedContent() ); } } diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 7ff0af1af88c..9de12edf5fb6 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -63,7 +63,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); m_xTypeConverter.set(script::Converter::create(m_xContext)); }catch(const uno::Exception &) @@ -92,14 +92,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupportedServi //------------------------------------------------------------------------ ::rtl::OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.DataProviderHandler")); + return ::rtl::OUString("com.sun.star.comp.report.DataProviderHandler"); } //------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.DataProviderHandler")); + aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DataProviderHandler"); return aSupported; } @@ -149,7 +149,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY); - m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY ); + m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( "ReportComponent" ) ), uno::UNO_QUERY ); if ( m_xDataProvider.is() ) { ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); @@ -198,7 +198,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // for(;pChartTypeIter != pChartTypeEnd;++pChartTypeIter) // { // sChartTypes += (*pChartTypeIter)->getChartType(); - // sChartTypes += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + // sChartTypes += ::rtl::OUString(";"); // } // } // aPropertyValue;// <<= sChartTypes; @@ -241,12 +241,12 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); if ( !xTitle.is() ) { - xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.Title")),m_xContext),uno::UNO_QUERY); + xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY); xTitled->setTitleObject(xTitle); } if ( xTitle.is() ) { - uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.FormattedString")),m_xContext),uno::UNO_QUERY); + uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY); ::rtl::OUString sStr; _aValue>>= sStr; xFormatted->setString(sStr); @@ -288,9 +288,9 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) + ::rtl::OUString("Data") : - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General")); + ::rtl::OUString("General"); aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } @@ -454,7 +454,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin sal_Bool bModified = xReport->isModified(); // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) ); + aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -494,29 +494,29 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex { uno::Sequence<uno::Any> aSeq(6); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))); + aParam.Name = ::rtl::OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Detail")); + aParam.Name = ::rtl::OUString("Detail"); aParam.Value <<= m_xDataProvider; aSeq[1] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master")); + aParam.Name = ::rtl::OUString("Master"); aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition(); aSeq[2] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Explanation")); + aParam.Name = ::rtl::OUString("Explanation"); aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_EXPLANATION))); aSeq[3] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DetailLabel")); + aParam.Name = ::rtl::OUString("DetailLabel"); aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_DETAILLABEL))); aSeq[4] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MasterLabel")); + aParam.Name = ::rtl::OUString("MasterLabel"); aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_MASTERLABEL))); aSeq[5] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")),aSeq + ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); @@ -527,16 +527,16 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua { uno::Sequence<uno::Any> aSeq(2); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))); + aParam.Name = ::rtl::OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel")); + aParam.Name = ::rtl::OUString("ChartModel"); aParam.Value <<= m_xChartModel; aSeq[1] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.ChartTypeDialog")),aSeq + ::rtl::OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index ea5b96c627c7..0cc6aa8e42ac 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -95,14 +95,14 @@ namespace rptui //------------------------------------------------------------------------ ::rtl::OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.DefaultComponentInspectorModel")); + return ::rtl::OUString("com.sun.star.comp.report.DefaultComponentInspectorModel"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.DefaultComponentInspectorModel")); + aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); return aSupported; } @@ -255,7 +255,7 @@ namespace rptui if ( !m_xComponent.is() ) try { - m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel")),m_xContext),UNO_QUERY_THROW); + m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW); } catch(const Exception &) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 97b946b26580..c06edad3aec6 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -140,7 +140,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("[")); - sQuotedFunctionName += _sFunction + OUString(RTL_CONSTASCII_USTRINGPARAM("]")); + sQuotedFunctionName += _sFunction + OUString("]"); return sQuotedFunctionName; } // ----------------------------------------------------------------------------- @@ -248,7 +248,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const try { const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager(); - m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); m_xTypeConverter.set(script::Converter::create(context)); loadDefaultFunctions(); } @@ -282,14 +282,14 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames( ) //------------------------------------------------------------------------ OUString GeometryHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.GeometryHandler")); + return OUString("com.sun.star.comp.report.GeometryHandler"); } //------------------------------------------------------------------------ uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aSupported(1); - aSupported[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.GeometryHandler")); + aSupported[0] = OUString("com.sun.star.report.inspection.GeometryHandler"); return aSupported; } @@ -345,7 +345,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this )); const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY ); - m_xReportComponent.set( xObjectAsContainer->getByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY ); + m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); if ( xObjectAsContainer->hasByName( sRowSet ) ) @@ -861,9 +861,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? - OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) + OUString("Data") : - OUString(RTL_CONSTASCII_USTRINGPARAM("General")); + OUString("General"); aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } @@ -880,7 +880,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const xNumericControl->setDecimalDigits( 2 ); xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH ); uno::Reference< drawing::XShapeDescriptor> xShapeDesc(m_xReportComponent,uno::UNO_QUERY); - bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")); + bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString("com.sun.star.drawing.CustomShape"); if ( bSetMin ) xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0)); if ( nDisplayUnit != -1 ) @@ -974,14 +974,14 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { case PROPERTY_ID_FORCENEWPAGE: case PROPERTY_ID_NEWROWORCOL: - aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName); + aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName); break; case PROPERTY_ID_GROUPKEEPTOGETHER: - aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName); + aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName); break; case PROPERTY_ID_PAGEHEADEROPTION: case PROPERTY_ID_PAGEFOOTEROPTION: - aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName); + aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName); break; case PROPERTY_ID_BACKCOLOR: case PROPERTY_ID_CONTROLBACKGROUND: @@ -995,7 +995,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) { - aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName); + aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.KeepTogether"),PropertyName); break; } // run through @@ -1139,19 +1139,19 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper break; case PROPERTY_ID_FORCENEWPAGE: case PROPERTY_ID_NEWROWORCOL: - aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName); + aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName); break; case PROPERTY_ID_GROUPKEEPTOGETHER: - aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName); + aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName); break; case PROPERTY_ID_PAGEHEADEROPTION: case PROPERTY_ID_PAGEFOOTEROPTION: - aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName); + aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName); break; case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) { - aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName); + aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.KeepTogether"),PropertyName); break; } // run through @@ -1302,7 +1302,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie ,PROPERTY_VISIBLE ,PROPERTY_PAGEHEADEROPTION ,PROPERTY_PAGEFOOTEROPTION - ,OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel")) + ,OUString("ControlLabel") ,PROPERTY_POSITIONX ,PROPERTY_POSITIONY ,PROPERTY_WIDTH @@ -1417,7 +1417,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY); const uno::Reference< report::XReportControlFormat> xReportControlFormat(m_xReportComponent,uno::UNO_QUERY); aGuard.clear(); @@ -1439,7 +1439,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr OUString sFormula; m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY); uno::Reference< uno::XComponentContext > xContext = m_xContext; uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY); aGuard.clear(); @@ -1457,7 +1457,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; - const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); + const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY); const uno::Reference< report::XShape> xShape(m_xReportComponent,uno::UNO_QUERY); aGuard.clear(); @@ -1574,15 +1574,15 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, try { xFactory = m_xContext->getServiceManager(); - xInspectorWindow.set(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); - uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY); + xInspectorWindow.set(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY); + uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY); if ( !xCon.is() ) return false; uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY); if ( !m_xRowSet.is() ) { - m_xRowSet.set(xFactory->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")),m_xContext),uno::UNO_QUERY); + m_xRowSet.set(xFactory->createInstanceWithContext(OUString("com.sun.star.sdb.RowSet"),m_xContext),uno::UNO_QUERY); xRowSetProp.set(m_xRowSet,uno::UNO_QUERY); xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(xCon)); ::comphelper::copyProperties(m_xReportComponent,xRowSetProp); @@ -1910,10 +1910,10 @@ void GeometryHandler::loadDefaultFunctions() m_aCounterFunction.m_bPreEvaluated = sal_False; m_aCounterFunction.m_bDeepTraversing = sal_False; m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER)); - m_aCounterFunction.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1")); + m_aCounterFunction.m_sFormula = OUString("rpt:[%FunctionName] + 1"); m_aCounterFunction.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*")); m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True; - m_aCounterFunction.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1")); + m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1"); DefaultFunction aDefault; aDefault.m_bDeepTraversing = sal_False; @@ -1921,24 +1921,24 @@ void GeometryHandler::loadDefaultFunctions() aDefault.m_bPreEvaluated = sal_True; aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION)); - aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column] + [%FunctionName]")); + aDefault.m_sFormula = OUString("rpt:[%Column] + [%FunctionName]"); aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]")); aDefault.m_sInitialFormula.IsPresent = sal_True; - aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]")); + aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM)); aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])")); aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)")); aDefault.m_sInitialFormula.IsPresent = sal_True; - aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]")); + aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM)); aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])")); aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)")); aDefault.m_sInitialFormula.IsPresent = sal_True; - aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]")); + aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); } } @@ -2054,7 +2054,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF _rFieldNames.realloc(0); try { - uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); + uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY); Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow ); WaitObject aWaitCursor( pInspectorWindow ); @@ -2068,7 +2068,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF OUString sObjectName; OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName ); // when there is no command we don't need to ask for columns - uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY); + uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY); if ( !sObjectName.isEmpty() && xCon.is() ) { sal_Int32 nObjectType = sdb::CommandType::COMMAND; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index ac86218f4e31..8c9fdd892029 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -45,7 +45,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); }catch(const uno::Exception &) { @@ -73,14 +73,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupportedSe //------------------------------------------------------------------------ ::rtl::OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ReportComponentHandler")); + return ::rtl::OUString("com.sun.star.comp.report.ReportComponentHandler"); } //------------------------------------------------------------------------ uno::Sequence< ::rtl::OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.ReportComponentHandler")); + aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.ReportComponentHandler"); return aSupported; } diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 93f25514cf28..783cdb04c665 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -244,38 +244,38 @@ namespace rptui uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties(); static const OUString pExcludeProperties[] = { - OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Printable")), - OUString(RTL_CONSTASCII_USTRINGPARAM("WordBreak")), - OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLine")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")), - OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText")), - OUString(RTL_CONSTASCII_USTRINGPARAM("HelpURL")), - OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")), - OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMin")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMax")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Spin")), - OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValue")), - OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMin")), - OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMax")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSpinValue")), - OUString(RTL_CONSTASCII_USTRINGPARAM("SpinIncrement")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Repeat")), - OUString(RTL_CONSTASCII_USTRINGPARAM("RepeatDelay")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel")), /// TODO: has to be checked - OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), // comment this out if you want to have title feature for charts + OUString("Enabled"), + OUString("Printable"), + OUString("WordBreak"), + OUString("MultiLine"), + OUString("Tag"), + OUString("HelpText"), + OUString("HelpURL"), + OUString("MaxTextLen"), + OUString("ReadOnly"), + OUString("Tabstop"), + OUString("TabIndex"), + OUString("ValueMin"), + OUString("ValueMax"), + OUString("Spin"), + OUString("SpinValue"), + OUString("SpinValueMin"), + OUString("SpinValueMax"), + OUString("DefaultSpinValue"), + OUString("SpinIncrement"), + OUString("Repeat"), + OUString("RepeatDelay"), + OUString("ControlLabel"), /// TODO: has to be checked + OUString("LabelControl"), + OUString("Title"), // comment this out if you want to have title feature for charts PROPERTY_MAXTEXTLEN, PROPERTY_EFFECTIVEDEFAULT, PROPERTY_EFFECTIVEMAX, PROPERTY_EFFECTIVEMIN, - OUString(RTL_CONSTASCII_USTRINGPARAM("HideInactiveSelection")), - OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitAction")), - OUString(RTL_CONSTASCII_USTRINGPARAM("InputRequired")), - OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalAlign")), + OUString("HideInactiveSelection"), + OUString("SubmitAction"), + OUString("InputRequired"), + OUString("VerticalAlign"), PROPERTY_ALIGN, PROPERTY_EMPTY_IS_NULL, PROPERTY_FILTERPROPOSAL diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 4348e9f343ca..704beb06179b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -445,11 +445,11 @@ namespace // create an AWT font awt::FontDescriptor aAwtFont; lcl_initAwtFont( _rOriginalControlFont, _rItemSet, aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT); - lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Font")), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, ::rtl::OUString("Font"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet, aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN, ITEMID_WEIGHT_ASIAN); - lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontAsian")), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, ::rtl::OUString("FontAsian"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet, aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX, ITEMID_WEIGHT_COMPLEX); - lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontComplex")), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, ::rtl::OUString("FontComplex"), uno::makeAny( aAwtFont ) ); // properties which cannot be represented in an AWT font need to be preserved directly if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_SHADOWED,sal_True,&pItem) && pItem->ISA(SvxShadowedItem)) @@ -1023,7 +1023,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xServiceFactory.set(xFactory,uno::UNO_QUERY); Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow ); - uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOFunctionManager")),_xContext),uno::UNO_QUERY); + uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY); if ( xMgr.is() ) { ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) ); @@ -1036,7 +1036,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xub_StrLen nIndex = 0; if ( sFormula.GetChar(0) == '=' ) nIndex = 1; - _in_out_rFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFormula.Copy(nIndex); + _in_out_rFormula = ::rtl::OUString("rpt:") + sFormula.Copy(nIndex); } } } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 1337dd79b3aa..c0ebbdbd9e1a 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -47,13 +47,13 @@ namespace rptui //------------------------------------------------------------------------------ ::rtl::OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.StatusbarController")); + return ::rtl::OUString("com.sun.star.report.comp.StatusbarController"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StatusbarController")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.frame.StatusbarController"); return aSupported; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 33b8ccbff73b..36b143b0182b 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -67,13 +67,13 @@ namespace rptui //------------------------------------------------------------------------------ ::rtl::OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.ReportToolboxController")); + return ::rtl::OUString("com.sun.star.report.comp.ReportToolboxController"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportToolboxController")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.report.ReportToolboxController"); return aSupported; } // ----------------------------------------------------------------------------- @@ -150,48 +150,48 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments } if ( m_aCommandURL == ".uno:BasicShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BasicShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:SymbolShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SymbolShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:SymbolShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:ArrowShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ArrowShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:ArrowShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:FlowChartShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FlowChartShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FlowChartShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CalloutShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CalloutShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CalloutShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:StarShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:StarShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CharFontName" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CharFontName"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontColor")),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Color")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FontColor"),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Color"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorExtToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BackgroundColor")),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BackgroundColor"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox)); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 8d1fdd31e75d..c8b4a2c5aba9 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -265,13 +265,13 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, //------------------------------------------------------------------------------ ::rtl::OUString OReportController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.ReportDesign")); + return ::rtl::OUString("com.sun.star.report.comp.ReportDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ReportDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.ReportDesign"); return aSupported; } //------------------------------------------------------------------------- @@ -314,9 +314,9 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon m_pReportControllerObserver = new OXReportControllerObserver(*this); m_pReportControllerObserver->acquire(); - m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")); + m_sMode = ::rtl::OUString("normal"); DBG_CTOR( rpt_OReportController,NULL); - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); + registerProperty(::rtl::OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); } // ----------------------------------------------------------------------------- @@ -1368,22 +1368,22 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smiley")); + sType = ::rtl::OUString("smiley"); break; case SID_DRAWTBX_CS_ARROW: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-right-arrow")); + sType = ::rtl::OUString("left-right-arrow"); break; case SID_DRAWTBX_CS_FLOWCHART: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flowchart-internal-storage")); + sType = ::rtl::OUString("flowchart-internal-storage"); break; case SID_DRAWTBX_CS_CALLOUT: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("round-rectangular-callout")); + sType = ::rtl::OUString("round-rectangular-callout"); break; case SID_DRAWTBX_CS_STAR: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5")); + sType = ::rtl::OUString("star5"); break; default: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); + sType = ::rtl::OUString("diamond"); } } else @@ -1687,7 +1687,7 @@ void OReportController::impl_initialize( ) UndoSuppressor aSuppressUndo( getUndoManager() ); ::comphelper::NamedValueCollection aArgs(getModel()->getArgs()); - setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")))); + setMode(aArgs.getOrDefault("Mode", ::rtl::OUString("normal"))); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1696,7 +1696,7 @@ void OReportController::impl_initialize( ) ::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() ); ::rtl::OUString sHierarchicalDocumentName; - sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),sHierarchicalDocumentName); + sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() ) { @@ -1747,7 +1747,7 @@ void OReportController::impl_initialize( ) if ( m_bShowProperties && m_nPageNum == -1 ) { - m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")); + m_sLastActivePage = ::rtl::OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); @@ -2111,14 +2111,14 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ if ( _xLayoutManager.is() ) { static const ::rtl::OUString s_sMenu[] = { - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/reportcontrols")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/drawbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/Formatting")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/alignmentbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionalignmentbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/resizebar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionshrinkbar")) + ::rtl::OUString("private:resource/statusbar/statusbar") + ,::rtl::OUString("private:resource/toolbar/reportcontrols") + ,::rtl::OUString("private:resource/toolbar/drawbar") + ,::rtl::OUString("private:resource/toolbar/Formatting") + ,::rtl::OUString("private:resource/toolbar/alignmentbar") + ,::rtl::OUString("private:resource/toolbar/sectionalignmentbar") + ,::rtl::OUString("private:resource/toolbar/resizebar") + ,::rtl::OUString("private:resource/toolbar/sectionshrinkbar") }; for (size_t i = 0; i< sizeof(s_sMenu)/sizeof(s_sMenu[0]); ++i) { @@ -2799,10 +2799,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( if ( getView() ) { util::URL aCommand; - aCommand.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + *commandName; + aCommand.Complete = ::rtl::OUString( ".uno:" ) + *commandName; Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ); + aCommandArgs[0].Name = ::rtl::OUString( "Value" ); aCommandArgs[0].Value = rCommandValue; executeUnChecked( aCommand, aCommandArgs ); @@ -2890,7 +2890,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); - m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")); + m_sLastActivePage = ::rtl::OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); nCommand = SID_SELECT_REPORT; } @@ -3150,7 +3150,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); ::rtl::OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) - sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); + sCustomShapeType = ::rtl::OUString("diamond"); pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width } @@ -3334,7 +3334,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } ::svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); - uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")),xCurrentSection); + uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString("Section"),xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); getDesignView()->setMarked(xSection,sal_True); @@ -3346,7 +3346,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.X = nLeftMargin; // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down - sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0)); + sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString("DNDAction"), sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) @@ -3419,7 +3419,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); ::rtl::OUString sParamName; - OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sParamName ); + OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= sParamName ); if ( sParamName == sColumnName ) { xField = xParamCol; @@ -4066,8 +4066,8 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw ( } ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) { - static ::rtl::OUString s_sModes[] = { ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("remote")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")) }; + static ::rtl::OUString s_sModes[] = { ::rtl::OUString("remote"), + ::rtl::OUString("normal") }; return uno::Sequence< ::rtl::OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); } ::sal_Bool SAL_CALL OReportController::supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 40a8433178c8..13eb3a5e5454 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND ) { aArgs.realloc(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); + aArgs[0].Name = ::rtl::OUString("Selection"); aArgs[0].Value <<= m_xSection; } rController.executeChecked(nId,aArgs); @@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); // give also the DND Action (Shift|Ctrl) Key to really say what we want - aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")); + aCurrent[nLength].Name = ::rtl::OUString("DNDAction"); aCurrent[nLength++].Value <<= _rEvt.mnAction; - aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")); + aCurrent[nLength].Name = ::rtl::OUString("Section"); aCurrent[nLength++].Value <<= getSection(); pIter->Value <<= aCurrent; } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 5440a78fee2f..39bb7e9a8a0f 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1017,7 +1017,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ if ( &rView != &_rSection ) { - SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))); + SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString("com.sun.star.form.component.FixedText")); if (pNewObj) { pNewObj->SetLogicRect(_aRect); diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index b2da2c0ffff1..9d7f52c31f9c 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -54,24 +54,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + ,::rtl::OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) @@ -88,7 +88,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(SERVICE_REPORTDEFINITION,OBJ_DLG_SUBREPORT); break; case OBJ_OLE2: - pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2); + pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); break; default: OSL_FAIL("Unknown object id"); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 3b044fa6d2c1..6805f5e496dc 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) if ( m_pParent->GetMode() != RPTUI_READONLY ) { uno::Sequence<beans::PropertyValue> aArgs(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowProperties")); + aArgs[0].Name = ::rtl::OUString("ShowProperties"); aArgs[0].Value <<= sal_True; m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 213a3985cd7a..73bfcd6aba6b 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -107,11 +107,11 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame")), UNO_QUERY); if (m_xMeAsFrame.is()) { m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) ); - m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser"))); // change name! + m_xMeAsFrame->setName(::rtl::OUString("report property browser")); // change name! } } catch (Exception&) @@ -129,9 +129,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -199,9 +199,9 @@ PropBrw::~PropBrw() uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) )}; + const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) + , ::rtl::OUString( "DialogParentWindow" ) + , ::rtl::OUString( "ActiveConnection" )}; for (size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i) xName->removeByName(pProps[i]); } @@ -348,7 +348,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES)); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); - Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent"))), UNO_QUERY ); + Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString("ReportComponent")), UNO_QUERY ); if ( xServiceInfo.is() ) { sal_uInt16 nResId = 0; @@ -419,9 +419,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormComponent")),uno::makeAny(_xFormComponent)); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(_xReportComponent)); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowSet")) + xNameCont->insertByName(::rtl::OUString("FormComponent"),uno::makeAny(_xFormComponent)); + xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(_xReportComponent)); + xNameCont->insertByName(::rtl::OUString("RowSet") ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); @@ -534,7 +534,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(xTemp)); + xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 393e2e097b8c..de18023361ab 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -829,7 +829,7 @@ ERRTYPE RscCompiler::Link() OUString sIlstUrl; sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1); sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.')); - sIlstUrl += OUString(RTL_CONSTASCII_USTRINGPARAM(".ilst")); + sIlstUrl += OUString(".ilst"); sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8)); aSysList = lcl_getSystemPath(sIlstUrl); diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx index 822450db8f1c..70f8f8b44ba0 100644 --- a/sal/inc/osl/socket_decl.hxx +++ b/sal/inc/osl/socket_decl.hxx @@ -154,7 +154,7 @@ namespace osl */ static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") ); }; diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index d9505098c382..f233f9179d73 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -42,7 +42,7 @@ inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); } inline const rtl::OUString FPH_PARENT_DIR_ENTRY() - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); } + { return rtl::OUString(".."); } /******************************************* * osl_systemPathRemoveSeparator diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index 70e8107aa79b..c156c37b9393 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -54,7 +54,7 @@ public: rtl_math_ConversionStatus status; sal_Int32 end; double res = rtl::math::stringToDouble( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +1.E01foo")), + rtl::OUString(" +1.E01foo"), sal_Unicode('.'), sal_Unicode(','), &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(" +1.E01")), end); @@ -65,7 +65,7 @@ public: rtl_math_ConversionStatus status; sal_Int32 end; double res = rtl::math::stringToDouble( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +Efoo")), + rtl::OUString(" +Efoo"), sal_Unicode('.'), sal_Unicode(','), &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end); diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx index a3afaef25849..70ed7548e4d9 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx @@ -40,7 +40,7 @@ private: CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString); void test::oustringbuffer::ToString::testToString() { - rtl::OUStringBuffer sb(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test string"))); + rtl::OUStringBuffer sb(rtl::OUString("test string")); rtl::OUString str = sb.toString(); CPPUNIT_ASSERT( str == "test string" ); // returned OUString must be independent from sb diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx index 8b506b78d728..e3ad8dd9d4bf 100644 --- a/sal/qa/rtl/strings/test_oustring_compare.cxx +++ b/sal/qa/rtl/strings/test_oustring_compare.cxx @@ -50,16 +50,16 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii() CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii("abc")); CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("abc"))); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(""))); - CPPUNIT_ASSERT(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("abc")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abcd")). + CPPUNIT_ASSERT(!rtl::OUString("abcd"). equalsIgnoreAsciiCaseAscii("abc")); - CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")). + CPPUNIT_ASSERT(!rtl::OUString("abc"). equalsIgnoreAsciiCaseAscii("abcd")); } diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index 873b5366f6a5..7dc8eb8ea25f 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -96,13 +96,13 @@ void test::oustring::StringLiterals::checkCtors() CPPUNIT_ASSERT( VALID_CONVERSION( bad5[ 1 ] )); // Check that contents are correct and equal to the case when RTL_CONSTASCII_USTRINGPARAM is used. - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ))); - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ab" ))); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( "" )); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( "ab" )); #if 0 // Also check that embedded \0 is included. // In fact, allowing this is probably just trouble, so this now asserts. - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\0" ))); - CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "a\0b" ))); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( "\0" )); + CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( "a\0b" )); #endif } diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index ec29c8097d27..005a7a75388a 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -246,7 +246,7 @@ void Test::test_Uri() { // Check UTF-8 handling: - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%E0%83%BF")); + aText1 = rtl::OUString("%E0%83%BF"); // \U+00FF encoded with three instead of two bytes aText2 = aText1; CPPUNIT_ASSERT_MESSAGE( @@ -256,7 +256,7 @@ void Test::test_Uri() { RTL_TEXTENCODING_UTF8) == aText2)); - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%EF%BF%BF")); + aText1 = rtl::OUString("%EF%BF%BF"); // \U+FFFF is no legal character aText2 = aText1; CPPUNIT_ASSERT_MESSAGE( @@ -268,7 +268,7 @@ void Test::test_Uri() { // Check IURI handling: - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%30%C3%BF")); + aText1 = rtl::OUString("%30%C3%BF"); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%30")); aBuffer.append(static_cast< sal_Unicode >(0x00FF)); aText2 = aBuffer.makeStringAndClear(); @@ -279,8 +279,8 @@ void Test::test_Uri() { // Check modified rtl_UriCharClassUnoParamValue (removed '[' and ']'): - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]%5B%5D")); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%5B%5D%5B%5D")); + aText1 = rtl::OUString("[]%5B%5D"); + aText2 = rtl::OUString("%5B%5D%5B%5D"); CPPUNIT_ASSERT_MESSAGE( "failure 19", (rtl::Uri::encode( @@ -381,7 +381,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x045F, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20!%A1%FF")); + aText2 = rtl::OUString("%20!%A1%FF"); CPPUNIT_ASSERT_MESSAGE( "failure 20", (rtl::Uri::encode( @@ -415,8 +415,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { ' ', '!', 0x028A, 0xD849, 0xDD13, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("%20!%81%30%B1%33%95%39%C5%37")); + aText2 = rtl::OUString("%20!%81%30%B1%33%95%39%C5%37"); CPPUNIT_ASSERT_MESSAGE( "failure 22", (rtl::Uri::encode( @@ -444,7 +443,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20%C4%80%FF")); + aText1 = rtl::OUString("%20%C4%80%FF"); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 24", @@ -453,7 +452,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81 ")); + aText1 = rtl::OUString("%81 "); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 25", @@ -462,7 +461,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%20")); + aText1 = rtl::OUString("%81%20"); aText2 = rtl::OUString(); CPPUNIT_ASSERT_MESSAGE( "failure 26", @@ -471,7 +470,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%30%B1%33")); + aText1 = rtl::OUString("%81%30%B1%33"); sal_Unicode const aText2U[] = { 0x028A, 0 }; aText2 = rtl::OUString(aText2U); CPPUNIT_ASSERT_MESSAGE( @@ -481,7 +480,7 @@ void Test::test_Uri() { == aText2)); } { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%810%B13")); + aText1 = rtl::OUString("%810%B13"); sal_Unicode const aText2U[] = { 0x028A, 0 }; aText2 = rtl::OUString(aText2U); CPPUNIT_ASSERT_MESSAGE( @@ -494,8 +493,8 @@ void Test::test_Uri() { // Check rtl_UriEncodeStrictKeepEscapes mode: { - aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%%ea%c3%aa")); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%25%EA%C3%AA")); + aText1 = rtl::OUString("%%ea%c3%aa"); + aText2 = rtl::OUString("%25%EA%C3%AA"); CPPUNIT_ASSERT_MESSAGE( "failure 29", (rtl::Uri::encode( @@ -506,7 +505,7 @@ void Test::test_Uri() { { sal_Unicode const aText1U[] = { 0x00EA, 0 }; aText1 = rtl::OUString(aText1U); - aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%C3%AA")); + aText2 = rtl::OUString("%C3%AA"); CPPUNIT_ASSERT_MESSAGE( "failure 30", (rtl::Uri::encode( diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 84d1b58b450b..d3dadcb50d1c 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -105,8 +105,7 @@ rtl::OUString recursivelyExpandMacros( if (requestStack->file == requestFile && requestStack->key == requestKey) { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("***RECURSION DETECTED***")); + return rtl::OUString("***RECURSION DETECTED***"); } } ExpandRequestLink link = { requestStack, requestFile, requestKey }; @@ -267,7 +266,7 @@ static OUString & getIniFileName_Impl() resolvePathnameUrl(&fileName); #else if(getFromCommandLineArgs( - OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")), &fileName)) + OUString("INIFILENAME"), &fileName)) { resolvePathnameUrl(&fileName); } @@ -459,8 +458,7 @@ struct FundamentalIniData { ini = ((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())-> getValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP")), + rtl::OUString("URE_BOOTSTRAP"), &uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) && resolvePathnameUrl(&uri)) ? rtl_bootstrap_args_open(uri.pData) : NULL; diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 02e71829ce0c..9edd087ca335 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -723,8 +723,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - " does not start with a scheme component")); + " does not start with a scheme component"); rtl_uString_assign(pException, const_cast< rtl::OUString & >(aMessage).pData); return false; @@ -734,8 +733,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "path component does not start with slash")); + "path component does not start with slash"); rtl_uString_assign(pException, aMessage.pData); return false; } diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index b77e684138ca..5de39f01de26 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -56,7 +56,7 @@ int main( int argc, char *argv[] ) OUString iniName; - Bootstrap::get(OUString(RTL_CONSTASCII_USTRINGPARAM("iniName")), iniName, OUString()); + Bootstrap::get(OUString("iniName"), iniName, OUString()); #if OSL_DEBUG_LEVEL > 1 if(iniName.getLength()) @@ -76,7 +76,7 @@ int main( int argc, char *argv[] ) sal_Bool useDefault; OUString aDummy; - useDefault = bootstrap.getFrom(OUString(RTL_CONSTASCII_USTRINGPARAM("USEDEFAULT")), aDummy); + useDefault = bootstrap.getFrom(OUString("USEDEFAULT"), aDummy); sal_Bool result = sal_False; sal_Bool found = sal_True; @@ -105,12 +105,12 @@ int main( int argc, char *argv[] ) fprintf(stderr, "bootstrap parameter couldn't be found\n"); // test the default case - name = OUString( RTL_CONSTASCII_USTRINGPARAM( "no_one_has_set_this_name" ) ); + name = OUString( "no_one_has_set_this_name" ); OSL_ASSERT( ! bootstrap.getFrom( name, value ) ); result = result && !bootstrap.getFrom( name, value ); - myDefault = OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ) ); - OUString myDefault2 = OUString( RTL_CONSTASCII_USTRINGPARAM( "2" ) ); + myDefault = OUString( "1" ); + OUString myDefault2 = OUString( "2" ); bootstrap.getFrom( name, value, myDefault ); OSL_ASSERT( value == myDefault ); diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx index 8733eebba23e..39ced7a05af9 100644 --- a/sal/test/unloading/unloadTest.cxx +++ b/sal/test/unloading/unloadTest.cxx @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) // Test if the servicemanager can be created and if the sample libs // can be loaded // Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( -// OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); +// OUString("applicat.rdb")); // if( !serviceManager.is()) // { // printf("\n ####################################################\n" @@ -120,7 +120,7 @@ int main(int argc, char* argv[]) // } // //destroy servicemanager // Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); -// Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); +// Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); // Reference<XComponentContext> xContext; // any_prop >>= xContext; // Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -179,7 +179,7 @@ sal_Bool test1() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -189,7 +189,7 @@ sal_Bool test1() xint=0; Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -216,7 +216,7 @@ sal_Bool test2() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -233,7 +233,7 @@ sal_Bool test2() rtl_registerModuleForUnloading(mod3); // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -261,7 +261,7 @@ sal_Bool test3() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -277,7 +277,7 @@ sal_Bool test3() rtl_registerModuleForUnloading(mod2); // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -309,7 +309,7 @@ sal_Bool test4() OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -325,7 +325,7 @@ sal_Bool test4() //----------------------------------------------------------- // ---------------------------------------------------------- Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -357,7 +357,7 @@ sal_Bool test5() OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); //----------------------------------------------------------- Reference<XInterface> xint= serviceManager->createInstance( OUString( @@ -381,7 +381,7 @@ sal_Bool test5() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -426,7 +426,7 @@ sal_Bool test6() OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); @@ -436,7 +436,7 @@ sal_Bool test6() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -530,7 +530,7 @@ sal_Bool test8() { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XContentEnumerationAccess> xContent( serviceManager, UNO_QUERY); Reference<XEnumeration> xenum= xContent->createContentEnumeration( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4))); @@ -580,7 +580,7 @@ sal_Bool test8() // get rid of the service manager Reference<XPropertySet> xSet( serviceManager, UNO_QUERY); - Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))); + Any any_prop= xSet->getPropertyValue( OUString("DefaultContext")); Reference<XComponentContext> xContext; any_prop >>= xContext; Reference<XComponent> xComponent( xContext, UNO_QUERY); @@ -616,7 +616,7 @@ sal_Bool test9() OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb"))); + OUString("applicat.rdb")); Reference<XInterface> xint= serviceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1))); diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 6293c8505933..a66eb1857989 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -776,7 +776,7 @@ bool Converter::convertDuration(double& rfTime, nSecs = nTemp; nTemp = 0; bIsFraction = true; - sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0.")); + sDoubleStr = OUString("0."); } else if ( c == sal_Unicode('S') ) { @@ -784,7 +784,7 @@ bool Converter::convertDuration(double& rfTime, { nSecs = nTemp; nTemp = 0; - sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0.0")); + sDoubleStr = OUString("0.0"); } } else diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 37cf3d06394a..314e60b007d8 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -33,7 +33,7 @@ FastSerializerHelper::FastSerializerHelper(const Reference< io::XOutputStream >& { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext(), UNO_SET_THROW ); Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), UNO_SET_THROW ); - mxTokenHandler.set( xFactory->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.FastTokenHandler") ), xContext ), UNO_QUERY_THROW ); + mxTokenHandler.set( xFactory->createInstanceWithContext( rtl::OUString( "com.sun.star.xml.sax.FastTokenHandler"), xContext ), UNO_QUERY_THROW ); mpSerializer->setFastTokenHandler( mxTokenHandler ); mpSerializer->setOutputStream( xOutputStream ); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index da29b141f94e..85d4801519b7 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -109,86 +109,86 @@ void ScMacrosTest::testVba() { TestMacroInfo testInfo[] = { { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestAddress.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestAddress."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")), + rtl::OUString("vba."), + rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("MiscRangeTests."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")) + rtl::OUString("bytearraystring."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("AutoFilter."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("CalcFont."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestIntersection."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestUnion."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("range-4."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges-3."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestCalc_Rangetest."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestCalc_Rangetest2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if FIXRANGEADDRESSING //ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused //about the addressing mode of the document vs the addressing mode of a named //range ( need to fix that ) { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges-2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("pagesetup."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Window."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("window2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageBreaks.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("PageBreaks."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shapes.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Shapes."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if VBA_TEST_WORKING { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif }; diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index 174debde8160..d404d335c97c 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -164,8 +164,7 @@ void ScChartRegressionTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index fdbd7486eef6..d5971c0033a2 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 2c3694aa520a..62d662672352 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -87,7 +87,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init() { // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 97366dec287f..a65a04878b9a 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -80,8 +80,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1), - apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35"))) + apitest::XSearchable(rtl::OUString("15"), 1), + apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35")) { } diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index c122e4fac742..a54716720883 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges"))), UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); CPPUNIT_ASSERT(xDBRange.is()); return xDBRange; diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index ccc7417638da..c52952eeff4f 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -76,7 +76,7 @@ ScDataPilotFieldObj::ScDataPilotFieldObj() uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("scdatapilotfieldobj.ods")), aFileURL); + createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() CPPUNIT_ASSERT(xDPT.is()); uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames(); - uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilot1"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPDsc.is()); uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 1e9f2a873bad..05a7572d411c 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -84,7 +84,7 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent; ScDataPilotTableObj::ScDataPilotTableObj() : UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))) + apitest::XNamed(rtl::OUString("DataPilotTable")) { } @@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; @@ -128,7 +128,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets() uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable2"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 167e3b290045..13384e83bd39 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -44,7 +44,7 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent; uno::Reference< uno::XInterface > ScModelObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScModelObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 95e2b0f75e25..8403c051b076 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -74,7 +74,7 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent; ScNamedRangeObj::ScNamedRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))), + apitest::XNamed(rtl::OUString("NamedRange")), apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7)) { } @@ -82,7 +82,7 @@ ScNamedRangeObj::ScNamedRangeObj(): uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU uno::Reference< uno::XInterface > ScNamedRangeObj::init() { - return getNamedRange(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))); + return getNamedRange(rtl::OUString("NamedRange")); } void ScNamedRangeObj::setUp() diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index d921932c0900..b52962d85115 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -70,7 +70,7 @@ ScNamedRangesObj::ScNamedRangesObj() uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index f55178bd1e09..4e7f1540c528 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -73,7 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init() { // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScOutlineObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index e10df62997d6..f41d2ac3d83e 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -65,8 +65,8 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent; ScTableSheetObj::ScTableSheetObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4), - apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString"))) + apitest::XSearchable(rtl::OUString("test"), 4), + apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString")) { } @@ -74,7 +74,7 @@ ScTableSheetObj::ScTableSheetObj(): uno::Reference< uno::XInterface > ScTableSheetObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScTableSheetObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index a1e97d5a73e8..cfc771c7b0a9 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0; ScTableSheetsObj::ScTableSheetsObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNameContainer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2"))) + apitest::XNameContainer(rtl::OUString("Sheet2")) { } @@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl:: uno::Reference< uno::XInterface > ScTableSheetsObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods")), aFileURL); + createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 67db72eee7c4..3b23c60f19d5 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -131,16 +131,16 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, void ScFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")), + testDir(OUString("Quattro Pro 6.0"), getURLFromSrc("/sc/qa/unit/data/qpro/"), OUString()); //warning, the current "sylk filter" in sc (docsh.cxx) automatically //chains on failure on trying as csv, rtf, etc. so "success" may //not indicate that it imported as .slk. - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")), + testDir(OUString("SYLK"), getURLFromSrc("/sc/qa/unit/data/slk/"), OUString()); - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel 97")), + testDir(OUString("MS Excel 97"), getURLFromSrc("/sc/qa/unit/data/xls/"), OUString()); #endif } @@ -209,16 +209,16 @@ void testRangeNameImpl(ScDocument* pDoc) { //check one range data per sheet and one global more detailed //add some more checks here - ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1"))); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1")); CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData); double aValue; pDoc->GetValue(1,0,0,aValue); CPPUNIT_ASSERT_MESSAGE("range name Global1 should reference Sheet1.A1", aValue == 1); - pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1"))); + pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1")); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData); pDoc->GetValue(1,2,0,aValue); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", aValue == 3); - pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2"))); + pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2")); CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData); //check for correct results for the remaining formulas pDoc->GetValue(1,1,0, aValue); @@ -262,9 +262,9 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat ) //same code for ods, OUString aString = pDoc->GetString(1, 0, 0); //check string import - CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String1"))); + CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString("String1")); aString = pDoc->GetString(1, 1, 0); - CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String2"))); + CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString("String2")); //check basic formula import pDoc->GetValue(2,0,0,fValue); @@ -462,8 +462,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 0d77c0b0e67a..5325bbc37850 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -217,7 +217,7 @@ public: SfxFilter* pExportFilter = new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + rUserData, OUString("private:factory/scalc*") ); pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 621a6d77f8c5..d7998a78e28a 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -76,7 +76,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt SfxFilter* pExportFilter = new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + rUserData, OUString("private:factory/scalc*") ); pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); SfxItemSet* pExportSet = aStoreMedium.GetItemSet(); @@ -212,8 +212,7 @@ void ScExportTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index cdaaa3e8c777..0bb7645944e5 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -239,16 +239,16 @@ void testRangeNameImpl(ScDocument* pDoc) { //check one range data per sheet and one global more detailed //add some more checks here - ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1"))); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1")); CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData); double aValue; pDoc->GetValue(1,0,0,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Global1 should reference Sheet1.A1", 1.0, aValue); - pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1"))); + pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1")); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData); pDoc->GetValue(1,2,0,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", 3.0, aValue); - pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2"))); + pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2")); CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData); pDoc->GetValue(1,1,1,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet2.Local2 should reference Sheet2.A2", 7.0, aValue); @@ -323,7 +323,7 @@ void ScFiltersTest::testHardRecalcODS() //test hard recalc: document has an incorrect cached formula result //hard recalc should have updated to the correct result - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("hard-recalc.")), aCSVFileName); + createCSVPath(OUString("hard-recalc."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -339,16 +339,16 @@ void ScFiltersTest::testFunctionsODS() OUString aCSVFileName; //test logical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName); + createCSVPath(OUString("logical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); //test spreadsheet functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName); + createCSVPath(OUString("spreadsheet-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); //test mathematical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName); + createCSVPath(OUString("mathematical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 2, PureString); //test information functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName); + createCSVPath(OUString("information-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 3); xDocSh->DoClose(); @@ -364,16 +364,16 @@ void ScFiltersTest::testCachedFormulaResultsODS() OUString aCSVFileName; //test cached formula results of logical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName); + createCSVPath(OUString("logical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); //test cached formula results of spreadsheet functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName); + createCSVPath(OUString("spreadsheet-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); //test cached formula results of mathematical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName); + createCSVPath(OUString("mathematical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 2, PureString); //test cached formula results of information functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName); + createCSVPath(OUString("information-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 3); xDocSh->DoClose(); @@ -537,7 +537,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n { //test Sheet1 with csv file OUString aCSVFileName; - pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("numberFormat.")), aCSVFileName); + pFiltersTest->createCSVPath(OUString("numberFormat."), aCSVFileName); testFile(aCSVFileName, pDoc, 0, PureString); //need to test the color of B3 //it's not a font color! @@ -609,7 +609,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n //test Sheet3 only for ods if ( nFormat == ODS || nFormat == XLSX ) { - pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName); + pFiltersTest->createCSVPath(OUString("conditionalFormatting."), aCSVFileName); testCondFile(aCSVFileName, pDoc, 2); // test parent cell style import ( fdo#55198 ) if ( nFormat == XLSX ) @@ -692,7 +692,7 @@ void ScFiltersTest::testMatrixODS() ScDocument* pDoc = xDocSh->GetDocument(); OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName); + createCSVPath(OUString("matrix."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -707,7 +707,7 @@ void ScFiltersTest::testMatrixXLS() ScDocument* pDoc = xDocSh->GetDocument(); OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName); + createCSVPath(OUString("matrix."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -903,7 +903,7 @@ void ScFiltersTest::testBugFixesODS() { // fdo#40967 OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("bugFix_Sheet2.")), aCSVFileName); + createCSVPath(OUString("bugFix_Sheet2."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); } @@ -976,7 +976,7 @@ void ScFiltersTest::testMergedCellsODS() //check sheet1 content OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged1.")), aCSVFileName1); + createCSVPath(OUString("merged1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); //check sheet1 merged cells @@ -986,7 +986,7 @@ void ScFiltersTest::testMergedCellsODS() //check sheet2 content OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged2.")), aCSVFileName2); + createCSVPath(OUString("merged2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); //check sheet2 merged cells @@ -1002,12 +1002,12 @@ void ScFiltersTest::testRepeatedColumnsODS() //text OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns1.")), aCSVFileName1); + createCSVPath(OUString("repeatedColumns1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); //numbers OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns2.")), aCSVFileName2); + createCSVPath(OUString("repeatedColumns2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); xDocSh->DoClose(); @@ -1140,11 +1140,11 @@ void ScFiltersTest::testDataValidityODS() //check each sheet's content OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity1.")), aCSVFileName1); + createCSVPath(OUString("dataValidity1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity2.")), aCSVFileName2); + createCSVPath(OUString("dataValidity2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); xDocSh->DoClose(); @@ -1251,13 +1251,13 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) SfxFilter* aFilter = new SfxFilter( aFilterName, OUString(), aFileFormats[0].nFormatType, nFormat, aFilterType, 0, OUString(), - OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + OUString(), OUString("private:factory/scalc*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocSh = new ScDocShell; SfxMedium* pMedium = new SfxMedium(aFileName, STREAM_STD_READWRITE); SfxItemSet* pSet = pMedium->GetItemSet(); - pSet->Put(SfxStringItem(SID_PASSWORD, OUString(RTL_CONSTASCII_USTRINGPARAM("test")))); + pSet->Put(SfxStringItem(SID_PASSWORD, OUString("test"))); pMedium->SetFilter(aFilter); if (!xDocSh->DoLoad(pMedium)) { @@ -1795,7 +1795,7 @@ void ScFiltersTest::testColorScaleODS() ScDocument* pDoc = xDocSh->GetDocument(); OUStringBuffer aBuffer(getSrcRootPath()); - aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/"))); + aBuffer.append(m_aBaseString).append(OUString("/reference/")); testColorScale_Impl(pDoc, aBuffer.makeStringAndClear()); xDocSh->DoClose(); @@ -1821,7 +1821,7 @@ void ScFiltersTest::testColorScaleXLSX() ScDocument* pDoc = xDocSh->GetDocument(); OUStringBuffer aBuffer(getSrcRootPath()); - aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/"))); + aBuffer.append(m_aBaseString).append(OUString("/reference/")); testColorScale_Impl(pDoc, aBuffer.makeStringAndClear()); xDocSh->DoClose(); @@ -1974,8 +1974,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 75a2eb2b17fe..56afd712f7b1 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -3326,7 +3326,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc, return; OUString aTitle; - Any any = xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("String")) ); + Any any = xProp->getPropertyValue( OUString("String") ); if (any >>= aTitle) rSubTitle = aTitle; } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index a3f4d3271f61..e7069cdae9cb 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -207,8 +207,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) return; sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/sharedStrings.xml") ), - OUString(RTL_CONSTASCII_USTRINGPARAM( "sharedStrings.xml" )), + OUString( "xl/sharedStrings.xml"), + OUString( "sharedStrings.xml" ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" ); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ac9ca175c152..34304bfb6b67 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -3047,8 +3047,8 @@ XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/styles.xml") ), - OUString(RTL_CONSTASCII_USTRINGPARAM( "styles.xml" )), + OUString( "xl/styles.xml"), + OUString( "styles.xml" ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" ); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 256287305959..89d55be8e2f4 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1453,7 +1453,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); + aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" ); aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9305c90fede7..646abc13ee4c 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -705,7 +705,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) nScTab = rDoc.GetTableCount(); rDoc.MakeTable( nScTab ); - rtl::OUStringBuffer aDummyName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DPCache") )); + rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache")); if( maTabName.Len() > 0 ) aDummyName.append( '_' ).append( maTabName ); rtl::OUString aName = aDummyName.makeStringAndClear(); diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index cfc058e0bbe1..0c2f9c10b28a 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -62,12 +62,12 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") ); - msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") ); + msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc"); + msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open"); // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") ); + tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print"); */ } @@ -180,7 +180,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) @@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") ); + aProp.Name = rtl::OUString("ItemDescriptorContainer"); aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") ); + sProps[ 0 ].Name = rtl::OUString("Type"); sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } @@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( std::vector<ScCTB>::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 916f7a2a7ef5..7982f1d378e5 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1398,7 +1398,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // ALT text only if not any image loaded if (!pActEntry->aAltText.isEmpty()) - pActEntry->aAltText += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; ")); + pActEntry->aAltText += rtl::OUString("; "); pActEntry->aAltText += rOption.GetString(); } diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 70411f1b6674..eb33c39c04e0 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -203,7 +203,7 @@ void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAdd rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ). append( sal_Unicode( '_' ) ).append( nSharedId ). - append( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_0") ) ).makeStringAndClear(); + append( rtl::OUString("_0") ).makeStringAndClear(); ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 ); pScRangeData->SetType(RT_SHARED); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 1c50a5cb1f9d..79a47fb378da 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1624,8 +1624,8 @@ void XclExpChangeTrack::Write() static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm ) { sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/userNames.xml" )), - OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/userNames.xml" )), + OUString( "xl/revisions/userNames.xml" ), + OUString( "revisions/userNames.xml" ), rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames" ); @@ -1648,8 +1648,8 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm ) lcl_WriteUserNamesXml( rWorkbookStrm ); sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/revisionHeaders.xml" )), - OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/revisionHeaders.xml" )), + OUString( "xl/revisions/revisionHeaders.xml" ), + OUString( "revisions/revisionHeaders.xml" ), rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders" ); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 2b7bb8679489..a89a4827314d 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -76,27 +76,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( if (bUseRegularExpressions) return GetXMLToken(XML_MATCH); else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return rtl::OUString("="); } case SC_NOT_EQUAL : { if (bUseRegularExpressions) return GetXMLToken(XML_NOMATCH); else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + return rtl::OUString("!="); } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + return rtl::OUString(">"); case SC_GREATER_EQUAL : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + return rtl::OUString(">="); case SC_LESS : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + return rtl::OUString("<"); case SC_LESS_EQUAL : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + return rtl::OUString("<="); case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -104,7 +104,7 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return rtl::OUString("="); } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index c3abd40497eb..dade8e0d2144 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -397,21 +397,21 @@ private: if (bRegExp) return GetXMLToken(XML_MATCH); else - return OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return OUString("="); } case SC_GREATER: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + return rtl::OUString(">"); case SC_GREATER_EQUAL: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + return rtl::OUString(">="); case SC_LESS: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + return rtl::OUString("<"); case SC_LESS_EQUAL: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + return rtl::OUString("<="); case SC_NOT_EQUAL: if (bRegExp) return GetXMLToken(XML_NOMATCH); else - return OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + return OUString("!="); case SC_TOPPERC: return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL: @@ -419,7 +419,7 @@ private: default: ; } - return OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return OUString("="); } class WriteSetItem : public std::unary_function<ScQueryEntry::Item, void> @@ -472,7 +472,7 @@ private: // Store the 1st value for backward compatibility. const ScQueryEntry::Item& rItem = rItems.front(); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rItem.maString); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString(RTL_CONSTASCII_USTRINGPARAM("="))); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString("=")); SvXMLElementExport aElemC(mrExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true); std::for_each(rItems.begin(), rItems.end(), WriteSetItem(mrExport)); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 5e5c2161ac1b..3ee937109f72 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -194,7 +194,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); break; case sheet::ValidationType_LIST : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-in-list(")); + sCondition += rtl::OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); break; @@ -221,7 +221,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const !aValidation.sFormula2.isEmpty()))) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" and ")); + sCondition += rtl::OUString(" and "); if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { @@ -230,22 +230,22 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + sCondition += rtl::OUString("="); break; case sheet::ConditionOperator_GREATER : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + sCondition += rtl::OUString(">"); break; case sheet::ConditionOperator_GREATER_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + sCondition += rtl::OUString(">="); break; case sheet::ConditionOperator_LESS : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + sCondition += rtl::OUString("<"); break; case sheet::ConditionOperator_LESS_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + sCondition += rtl::OUString("<="); break; case sheet::ConditionOperator_NOT_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + sCondition += rtl::OUString("!="); break; default: { @@ -259,19 +259,19 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-between(")); + sCondition += rtl::OUString("cell-content-text-length-is-between("); else - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-not-between(")); + sCondition += rtl::OUString("cell-content-text-length-is-not-between("); } else { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between(")); + sCondition += rtl::OUString("cell-content-is-between("); else - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between(")); + sCondition += rtl::OUString("cell-content-is-not-between("); } sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sCondition += rtl::OUString(","); sCondition += aValidation.sFormula2; sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index ed892944e65a..e53ca9a66205 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -157,7 +157,7 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Default" )); + sCellStyleName = rtl::OUString( "Default" ); GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index a926e539c208..091b66fd3d5c 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -472,7 +472,7 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("macro")); + sErrorMessageType = rtl::OUString("macro"); bDisplayError = bExecute; } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 175a6c6af5c5..1d55a64526e9 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -213,7 +213,7 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLMetaExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() @@ -247,7 +247,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLStylesExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() @@ -264,7 +264,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLContentExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() @@ -281,7 +281,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLSettingsExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() @@ -300,7 +300,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() @@ -318,7 +318,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() @@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() @@ -354,7 +354,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() @@ -372,7 +372,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() @@ -420,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit() { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xProperties( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" )) ), + rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), com::sun::star::uno::UNO_QUERY); if (xProperties.is()) { sal_Int16 nFieldUnit = 0; - if (xProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metric"))) >>= nFieldUnit) + if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit) return nFieldUnit; } return 0; @@ -506,7 +506,7 @@ ScXMLExport::ScXMLExport( // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta_extref")); + sExternalRefTabStyleName = rtl::OUString("ta_extref"); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -801,11 +801,11 @@ void ScXMLExport::_ExportMeta() CollectSharedData(nTableCount, nShapesCount); uno::Sequence<beans::NamedValue> stats(3); - stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")), + stats[0] = beans::NamedValue(::rtl::OUString("TableCount"), uno::makeAny(nTableCount)); - stats[1] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellCount")), + stats[1] = beans::NamedValue(::rtl::OUString("CellCount"), uno::makeAny(nCellCount)); - stats[2] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount")), + stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"), uno::makeAny(nShapesCount)); // update document statistics at the model @@ -1058,7 +1058,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd void ScXMLExport::ExportExternalRefCacheStyles() { sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex( - "NumberFormat", XML_NAMESPACE_STYLE, OUString(RTL_CONSTASCII_USTRINGPARAM("data-style-name"))); + "NumberFormat", XML_NAMESPACE_STYLE, OUString("data-style-name")); if (nEntryIndex < 0) // No entry index for the number format is found. @@ -1072,7 +1072,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() // Export each unique number format used in the external ref cache. vector<sal_uInt32> aNumFmts; pRefMgr->getAllCachedNumberFormats(aNumFmts); - const OUString aDefaultStyle = OUString(RTL_CONSTASCII_USTRINGPARAM("Default")).intern(); + const OUString aDefaultStyle = OUString("Default").intern(); for (vector<sal_uInt32>::const_iterator itr = aNumFmts.begin(), itrEnd = aNumFmts.end(); itr != itrEnd; ++itr) { @@ -1755,7 +1755,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) @@ -1769,7 +1769,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles"))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); @@ -1790,7 +1790,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) } exportDataStyles(); - aStylesExp.exportStyleFamily(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles")), + aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); @@ -3012,7 +3012,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder"))) >>= nZOrder) + if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder) { rtl::OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); @@ -4405,39 +4405,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChanges")); + pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges"); pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAcceptedChanges")); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges"); pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowRejectedChanges")); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges"); pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeMode")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeFirstDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeSecondDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthor")); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthorName")); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByComment")); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByCommentText")); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRanges")); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); rtl::OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRangesList")); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesViewSettings")); + pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings"); pProps[nChangePos].Value <<= aChangeProps; } } @@ -4460,13 +4460,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop")); + pProps[i].Name = rtl::OUString("VisibleAreaTop"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft")); + pProps[++i].Name = rtl::OUString("VisibleAreaLeft"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth")); + pProps[++i].Name = rtl::OUString("VisibleAreaWidth"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight")); + pProps[++i].Name = rtl::OUString("VisibleAreaHeight"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); } } @@ -4485,7 +4485,7 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); @@ -4521,19 +4521,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps.realloc(nCount + nPropsToAdd); if (aTrackedChangesKey.getLength()) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey")); + rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey"); rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode")); + rProps[nCount].Name = rtl::OUString("VBACompatibilityMode"); rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration")); + rProps[nCount].Name = rtl::OUString("ScriptConfiguration"); rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 0d766521ea0f..c57810805c9f 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -107,7 +107,7 @@ using ::rtl::OUStringBuffer; OUString SAL_CALL ScXMLImport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() @@ -126,7 +126,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() @@ -145,7 +145,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() @@ -164,7 +164,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() @@ -183,7 +183,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() @@ -2566,7 +2566,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } } - uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings"))); + uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2615,7 +2615,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri { rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring ")); sErrorMessage += sFormatString; - sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" an Position ")); + sErrorMessage += rtl::OUString(" an Position "); sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); uno::Sequence<rtl::OUString> aSeq(1); aSeq[0] = sErrorMessage; @@ -2746,7 +2746,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } @@ -2802,7 +2802,7 @@ void ScXMLImport::SetStyleToRanges() if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>( xMultiServiceFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))), + rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a74113bd6997..a0904fe90c1d 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -733,11 +733,11 @@ void ScXMLAutoStylePoolP::exportStyleContent( aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between(")); + sCondition = rtl::OUString("cell-content-is-between("); else - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between(")); + sCondition = rtl::OUString("cell-content-is-not-between("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sCondition += rtl::OUString(","); sCondition += xSheetCondition->getFormula2(); sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } @@ -747,22 +747,22 @@ void ScXMLAutoStylePoolP::exportStyleContent( switch (aOperator) { case sheet::ConditionOperator_LESS: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + sCondition += rtl::OUString("<"); break; case sheet::ConditionOperator_GREATER: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + sCondition += rtl::OUString(">"); break; case sheet::ConditionOperator_LESS_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + sCondition += rtl::OUString("<="); break; case sheet::ConditionOperator_GREATER_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + sCondition += rtl::OUString(">="); break; case sheet::ConditionOperator_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + sCondition += rtl::OUString("="); break; case sheet::ConditionOperator_NOT_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + sCondition += rtl::OUString("!="); break; default: { @@ -1080,7 +1080,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML( else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked) { rStrExpValue = GetXMLToken(XML_PROTECTED); - rStrExpValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + rStrExpValue += rtl::OUString(" "); rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN); bRetval = sal_True; } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index a29930b69daf..249173dec035 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } @@ -709,7 +709,7 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const uno::Reference< XAttributeList > & xAttrList, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) )), + sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )), sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), @@ -800,7 +800,7 @@ uno::Reference < XNameContainer > xStyles.set(xTableStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TableStyles" ) )); + OUString( rtl::OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -809,7 +809,7 @@ uno::Reference < XNameContainer > xStyles.set(xCellStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) )); + OUString( rtl::OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -818,7 +818,7 @@ uno::Reference < XNameContainer > xStyles.set(xColumnStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnStyles" ) )); + OUString( rtl::OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -827,7 +827,7 @@ uno::Reference < XNameContainer > xStyles.set(xRowStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowStyles" ) )); + OUString( rtl::OUString( "RowStyles" )); } break; } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 67e8167e3d87..2aca9fda70d4 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -137,7 +137,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe aParserInput.aInputStream = xDocStream->getInputStream(); uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY ); - uno::Any aAny = xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); + uno::Any aAny = xSet->getPropertyValue( OUString("Encrypted") ); aAny >>= bEncrypted; } catch( const packages::WrongPasswordException& ) @@ -389,7 +389,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange)); } // Set base URI @@ -410,11 +410,11 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" )); + aName = ::rtl::OUString( "dummyObjectName" ); if( !aName.isEmpty() ) { - sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = rtl::OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -528,9 +528,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesImporter")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesImporter")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"), + rtl::OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); @@ -549,10 +549,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentImporter")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentImporter")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content.xml")), aDocArgs, + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"), + rtl::OUString("content.xml"), + rtl::OUString("Content.xml"), aDocArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); @@ -610,14 +610,14 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) } // Set Code Names - uno::Any aAny = xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration") )); + uno::Any aAny = xInfoSet->getPropertyValue(OUString("ScriptConfiguration")); uno::Reference <container::XNameAccess> xCodeNameAccess; if( aAny >>= xCodeNameAccess ) XMLCodeNameProvider::set( xCodeNameAccess, &rDoc ); // VBA compatibility bool bVBACompat = false; - if ( (xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"))) >>= bVBACompat) && bVBACompat ) + if ( (xInfoSet->getPropertyValue(OUString("VBACompatibilityMode")) >>= bVBACompat) && bVBACompat ) { /* Set library container to VBA compatibility mode, this forces loading the Basic project, which in turn creates the @@ -625,7 +625,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if ( xModelSet.is() ) try { uno::Reference< script::vba::XVBACompatibility > xVBACompat( xModelSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW ); + OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); xVBACompat->setVBACompatibilityMode( sal_True ); } catch( const uno::Exception& ) @@ -682,7 +682,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(sMediaType)); + xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); // advise storage impl to use common encryption @@ -794,7 +794,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); uno::Sequence<beans::PropertyValue> aDescriptor(1); beans::PropertyValue* pProps = aDescriptor.getArray(); - pProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) ); + pProps[0].Name = OUString( "FileName" ); pProps[0].Value <<= sFileName; /** property map for export info set */ @@ -852,7 +852,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = rtl::OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -873,7 +873,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) { ::rtl::OUString aVersion; if (( xPropSet->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version"))) >>= aVersion ) + rtl::OUString("Version")) >>= aVersion ) && !aVersion.equals(ODFVER_010_TEXT) && !aVersion.equals(ODFVER_011_TEXT) ) { @@ -902,10 +902,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("meta.xml")), + rtl::OUString("meta.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisMetaExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); @@ -943,10 +943,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("styles.xml")), + rtl::OUString("styles.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); @@ -967,10 +967,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("content.xml")), + rtl::OUString("content.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); @@ -995,10 +995,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("settings.xml")), + rtl::OUString("settings.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisSettingsExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 4dd5387721b6..eadf4b239b4a 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -268,7 +268,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCell")); + return rtl::OUString("ScAccessibleCell"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -280,7 +280,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessibleCell")); + pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 0e7220ad3459..b9a0e082cd7d 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -290,7 +290,7 @@ uno::Any SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCellBase")); + return rtl::OUString("ScAccessibleCellBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index a6b6c9e6d790..f19eb7c4692a 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -467,7 +467,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( ScAccessibleContextBase::getImplementationName(void) throw (uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleContextBase")); + return OUString("ScAccessibleContextBase"); } sal_Bool SAL_CALL @@ -494,8 +494,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL OUString* pServiceNames = aServiceNames.getArray(); if (pServiceNames) { - pServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.Accessible")); - pServiceNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.AccessibleContext")); + pServiceNames[0] = OUString("com.sun.star.accessibility.Accessible"); + pServiceNames[1] = OUString("com.sun.star.accessibility.AccessibleContext"); } return aServiceNames; diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 035004ae60f4..0b3141f7f3a8 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -450,7 +450,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc ::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotControl")); + return rtl::OUString("ScAccessibleDataPilotControl"); } ///===== XTypeProvider =================================================== @@ -661,7 +661,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc ::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotButton")); + return rtl::OUString("ScAccessibleDataPilotButton"); } ///===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e0d17a63dfbc..76f84f0441ed 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerID" ))); + uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" )); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1787,7 +1787,7 @@ void SAL_CALL ScAccessibleDocument::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDocument")); + return ::rtl::OUString("ScAccessibleDocument"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -1799,7 +1799,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetDocumentView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index be40bd82f2be..99927af07599 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1594,7 +1594,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge ::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleDocumentPagePreview")); + return ::rtl::OUString("ScAccessibleDocumentPagePreview"); } uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) @@ -1605,7 +1605,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSup aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetPageView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 8a5ed0294479..8c8583ecf9cb 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -275,7 +275,7 @@ void SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleEditObject")); + return rtl::OUString("ScAccessibleEditObject"); } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index fbab89dfacc5..d2618789456a 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -160,7 +160,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() OUString ScAccessibleFilterMenu::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenu")); + return OUString("ScAccessibleFilterMenu"); } // XAccessibleEventBroadcaster diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index feb88a715d27..dfaae342ba46 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -79,7 +79,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet OUString ScAccessibleFilterMenuItem::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenuItem")); + return OUString("ScAccessibleFilterMenuItem"); } // XAccessibleAction @@ -99,7 +99,7 @@ sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("click")); + return OUString("click"); } Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding( diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 58df96c3638a..c5511140c64b 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -84,7 +84,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterTopWindow")); + return OUString("ScAccessibleFilterTopWindow"); } void ScAccessibleFilterTopWindow::setAccessibleChild( diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 5af2ec182fbc..7291e3ffc7ef 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -318,7 +318,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePageHeader")); + return rtl::OUString("ScAccessiblePageHeader"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() @@ -329,7 +329,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServic aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AccessibleHeaderFooterView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 40bf5a636892..61efa0e810e1 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -185,7 +185,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessiblePageHeaderArea")); + return rtl::OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -197,7 +197,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index f532a72492ff..ce6a79a52da1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -182,7 +182,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewCell")); + return rtl::OUString("ScAccessiblePreviewCell"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() @@ -193,7 +193,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServi aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index eb80f9d9f14e..3f747ee53947 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -268,7 +268,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewHeaderCell")); + return rtl::OUString("ScAccessiblePreviewHeaderCell"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() @@ -279,7 +279,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupporte aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } @@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { //! name for corner cell? -// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header")); +// sName = rtl::OUString("Column/Row Header"); } else { diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index d7833cd64674..557db8336f5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -568,7 +568,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewTable")); + return rtl::OUString("ScAccessiblePreviewTable"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() @@ -579,7 +579,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServ aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleTableView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index e4d00607fa6b..88037b59b4c5 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -798,7 +798,7 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) ::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleSpreadsheet")); + return rtl::OUString("ScAccessibleSpreadsheet"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -810,7 +810,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheet")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 3a950c49e3f6..b5de4ab84886 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -439,7 +439,7 @@ void SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleTableBase")); + return rtl::OUString("ScAccessibleTableBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 75bb92b8ad8e..f34b346b2ff7 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2776,7 +2776,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + rtl::OUString("'")); aReplace = rtl::OUString(pAuto->GetEndSingleQuote()); if (aReplace.isEmpty()) @@ -2784,7 +2784,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + rtl::OUString("'")); } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6ada63d7fdff..27ff958d4176 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -2096,7 +2096,7 @@ namespace { rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) { rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aString.append(rtl::OUString(" (")); aString.append(rTableName); aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 7b35091fd679..01602ecf8460 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -136,7 +136,7 @@ void ScDLL::Init() ScModule* pMod = new ScModule( &ScDocShell::Factory() ); (*ppShlPtr) = pMod; - ScDocShell::Factory().SetDocumentServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) ); + ScDocShell::Factory().SetDocumentServiceName( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); ScGlobal::Init(); // erst wenn der ResManager initialisiert ist // erst nach ScGlobal::Init duerfen die App-Optionen diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 29f9618107da..2951c569a161 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -550,7 +550,7 @@ void ScModule::Execute( SfxRequest& rReq ) { try { - com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY); + com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 925ff9963cc8..910b6c50d9c4 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -49,7 +49,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) ); + aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); if ( fp ) return fp(); return 0; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 98f37d0a31f2..e13894aef1f1 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -93,7 +93,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa maLabelFont.SetHeight(nPopupFontHeight); SetFont(maLabelFont); - SetText( OUString(RTL_CONSTASCII_USTRINGPARAM("ScMenuFloatingWindow")) ); + SetText( OUString("ScMenuFloatingWindow") ); } ScMenuFloatingWindow::~ScMenuFloatingWindow() diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 9fcf586e362f..120a633b4812 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,7 +311,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); + aArgs[0].Name = rtl::OUString( "ScalingFactor" ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); @@ -351,7 +351,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); + aArgs[0].Name = rtl::OUString( "ScalingFactor" ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index f45c7f20e288..23fdc2329f0f 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -75,7 +75,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), + rtl::OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if (xBeamerFrame.is()) { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 28c7af47d308..97cb21813ba3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2810,7 +2810,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -2855,12 +2855,12 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Sheet")) + rtl::OUString::valueOf( ++nNum ); + genModuleName = rtl::OUString( "Sheet") + rtl::OUString::valueOf( ++nNum ); uno::Any aSourceAny; rtl::OUString sTmpSource = sSource; if ( sTmpSource.isEmpty() ) - sTmpSource = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" )); + sTmpSource = ::rtl::OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); aSourceAny <<= sTmpSource; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 150c26993b5a..67ae652f7d49 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -685,7 +685,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); + ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -703,7 +703,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), + aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ), uno::makeAny( xSpreadsheetView ) ); xJob->execute( aArgsForJob ); } @@ -831,7 +831,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName")); + aValues[0].Name = ::rtl::OUString( "FilterName"); aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); @@ -2921,7 +2921,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) // Grab the Calc configuration. Reference<XUIConfigurationManager> xConfigMgr = xModuleCfgSupplier->getUIConfigurationManager( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))); + OUString("com.sun.star.sheet.SpreadsheetDocument")); if (!xConfigMgr.is()) return; @@ -2968,15 +2968,15 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) switch (eType) { case ScOptionsUtil::KEY_DEFAULT: - xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents"))); - xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete"))); - xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillDown"))); - xScAccel->setKeyEvent(aAltDown, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect"))); + xScAccel->setKeyEvent(aDelete, OUString(".uno:ClearContents")); + xScAccel->setKeyEvent(aBackspace, OUString(".uno:Delete")); + xScAccel->setKeyEvent(aCtrlD, OUString(".uno:FillDown")); + xScAccel->setKeyEvent(aAltDown, OUString(".uno:DataSelect")); break; case ScOptionsUtil::KEY_OOO_LEGACY: - xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete"))); - xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents"))); - xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect"))); + xScAccel->setKeyEvent(aDelete, OUString(".uno:Delete")); + xScAccel->setKeyEvent(aBackspace, OUString(".uno:ClearContents")); + xScAccel->setKeyEvent(aCtrlD, OUString(".uno:DataSelect")); break; default: ; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 5591d60b4cc8..93d1ca04f10e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2339,7 +2339,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + aArgs[0].Name = ::rtl::OUString( "Hidden" ); aArgs[0].Value <<= sal_True; if ( GetMedium() ) @@ -2354,7 +2354,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 82687c8458c1..40c4a0fe5ca4 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -175,7 +175,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - rtl::OUString aTransferName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "transfer" )); + rtl::OUString aTransferName = rtl::OUString( "transfer" ); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( @@ -208,7 +208,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )), + aCnt.executeCommand( rtl::OUString( "delete" ), comphelper::makeBoolAny( sal_True ) ); } catch( uno::Exception& ) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 83b8bff74a5f..0429fc820b60 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2155,7 +2155,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt { // Generate a relative file path. INetURLObject aBaseURL(getOwnDocumentName()); - aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))); + aBaseURL.insertName(OUString("content.xml")); OUString aStr = URIHelper::simpleNormalizedMakeRelative( aBaseURL.GetMainURL(INetURLObject::NO_DECODE), aFile); @@ -2279,7 +2279,7 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const String& rO // Formulate the absolute file path from the relative path. const OUString& rRelPath = maRelativeName; INetURLObject aBaseURL(rOwnDocName); - aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))); + aBaseURL.insertName(OUString("content.xml")); bool bWasAbs = false; maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::NO_DECODE); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 36d7d79086cc..4dca12ab764e 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2262,7 +2262,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() bLoaded = aModule.load(sFilterLib); if (bLoaded) { - oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFilterCreate" )) ); + oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString( "ScFilterCreate" ) ); if (fn != NULL) plugin = reinterpret_cast<FilterFn>(fn)(); } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 95e589db63c9..c9cd38ea34b0 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + ::rtl::OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + ::rtl::OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); @@ -290,7 +290,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } @@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog")) + rtl::OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xChartModel.is() && xInit.is() ) @@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam1.Name = rtl::OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel")); + aParam2.Name = rtl::OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) + if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //calculate and set new position Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")), + xDialogProps->setPropertyValue( ::rtl::OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } //tell the dialog to unlock controller - xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnlockControllersOnExecute")), + xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"), uno::makeAny( sal_True ) ); } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index a3568b0992fb..d07cefa60b47 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { try { - aCaller = xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); + aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); } catch( uno::Exception& ) {} } diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index d74d32decda1..9799b70d55c6 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -643,7 +643,7 @@ namespace { rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) { rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aString.append(rtl::OUString(" (")); aString.append(rTableName); aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index fd8c3e0102d1..e3b3c6498a8b 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -186,7 +186,7 @@ void ScUndoDeleteContents::Undo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } @@ -202,7 +202,7 @@ void ScUndoDeleteContents::Redo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 3b935e7f521a..fd09d198dcc0 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -284,7 +284,7 @@ void ScUndoEnterData::Undo() { aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } @@ -318,7 +318,7 @@ void ScUndoEnterData::Redo() { aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index b2137e8e7c3f..33a788dfcbb2 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -195,7 +195,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( rtl::OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" )); + return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); } uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() @@ -319,7 +319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -477,7 +477,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 95a4c356a149..906a227a548d 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -367,7 +367,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" )); + return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); } uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() @@ -629,7 +629,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" )); + return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); } uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() @@ -710,7 +710,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( rtl::OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" )); + return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" ); } uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static() @@ -882,7 +882,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptionEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); } // XElementAccess diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index b2454d3639c9..0109379986c8 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -79,7 +79,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRange" )), + ::rtl::OUString( "CellRange" ), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -176,7 +176,7 @@ namespace calc //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellListSource" ) ); + return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" ); } //-------------------------------------------------------------------- @@ -196,8 +196,8 @@ namespace calc Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeListSource" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ListEntrySource" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" ); return aServices; } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index bcab454b54ca..90511ae45d18 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3374,7 +3374,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection(); - rtl::OUString aName = pColl->getUniqueName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("__Uno"))); + rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno")); if (aName.isEmpty()) // failed to create unique name. return; @@ -4762,7 +4762,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); } // XIndexAccess @@ -4803,7 +4803,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" )); + return rtl::OUString( "ScCellRangesObj" ); } sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName ) @@ -6090,7 +6090,7 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" )); + return rtl::OUString( "ScCellRangeObj" ); } sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -6807,7 +6807,7 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" )); + return rtl::OUString( "ScCellObj" ); } sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) @@ -8706,7 +8706,7 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" )); + return rtl::OUString( "ScTableSheetObj" ); } sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 7356423f2980..b438d3b23973 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -85,7 +85,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BoundCell" )), + ::rtl::OUString( "BoundCell" ), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormulaResultType" )) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale; + xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) ); + xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } @@ -471,7 +471,7 @@ namespace calc { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellValueBinding" ) ); + return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } //-------------------------------------------------------------------- @@ -495,10 +495,10 @@ namespace calc DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellValueBinding" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ValueBinding" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" ); if ( m_bListPos ) - aServices[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.ListPositionCellBinding" ) ); + aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" ); return aServices; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index ccb152484ff5..9282a2737371 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1802,7 +1802,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); ::rtl::OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role"))) >>= aRole) && + if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } @@ -1904,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")), -1, + beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1913,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1921,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + beans::PropertyValue( ::rtl::OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1929,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1955,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -2025,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceMapping")), -1, + beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2486,7 +2486,7 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); -// m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_")); +// m_aIdentifier = ::rtl::OUString( "ID_"); // static sal_Int32 nID = 0; // m_aIdentifier += ::rtl::OUString::valueOf( ++nID); } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 8072f3b0d728..d0f688f424c7 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + ::rtl::OUString("HasCategories"), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + ::rtl::OUString("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -314,7 +314,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableChartsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration")); } // XIndexAccess @@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RelatedCellRanges" )), + registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 8ac0dfbf9d75..f26007d854f1 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -268,13 +268,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ), + ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !pDocShell->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ), + ::rtl::OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 ) @@ -461,7 +461,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" )); + return rtl::OUString( "ScDocumentConfiguration" ); } sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index ec6047707ff5..a71a324bf5c8 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -458,7 +458,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" )); + return rtl::OUString( "ScCellCursorObj" ); } sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ac9293f5f63f..bb7830dbd726 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -468,7 +468,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotTablesEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); } // XIndexAccess @@ -1746,7 +1746,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotFieldsEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); } // XIndexAccess @@ -2995,7 +2995,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ) ); + return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); } // XElementAccess @@ -3183,7 +3183,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ) ); + return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); } // XElementAccess @@ -3330,7 +3330,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotItemsEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index c2b441dc3470..b45539503323 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -675,7 +675,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SubTotalFieldsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); } // XIndexAccess @@ -2218,7 +2218,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" )); + return rtl::OUString( "ScDatabaseRangeObj" ); } sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -2335,7 +2335,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DatabaseRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 18b9e5b6b7af..6fa397e52f8c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -250,7 +250,7 @@ ScPrintUIOptions::ScPrintUIOptions() ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)), rtl::OUString(), aPrintRangeOpt); @@ -258,13 +258,13 @@ ScPrintUIOptions::ScPrintUIOptions() // create a choice for the content to create uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); + aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselectedcells"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), aHelpIds, "PrintContent", @@ -282,10 +282,10 @@ ScPrintUIOptions::ScPrintUIOptions() aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ) ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ) ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); aWidgetIds[1] = "printpages"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), aHelpIds, @@ -1840,7 +1840,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa That constant will be equivelant to 'ThisComponent' but for each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc' constant can co-exist, as required by VBA. */ - aRet <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisExcelDoc" ) ); + aRet <<= rtl::OUString( "ThisExcelDoc" ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { @@ -2013,7 +2013,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" )); + return rtl::OUString( "ScModelObj" ); } sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) @@ -2696,7 +2696,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); } // XIndexAccess @@ -2872,7 +2872,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableColumnsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration")); } // XIndexAccess @@ -3131,7 +3131,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableRowsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration")); } // XIndexAccess @@ -3484,7 +3484,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); } // XIndexAccess @@ -3644,7 +3644,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.ScenariosEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index e515c223f7f0..8c2822ea6f77 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")), -1, - uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ), beans::PropertyState_DIRECT_VALUE ); + rtl::OUString("EventType"), -1, + uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")), -1, + rtl::OUString("Script"), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index dd97c91e62fb..b478f1bd146c 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -392,7 +392,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -572,7 +572,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index c51f53192f14..a0c9abf624ed 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -383,7 +383,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index cd72688964b9..90d3b01dbdc1 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -246,7 +246,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( rtl::OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" )); + return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" ); } uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() @@ -261,7 +261,7 @@ uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess") ); + return rtl::OUString( "ScFunctionAccess"); } sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index e7a023bb239d..38f1ce4bd610 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -458,7 +458,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetLinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess @@ -993,7 +993,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAreaLinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); } // XIndexAccess @@ -1209,8 +1209,8 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinkObj::getResults: failed to get results!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinkObj::getResults: failed to get results!" ), uno::Reference< uno::XInterface >() ); } @@ -1241,8 +1241,8 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinkObj::setResults: failed to set results!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinkObj::setResults: failed to set results!" ), uno::Reference< uno::XInterface >() ); } } @@ -1319,7 +1319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DDELinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration")); } // XIndexAccess @@ -1461,8 +1461,8 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( !xLink.is() ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinksObj::addDDELink: cannot add DDE link!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinksObj::addDDELink: cannot add DDE link!" ), uno::Reference< uno::XInterface >() ); } @@ -1680,8 +1680,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.sheet.ExternalDocLink")))); + new ScIndexEnumeration(this, OUString( + "com.sun.star.sheet.ExternalDocLink"))); return aRef; } @@ -1796,8 +1796,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.sheet.ExternalDocLinks")))); + new ScIndexEnumeration(this, OUString( + "com.sun.star.sheet.ExternalDocLinks"))); return aRef; } diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f69429b4940b..f7b05a8f4bf0 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -225,7 +225,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme ::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScIndexEnumeration")); + return ::rtl::OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 7cc199c118a1..3539c7e30314 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -429,7 +429,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScNamedRangeObj" ) ); + return rtl::OUString( "ScNamedRangeObj" ); } sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -611,7 +611,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.NamedRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration")); } // container::XIndexAccess @@ -1186,7 +1186,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.LabelRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 0e9ffbb131d4..dc4364a08bc2 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -45,7 +45,7 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons ::rtl::OUString SAL_CALL ScPageObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScPageObj")); + return rtl::OUString("ScPageObj"); } sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName ) @@ -60,7 +60,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScPageObj::getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDrawPage")); + pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage"); return aRet; } diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 52f4841e5214..a6662f8bac22 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -86,7 +86,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) @@ -632,7 +632,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 21aced61bcf4..55fcc99bdb8e 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -278,7 +278,7 @@ static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" )) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint; bReturn = sal_True; } } @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("only XCell or XSpreadsheet objects allowed")), static_cast<cppu::OWeakObject*>(this), 0); + throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { @@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() return NULL; } -#define SC_EVENTACC_ONCLICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ) -#define SC_EVENTACC_SCRIPT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) ) -#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) ) +#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" ) +#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" ) +#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" ) typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE @@ -1517,7 +1517,7 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) ::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sc.ScShapeObj" ) ); + return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" ); } ::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException) @@ -1543,12 +1543,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Shape" ) ); + aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" ); if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.CellAnnotationShape" ) ); + aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" ); } return aSupported; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index a0e24895120d..1ead24df1f09 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -193,7 +193,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellSearchObj" )); + return rtl::OUString( "ScCellSearchObj" ); } sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 3eb94ed4c669..dacd7ec34313 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star; ::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.SpreadsheetDocument" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); + aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); return aSeq; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 4c43504f0339..22c0d9d791a3 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -984,7 +984,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetViewPanesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); } // XIndexAccess @@ -2149,7 +2149,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTabViewObj" )); + return rtl::OUString( "ScTabViewObj" ); } sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 676d05aadcee..b4bf3ff4670b 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnnamedDatabaseRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto; + xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying doc shell uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -113,7 +113,7 @@ private: comphelper::getProcessComponentContext() ); static uno::Reference<lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -265,7 +265,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); rtl::OUString sCodeName; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName; + xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); + xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); + xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); } } } diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 9372b208756a..186c7ffd4afb 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Internal error, can't exctract implementation object" ) ), rxWrapperIf ); + throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index 433dea872408..f3d32063b472 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -78,7 +78,7 @@ OUString convertToURL( const OUString& rPath ) { osl::FileBase::getFileURLFromSystemPath( rPath, aURL ); if ( aURL.equals( rPath ) ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "could'nt convert " )).concat( rPath ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " to a URL, is it a fully qualified path name? " )) ), Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); } return aURL; } @@ -123,9 +123,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelperAPI-test.log" )) ); + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) ); return sLogLocation; } rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) @@ -133,9 +133,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) printf("%s\n", getenv("HOME") ); printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )) ); + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) ); return sLogLocation; } @@ -150,13 +150,13 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); // Loading the wanted document Sequence< PropertyValue > propertyValues(1); - propertyValues[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + propertyValues[0].Name = rtl::OUString( "Hidden" ); propertyValues[0].Value <<= false; rtl::OUString sfileUrl = convertToURL( sUrl ); printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); Reference< uno::XInterface > xDoc = - mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, propertyValues); + mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); @@ -173,15 +173,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Reference< script::provider::XScript > xScript; try { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document") )); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); } catch ( uno::Exception& e ) { try { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ))); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); } catch ( uno::Exception& e2 ) { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ))); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); } } OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -193,7 +193,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); - OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )); + OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ); try { printf("move log file\n"); @@ -253,7 +253,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); if ( !mxSFA->isFolder( sFileDirectoryURL) ) { - throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "not a directory: ")).concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); + throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); } // Getting all files and directories in the current directory Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, false ); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 1a2e82b8d3b8..0825e457cad5 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -259,7 +259,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if (!aSelection.is()) { throw uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("failed to obtain current selection")), + rtl::OUString("failed to obtain current selection"), uno::Reference< uno::XInterface >() ); } @@ -277,15 +277,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) ) ) + if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRange")) ) || - xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges")) ) ) + else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) || + xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -299,8 +299,8 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) } else { - throw uno::RuntimeException( sImplementationName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - " not supported")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( sImplementationName + rtl::OUString( + " not supported"), uno::Reference< uno::XInterface >() ); } } @@ -311,10 +311,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -424,7 +424,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid prarameter. It should be a string or False" )), + throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ), uno::Reference< uno::XInterface >() ); } @@ -472,7 +472,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException) SbxVariableRef aRef = new SbxVariable; aRef->PutDouble( time ); aArgs->Put( aRef, 1 ); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WaitUntil") ), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD ); if ( pMeth ) { @@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NamedRanges" )) ), uno::UNO_QUERY_THROW ); + rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -525,7 +525,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No activeSheet available" )), + throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ), uno::Reference< uno::XInterface >() ); } return result; @@ -557,7 +557,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "second parameter should be boolean" )), + throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ), uno::Reference< uno::XInterface >() ); } @@ -599,11 +599,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro { //maybe this should be a procedure name //TODO for procedure name - //browse::XBrowseNodeFactory is a singlton. OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) + //browse::XBrowseNodeFactory is a singlton. OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference for range name, it should be procedure name" )), + throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ), uno::Reference< uno::XInterface >() ); } return; @@ -638,7 +638,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference or name" )), + throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ), uno::Reference< uno::XInterface >() ); } @@ -691,8 +691,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -757,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead if ( bSet != getDisplayFullScreen() ) - dispatchRequests( getCurrentDocument(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:FullScreen") ) ); + dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") ); } sal_Bool SAL_CALL @@ -777,8 +776,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasVerticalScrollBar") ), uno::makeAny( bSet ) ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasHorizontalScrollBar") ), uno::makeAny( bSet ) ); + xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); } sal_Bool SAL_CALL @@ -831,7 +830,7 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u if ( !xPathSettings.is() ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")), xContext ), uno::UNO_QUERY_THROW ); + xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); } return xPathSettings; } @@ -863,25 +862,25 @@ ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) t uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); rtl::OUString aURL; osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")), uno::Any( aURL ) ); + xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) ); } ::rtl::OUString SAL_CALL ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work"))); + return getOfficePath( rtl::OUString("Work")); } ::rtl::OUString SAL_CALL ScVbaApplication::getLibraryPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Basic"))); + return getOfficePath( rtl::OUString("Basic")); } ::rtl::OUString SAL_CALL ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template"))); + return getOfficePath( rtl::OUString("Template")); } ::rtl::OUString SAL_CALL @@ -1230,7 +1229,7 @@ uno::Any SAL_CALL ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException ) { StarBASIC* pBasic = SFX_APP()->GetBasic(); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD ); uno::Any aRet; if ( pMeth ) { @@ -1256,7 +1255,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( aArgs[ 5 ] = rMultiSelect; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.OpenFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1273,7 +1272,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( aArgs[ 5 ] = rButtonText; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.SaveAsFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1299,7 +1298,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio rtl::OUString ScVbaApplication::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication")); + return rtl::OUString("ScVbaApplication"); } uno::Sequence< rtl::OUString > @@ -1309,7 +1308,7 @@ ScVbaApplication::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Application" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 9944ea166f5b..0d3ed7eb84bf 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -107,7 +107,7 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt rtl::OUString ScVbaAssistant::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant")); + return rtl::OUString("ScVbaAssistant"); } uno::Sequence< rtl::OUString > @@ -117,7 +117,7 @@ ScVbaAssistant::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Assistant" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 6fa603aa7bd6..3174bd2ed093 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,7 +64,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Object failure, can't access chart implementation" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Axes::Item Failed to extract type" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; @@ -177,7 +177,7 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) rtl::OUString ScVbaAxes::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes")); + return rtl::OUString("ScVbaAxes"); } uno::Sequence< rtl::OUString > @@ -187,7 +187,7 @@ ScVbaAxes::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axes" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index c1f92f22cc9e..035383a118c4 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -38,7 +38,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't access parent chart impl")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); return pChart; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,7 +281,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { @@ -296,7 +296,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp"))) >>= fMinor; + mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor; } catch (uno::Exception& ) { @@ -311,7 +311,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ) ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { @@ -327,7 +327,7 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp")) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto; } } catch (uno::Exception& ) @@ -357,7 +357,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) @@ -373,7 +373,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain"))) >>= fMax; + mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax; } catch (uno::Exception& ) { @@ -389,7 +389,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ) ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) @@ -406,7 +406,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain"))) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto; } } catch (uno::Exception& ) @@ -423,7 +423,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) @@ -440,7 +440,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax; + mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax; } } catch (uno::Exception& ) @@ -457,7 +457,7 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ) ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) @@ -474,7 +474,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" )) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto; } catch ( uno::Exception& ) { @@ -489,7 +489,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Min") ), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Min") )) >>= fMin; + mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin; } catch (const uno::Exception& e) { @@ -520,7 +520,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin") ), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) @@ -537,7 +537,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto; } } catch (uno::Exception& ) @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown @@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { sal_Bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Logarithmic"))) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else @@ -641,7 +641,7 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx rtl::OUString ScVbaAxis::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis")); + return rtl::OUString("ScVbaAxis"); } uno::Sequence< rtl::OUString > @@ -651,7 +651,7 @@ ScVbaAxis::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axis" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 2d715c46597e..986d1a3766e7 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -28,7 +28,7 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen rtl::OUString ScVbaAxisTitle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle")); + return rtl::OUString("ScVbaAxisTitle"); } uno::Sequence< rtl::OUString > @@ -39,7 +39,7 @@ ScVbaAxisTitle::getServiceNames() { uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.AxisTitle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index cb23dd87eed4..e792c6ea5418 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -146,7 +146,7 @@ private: protected: virtual rtl::OUString getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder")); + return rtl::OUString("ScVbaBorder"); } virtual css::uno::Sequence<rtl::OUString> getServiceNames() { @@ -154,7 +154,7 @@ protected: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Border" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" ); } return aServiceNames; } @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -549,7 +549,7 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run rtl::OUString ScVbaBorders::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders")); + return rtl::OUString("ScVbaBorders"); } uno::Sequence< rtl::OUString > @@ -559,7 +559,7 @@ ScVbaBorders::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Borders" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 2cfa4759b3ec..ae4f367c3a31 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -87,7 +87,7 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Not Implemented") ), uno::Reference< XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() ); } @@ -110,7 +110,7 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) rtl::OUString ScVbaCharacters::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters")); + return rtl::OUString("ScVbaCharacters"); } uno::Sequence< rtl::OUString > @@ -120,7 +120,7 @@ ScVbaCharacters::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Characters" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 7483da72f56b..a050d4f93553 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -262,7 +262,7 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram")); break; case xlLine: case xl3DLine: @@ -271,7 +271,7 @@ try case xlLineMarkers: case xlLineMarkersStacked: case xlLineMarkersStacked100: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.LineDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram")); break; case xl3DArea: case xlArea: @@ -279,17 +279,17 @@ try case xlAreaStacked100: case xl3DAreaStacked: case xl3DAreaStacked100: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.AreaDiagram")) ); + setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") ); break; case xlDoughnut: case xlDoughnutExploded: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.DonutDiagram") ) ); + setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") ); break; case xlStockHLC: case xlStockOHLC: case xlStockVHLC: case xlStockVOHLC: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.StockDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram")); mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; @@ -300,13 +300,13 @@ try case xl3DPie: case xlPie: case xlBarOfPie: // not possible (Zoom pie) - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram")); break; case xlRadar: case xlRadarMarkers: case xlRadarFilled: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.NetDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram")); break; case xlXYScatter: case xlBubble: // not possible @@ -315,7 +315,7 @@ try case xlXYScatterLinesNoMarkers: case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.XYDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram")); switch(_nChartType) { case xlXYScatter: @@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no ChartObject as parent" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) ); } void SAL_CALL @@ -1055,7 +1055,7 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro rtl::OUString ScVbaChart::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart")); + return rtl::OUString("ScVbaChart"); } uno::Sequence< rtl::OUString > @@ -1065,7 +1065,7 @@ ScVbaChart::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 17860737d13e..07183cc036da 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent is not ChartObjects" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) ); } void @@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartObject Activate internal error" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) ); } } @@ -130,7 +130,7 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) rtl::OUString ScVbaChartObject::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject")); + return rtl::OUString("ScVbaChartObject"); } uno::Sequence< rtl::OUString > @@ -140,7 +140,7 @@ ScVbaChartObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObject" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index d3df6585f12a..cdfd42545885 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -74,10 +74,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the impl class from the drawpage")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the docshell implclass")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); @@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem - rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Chart " ) ) , rtl::OUString(), 1); + rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); @@ -168,7 +168,7 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString ScVbaChartObjects::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects")); + return rtl::OUString("ScVbaChartObjects"); } css::uno::Sequence<rtl::OUString> @@ -178,7 +178,7 @@ ScVbaChartObjects::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObjects") ); + sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects"); } return sNames; } diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 865bf3dc746e..3fbe661f98fa 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -28,7 +28,7 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar rtl::OUString ScVbaChartTitle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle")); + return rtl::OUString("ScVbaChartTitle"); } uno::Sequence< rtl::OUString > @@ -39,7 +39,7 @@ ScVbaChartTitle::getServiceNames() { uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index cc4a683a3141..1393237312bf 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { @@ -215,7 +215,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An rtl::OUString ScVbaComment::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment")); + return rtl::OUString("ScVbaComment"); } uno::Sequence< rtl::OUString > @@ -225,7 +225,7 @@ ScVbaComment::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ScVbaComment" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 24423a7a3dfb..9e09ee631cda 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -91,7 +91,7 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaComments::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments")); + return rtl::OUString("ScVbaComments"); } css::uno::Sequence<rtl::OUString> @@ -101,7 +101,7 @@ ScVbaComments::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Comments") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Comments"); } return sNames; } diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index bc222676da8c..3ebd89adf753 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported"))); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported")); break; } return retvalue; diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 78fccd684510..1f1c3736bce9 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -65,7 +65,7 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) rtl::OUString ScVbaDialog::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog")); + return rtl::OUString("ScVbaDialog"); } uno::Sequence< rtl::OUString > @@ -75,7 +75,7 @@ ScVbaDialog::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialog" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 8375a06fb636..367dbcf6cea1 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -40,7 +40,7 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) rtl::OUString ScVbaDialogs::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs")); + return rtl::OUString("ScVbaDialogs"); } uno::Sequence< rtl::OUString > @@ -50,7 +50,7 @@ ScVbaDialogs::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialogs" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 17939060c89e..b89f3cd46416 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue; + xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue ); + xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue; + xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,9 +258,9 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharSize" ) ), ( uno::Any )fValue ); + //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFontSize not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFontSize not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFont not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); } @@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFont not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), ( uno::Any )nValue ); + mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ) ) >>= nValue; + mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ), aValue ); + mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue ); } uno::Any SAL_CALL @@ -470,13 +470,13 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) ); + return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) ); } rtl::OUString ScVbaFont::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont")); + return rtl::OUString("ScVbaFont"); } uno::Sequence< rtl::OUString > @@ -486,7 +486,7 @@ ScVbaFont::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Font" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index c33dcf448222..e05e3ce53bd4 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -50,12 +50,12 @@ using namespace ::com::sun::star; #define LOCALE "Locale" template< typename Ifc1 > -ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "US") ), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) +ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) { try { if ( !mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved") ) ); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); // mxServiceInfo is unused, // mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats. } @@ -774,7 +774,7 @@ template< typename Ifc1 > rtl::OUString ScVbaFormat<Ifc1>::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat")); + return rtl::OUString("ScVbaFormat"); } template< typename Ifc1 > @@ -785,7 +785,7 @@ ScVbaFormat<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Format" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" ); } return aServiceNames; } @@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for XPropertySet" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index acdb253c60eb..09a1455a3d73 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -140,7 +140,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat") ), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { @@ -151,7 +151,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) rtl::OUString ScVbaFormatCondition::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition")); + return rtl::OUString("ScVbaFormatCondition"); } uno::Sequence< rtl::OUString > @@ -161,7 +161,7 @@ ScVbaFormatCondition::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatCondition" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 7cfb8a549f21..f0922d52f384 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -203,7 +203,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat")), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { @@ -228,7 +228,7 @@ ScVbaFormatConditions::getStyleName() if ( !pStyles ) DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames(); - return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") )); + return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_")); } void @@ -263,7 +263,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, rtl::OUString ScVbaFormatConditions::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions")); + return rtl::OUString("ScVbaFormatConditions"); } uno::Sequence< rtl::OUString > @@ -273,7 +273,7 @@ ScVbaFormatConditions::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatConditions" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index d213535c7f4a..707a5578b605 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.Debug" ) ), mxContext ); + ::rtl::OUString( "ooo.vba.Debug" ), mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index e8df70391fa8..0c1ce0e618da 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -55,7 +55,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch UrlComponents aUrlComp; OUString aTextToDisplay; if( !(rAddress >>= aUrlComp.first) || aUrlComp.first.isEmpty() ) - throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot get address" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot get address" ), uno::Reference< uno::XInterface >() ); rSubAddress >>= aUrlComp.second; rScreenTip >>= maScreenTip; rTextToDisplay >>= aTextToDisplay; @@ -84,7 +84,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch } // create and initialize a new URL text field uno::Reference< lang::XMultiServiceFactory > xFactory( ScVbaRange::getUnoModel( xAnchorRange ), uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextField.URL" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( "com.sun.star.text.TextField.URL" ) ), uno::UNO_QUERY_THROW ); mxTextField.set( xUrlField, uno::UNO_QUERY_THROW ); setUrlComponents( aUrlComp ); setTextToDisplay( aTextToDisplay ); @@ -155,14 +155,14 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException) { ensureTextField(); OUString aTextToDisplay; - mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ) ) >>= aTextToDisplay; + mxTextField->getPropertyValue( OUString( "Representation" ) ) >>= aTextToDisplay; return aTextToDisplay; } void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException) { ensureTextField(); - mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ), uno::Any( rTextToDisplay ) ); + mxTextField->setPropertyValue( OUString( "Representation" ), uno::Any( rTextToDisplay ) ); } sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException) @@ -209,7 +209,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run { ensureTextField(); OUString aUrl; - mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ) >>= aUrl; + mxTextField->getPropertyValue( OUString( "URL" ) ) >>= aUrl; sal_Int32 nHashPos = aUrl.indexOf( '#' ); if( nHashPos < 0 ) return UrlComponents( aUrl, OUString() ); @@ -222,7 +222,7 @@ void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (un OUStringBuffer aUrl( rUrlComp.first ); if( !rUrlComp.second.isEmpty() ) aUrl.append( sal_Unicode( '#' ) ).append( rUrlComp.second ); - mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ), uno::Any( aUrl.makeStringAndClear() ) ); + mxTextField->setPropertyValue( OUString( "URL" ), uno::Any( aUrl.makeStringAndClear() ) ); } namespace hyperlink diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index c1d056f5e6d8..8711ba0a1168 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -38,7 +38,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Empty range objects" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 6cda078aefef..7b4d65d8496b 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -266,7 +266,7 @@ uno::Any ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; - aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" )); + aAttributeData.Type = rtl::OUString( "sal_Int32" ); aAttributeData.Value = rtl::OUString::valueOf( nValue ); return uno::makeAny( aAttributeData ); } @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern index" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,13 +382,13 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } rtl::OUString ScVbaInterior::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior")); + return rtl::OUString("ScVbaInterior"); } uno::Sequence< rtl::OUString > @@ -398,7 +398,7 @@ ScVbaInterior::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Interior" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index 19c1392eeb0c..dedb0398d6bb 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -69,7 +69,7 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio rtl::OUString ScVbaMenu::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu")); + return rtl::OUString("ScVbaMenu"); } uno::Sequence<rtl::OUString> @@ -79,7 +79,7 @@ ScVbaMenu::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menu" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 6d9b625326d5..91997c0b1b20 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -51,7 +51,7 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException rtl::OUString ScVbaMenuBar::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar")); + return rtl::OUString("ScVbaMenuBar"); } uno::Sequence<rtl::OUString> @@ -61,7 +61,7 @@ ScVbaMenuBar::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBar" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 33d43897657f..eb7aead78349 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -106,20 +106,20 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw if( nIndex == excel::XlSheetType::xlWorksheet ) { uno::Any aSource; - aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet Menu Bar" )); + aSource <<= rtl::OUString( "Worksheet Menu Bar" ); uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) ); return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } // XHelperInterface rtl::OUString ScVbaMenuBars::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars")); + return rtl::OUString("ScVbaMenuBars"); } uno::Sequence<rtl::OUString> @@ -129,7 +129,7 @@ ScVbaMenuBars::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBars" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 37a701e8e726..881ef72fa9cc 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -67,7 +67,7 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti rtl::OUString ScVbaMenuItem::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem")); + return rtl::OUString("ScVbaMenuItem"); } uno::Sequence<rtl::OUString> @@ -77,7 +77,7 @@ ScVbaMenuItem::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItem" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 8df35adac119..90e70b127c18 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -135,7 +135,7 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt rtl::OUString ScVbaMenuItems::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems")); + return rtl::OUString("ScVbaMenuItems"); } uno::Sequence<rtl::OUString> @@ -145,7 +145,7 @@ ScVbaMenuItems::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItems" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index b7d50e590a92..f1ab8e120485 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -121,7 +121,7 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca rtl::OUString ScVbaMenus::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus")); + return rtl::OUString("ScVbaMenus"); } uno::Sequence<rtl::OUString> @@ -131,7 +131,7 @@ ScVbaMenus::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menus" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index e02d7e0e99cb..6bd3cb59bc79 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -40,7 +40,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } @@ -128,7 +128,7 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) rtl::OUString ScVbaOLEObject::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject")); + return rtl::OUString("ScVbaOLEObject"); } uno::Sequence< rtl::OUString > @@ -138,7 +138,7 @@ ScVbaOLEObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObject" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 88b1ac4d6a16..7b1c44fd94ad 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -161,7 +161,7 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaOLEObjects::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects")); + return rtl::OUString("ScVbaOLEObjects"); } uno::Sequence< rtl::OUString > @@ -171,7 +171,7 @@ ScVbaOLEObjects::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObjects" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 00ea233f7c48..29cbd0e09434 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -40,7 +40,7 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel rtl::OUString ScVbaOutline::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline")); + return rtl::OUString("ScVbaOutline"); } uno::Sequence< rtl::OUString > @@ -50,7 +50,7 @@ ScVbaOutline::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Outline" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index e8e3b8d0f48b..611c568243e6 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ))); + uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( "IsStartOfNewPage" )); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -61,11 +61,11 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak<Ifc1>::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); } template< typename Ifc1 > @@ -89,7 +89,7 @@ template< typename Ifc1 > rtl::OUString ScVbaPageBreak<Ifc1>::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak")); + return rtl::OUString("ScVbaPageBreak"); } template< typename Ifc1 > @@ -100,7 +100,7 @@ ScVbaPageBreak<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PageBreak" ); } return aServiceNames; } @@ -111,7 +111,7 @@ template class ScVbaPageBreak< excel::XHPageBreak >; rtl::OUString ScVbaHPageBreak::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak")); + return rtl::OUString("ScVbaHPageBreak"); } uno::Sequence< rtl::OUString > @@ -121,7 +121,7 @@ ScVbaHPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.HPageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreak" ); } return aServiceNames; } @@ -144,7 +144,7 @@ ScVbaVPageBreak::~ScVbaVPageBreak() rtl::OUString ScVbaVPageBreak::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak")); + return rtl::OUString("ScVbaVPageBreak"); } uno::Sequence< rtl::OUString > @@ -154,7 +154,7 @@ ScVbaVPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreak" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 5c02d5ddb702..8c6806e1992a 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -172,7 +172,7 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; @@ -240,7 +240,7 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaHPageBreaks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks")); + return rtl::OUString("ScVbaHPageBreaks"); } uno::Sequence< rtl::OUString > @@ -250,7 +250,7 @@ ScVbaHPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.HPageBreaks" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreaks" ); } return aServiceNames; } @@ -300,7 +300,7 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) rtl::OUString ScVbaVPageBreaks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreaks")); + return rtl::OUString("ScVbaVPageBreaks"); } uno::Sequence< rtl::OUString > @@ -310,7 +310,7 @@ ScVbaVPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreaks" ) ); + aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreaks" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 738393591e62..fc43d9e9300c 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract palette, no doc shell" ) ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColorPalette") ) ), uno::UNO_QUERY ); + throw uno::RuntimeException( rtl::OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue( rtl::OUString("ColorPalette") ), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 18d754a5723e..3a8bcd856d5a 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Column number should not less than 1" )), + throw uno::RuntimeException( rtl::OUString( "Column number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Row number should not less than 1" )), + throw uno::RuntimeException( rtl::OUString( "Row number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); @@ -99,7 +99,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downRows += down; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -107,7 +107,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downRows -= up; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -115,7 +115,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) rightCols += right; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -123,7 +123,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) rightCols -= left; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); @@ -154,7 +154,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downPages += down; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -162,7 +162,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downPages -= up; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -170,7 +170,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) acrossPages += right; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -178,7 +178,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) acrossPages -= left; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index 4b81fdfac08f..a37473e10349 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -35,7 +35,7 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) rtl::OUString ScVbaPivotCache::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache")); + return rtl::OUString("ScVbaPivotCache"); } uno::Sequence< rtl::OUString > @@ -45,7 +45,7 @@ ScVbaPivotCache::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotCache" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotCache" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 605ecdfaebf3..97ce5e200ad5 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -38,7 +38,7 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) rtl::OUString ScVbaPivotTable::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable")); + return rtl::OUString("ScVbaPivotTable"); } uno::Sequence< rtl::OUString > @@ -48,7 +48,7 @@ ScVbaPivotTable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTable" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotTable" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index c407b9f3a25a..ffa5e173c385 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -69,7 +69,7 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaPivotTables::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables")); + return rtl::OUString("ScVbaPivotTables"); } css::uno::Sequence<rtl::OUString> @@ -79,7 +79,7 @@ ScVbaPivotTables::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTables") ); + sNames[0] = rtl::OUString("ooo.vba.excel.PivotTables"); } return sNames; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index a42f756b252c..43f7d5076c79 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -389,7 +389,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -427,7 +427,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying docshell from uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -2473,7 +2473,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -3554,7 +3554,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index ff4c618f681e..364bd789a826 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -274,7 +274,7 @@ public: // XDefaultMethod ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); // XDefaultProperty - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } + ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 1889078a1edc..086dc8e322e4 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -31,7 +31,7 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); return xStylesAccess; } @@ -47,9 +47,9 @@ lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame: void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) ); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) ) ) ) + if ( !xServiceInfo->supportsService( rtl::OUString( "com.sun.star.style.CellStyle" ) ) ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); } @@ -160,7 +160,7 @@ ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeEx rtl::OUString ScVbaStyle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle")); + return rtl::OUString("ScVbaStyle"); } uno::Sequence< rtl::OUString > @@ -170,7 +170,7 @@ ScVbaStyle::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XStyle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 5ced82e242c9..fa49f5f47819 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -121,7 +121,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CellStyle"))), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { @@ -157,7 +157,7 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE rtl::OUString ScVbaStyles::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles")); + return rtl::OUString("ScVbaStyles"); } uno::Sequence< rtl::OUString > @@ -167,7 +167,7 @@ ScVbaStyles::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XStyles" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyles" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index e0c318fa7b9d..ca7cc7270613 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 40b392c3517c..306f71318ee7 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -43,7 +43,7 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) rtl::OUString ScVbaTextFrame::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame")); + return rtl::OUString("ScVbaTextFrame"); } uno::Sequence< rtl::OUString > @@ -53,7 +53,7 @@ ScVbaTextFrame::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.TextFrame" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.TextFrame" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index ed2d4cc1b789..d3c84ac95198 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -68,7 +68,7 @@ public: { try { - xShapePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("String") ), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue( rtl::OUString("String"), css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { @@ -80,7 +80,7 @@ public: ::rtl::OUString sText; try { - xShapePropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("String") ) ) >>= sText; + xShapePropertySet->getPropertyValue( rtl::OUString("String") ) >>= sText; } catch ( css::uno::Exception& ) { @@ -117,7 +117,7 @@ public: { try { - xShapePropertySet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextRotation")), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue(rtl::OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { @@ -129,7 +129,7 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextRotation"))) >>= nSOOrientation; + xShapePropertySet->getPropertyValue( rtl::OUString("TextRotation")) >>= nSOOrientation; } catch (css::uno::Exception& ) { @@ -140,7 +140,7 @@ public: // XHelperInterface rtl::OUString getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TitleImpl")); + return rtl::OUString("TitleImpl"); } css::uno::Sequence< rtl::OUString > getServiceNames() { @@ -148,7 +148,7 @@ public: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XTitle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XTitle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 1ba1724ed179..6fe1ffca789e 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -230,10 +230,10 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "validation object already exists" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing required param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); Delete(); // set up defaults rtl::OUString sFormula1; @@ -247,7 +247,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "missing param" ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -259,7 +259,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported operation..." ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -280,7 +280,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad param..." ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); } } @@ -330,7 +330,7 @@ ScVbaValidation::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Validation" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Validation" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 925394cf741b..f56f3039987a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain current document" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain docshell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Implemented")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No Implemented"), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Parameter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -867,7 +867,7 @@ void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::Runtime rtl::OUString ScVbaWindow::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow")); + return rtl::OUString("ScVbaWindow"); } uno::Sequence< rtl::OUString > @@ -877,7 +877,7 @@ ScVbaWindow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Window" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Window" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 56ddccf9e9c0..0c090516961d 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -228,7 +228,7 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor rtl::OUString ScVbaWindows::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows")); + return rtl::OUString("ScVbaWindows"); } css::uno::Sequence<rtl::OUString> @@ -238,7 +238,7 @@ ScVbaWindows::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Windows") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Windows"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 2a87035ad301..6062b9e3bde5 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -257,8 +257,8 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::Runtime osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); - storeProps[0].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MS Excel 97" ) ); + storeProps[0].Name = rtl::OUString( "FilterName" ); + storeProps[0].Value <<= rtl::OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -279,7 +279,7 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -289,7 +289,7 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) rtl::OUString ScVbaWorkbook::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook")); + return rtl::OUString("ScVbaWorkbook"); } uno::Sequence< rtl::OUString > @@ -299,7 +299,7 @@ ScVbaWorkbook::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Workbook" ); } return aServiceNames; } @@ -308,7 +308,7 @@ ScVbaWorkbook::getServiceNames() ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CodeName" ) ) ).get< ::rtl::OUString >(); + return xModelProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index fb2eca206487..70d3ab4968c4 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -120,9 +120,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); + xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); + xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); } } } @@ -266,9 +266,9 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) rtl::OUString ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("URL" ) ); + aMediaDesc[ 0 ].Name = rtl::OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; rtl::OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; @@ -304,7 +304,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterOptions" ) ); + sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) ); @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal value for Format" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,29 +330,29 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Expected value for Delimiter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); rtl::OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Incorrect value for Delimiter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current sFormat = rtl::OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + sProps[ nIndex ].Name = rtl::OUString("FilterName"); sProps[ nIndex++ ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentService") ); - sProps[ nIndex ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ); + sProps[ nIndex ].Name = rtl::OUString("DocumentService"); + sProps[ nIndex ].Value <<= rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Bad Format"), uno::Reference< uno::XInterface >() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -365,7 +365,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi rtl::OUString ScVbaWorkbooks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks")); + return rtl::OUString("ScVbaWorkbooks"); } css::uno::Sequence<rtl::OUString> @@ -375,7 +375,7 @@ ScVbaWorkbooks::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbooks") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Workbooks"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index e7f36f843808..7377ef8726ba 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -163,8 +163,8 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference <frame::XDesktop2 > xComponentLoader = frame::Desktop::create(xContext); uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:factory/scalc" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, + rtl::OUString( "private:factory/scalc" ), + rtl::OUString( "_blank" ), 0, uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) @@ -362,8 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ), + throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -404,8 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ), + throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -702,7 +700,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SpellDialog")); + rtl::OUString url = rtl::OUString( ".uno:SpellDialog"); uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -804,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -951,7 +949,7 @@ ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::U uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } @@ -1031,7 +1029,7 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) rtl::OUString ScVbaWorksheet::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet")); + return rtl::OUString("ScVbaWorksheet"); } void SAL_CALL @@ -1054,7 +1052,7 @@ ScVbaWorksheet::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Worksheet" ); } return aServiceNames; } @@ -1063,7 +1061,7 @@ rtl::OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CodeName" ) ) ).get< ::rtl::OUString >(); + return xSheetProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index a2d3524159fa..3986dcab2700 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -361,8 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Visible property doesn't support non boolean #FIXME" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -370,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; @@ -474,7 +473,7 @@ ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno: rtl::OUString ScVbaWorksheets::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets")); + return rtl::OUString("ScVbaWorksheets"); } css::uno::Sequence<rtl::OUString> @@ -484,7 +483,7 @@ ScVbaWorksheets::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheets") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Worksheets"); } return sNames; } diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index bce1b6a0f918..4f507edfd91e 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -179,10 +179,10 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FunctionAccess" ) ), mxContext ), + ::rtl::OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsArrayFunction" ) ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue( ::rtl::OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } @@ -294,7 +294,7 @@ ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw ( rtl::OUString ScVbaWSFunction::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction")); + return rtl::OUString("ScVbaWSFunction"); } uno::Sequence< rtl::OUString > @@ -304,7 +304,7 @@ ScVbaWSFunction::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.WorksheetFunction" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.WorksheetFunction" ); } return aServiceNames; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0434b1e9660e..a0d7634eebbb 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -851,7 +851,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) case Top10: pEntry->eOp = SC_TOPVAL; pEntry->GetQueryItem().meType = ScQueryEntry::ByString; - pEntry->GetQueryItem().maString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")); + pEntry->GetQueryItem().maString = rtl::OUString("10"); break; case Empty: pEntry->SetQueryByEmpty(); @@ -1433,7 +1433,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, if ( nSel == SC_AUTOFILTER_TOP10 ) { rNewEntry.eOp = SC_TOPVAL; - rItem.maString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")); + rItem.maString = rtl::OUString("10"); } else if (nSel == SC_AUTOFILTER_EMPTY) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index bd716993d60a..04c21a224bfa 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1288,7 +1288,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } } @@ -1349,7 +1349,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, break; } aChangeRanges.Append( aChangeRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index b2a651065478..28481eefaccf 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1763,7 +1763,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark aChangeRanges.Append(aChangeRange); } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index cd48942494d2..33ac57649055 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -672,7 +672,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool //TODO/LATER: what about "bLink"? uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMedium[0].Name = ::rtl::OUString( "URL" ); aMedium[0].Value <<= ::rtl::OUString( aStrURL ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 72750098905a..9fd5be01d827 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -216,13 +216,12 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { uno::Reference< embed::XStorage > xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator") ) ), + ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DummyName" ) ), + ::rtl::OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index fcd76aa3662b..932a59474ba2 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -556,7 +556,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, for (; itr != itrEnd; ++itr) aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } if ( bRecord ) @@ -744,7 +744,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -1295,7 +1295,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, } } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute" ) ), aChangeRanges, aProperties ); + pModelObj->NotifyChanges( ::rtl::OUString( "attribute" ), aChangeRanges, aProperties ); } StartFormatArea(); @@ -1518,8 +1518,8 @@ sal_Bool ScViewFunc::InsertCells( InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bP ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); ::rtl::OUString aOperation = ( eCmd == INS_INSROWS ? - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert-rows" ) ) : - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert-columns" ) ) ); + ::rtl::OUString( "insert-rows" ) : + ::rtl::OUString( "insert-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1579,8 +1579,8 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord ) ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); ::rtl::OUString aOperation = ( eCmd == DEL_DELROWS ? - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete-rows" ) ) : - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete-columns" ) ) ); + ::rtl::OUString( "delete-rows" ) : + ::rtl::OUString( "delete-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1951,7 +1951,7 @@ void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord ) { aFuncMark.FillRangeListWithMarks( &aChangeRanges, false ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -2255,7 +2255,7 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW } } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "column-resize" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "column-resize" ), aChangeRanges ); } } } diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 82d191fb42a1..8ec1bab06428 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -640,7 +640,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions ) try { uno::Any aAny = xOptions->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ); + OUString( "NullDate" ) ); util::Date aDate; if ( aAny >>= aDate ) return DateToDays( aDate.Day, aDate.Month, aDate.Year ); diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 0d04732e4b09..b4e5de641a92 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -47,7 +47,7 @@ namespace basprov { //......................................................................... #define BASSCRIPT_PROPERTY_ID_CALLER 1 -#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Caller" ) ) +#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( "Caller" ) #define BASSCRIPT_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT @@ -192,12 +192,10 @@ namespace basprov { throw provider::ScriptFrameworkErrorException( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "wrong number of parameters!" ) ), + "wrong number of parameters!" ), Reference< XInterface >(), m_funcName, - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ), + ::rtl::OUString( "Basic" ), provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index e78071c18eee..5c7218e8f100 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -77,8 +77,7 @@ public: css::frame::XTransientDocumentsDocumentContentFactory >( xMCF->createInstanceWithContext( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ) ), + "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ), xContext ), css::uno::UNO_QUERY ); } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 6c8bb64e5e67..967a799ce55a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -797,8 +797,7 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() ::rtl::OUString StringResourcePersistenceImpl::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM - ( "com.sun.star.comp.scripting.StringResourceWithLocation") ); + return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); } // ----------------------------------------------------------------------------- @@ -2690,8 +2689,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen if ( aArguments.getLength() != 6 ) { throw RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM - ( "XInitialization::initialize: invalid number of arguments!" ) ), + ::rtl::OUString( "XInitialization::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index e378ff073319..a19a0566a008 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -134,7 +134,7 @@ FileFormat aFileFormats[] = { rtl::OUString(), pFmt->nFormatType, nFormat, rtl::OUString::createFromAscii( pFmt->pTypeName ), 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/simpress*")) ); + rtl::OUString("private:factory/simpress*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -277,8 +277,7 @@ void SdFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xDrawComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresentationDocument"))); + getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Draw.PresentationDocument")); CPPUNIT_ASSERT_MESSAGE("no impress component!", m_xDrawComponent.is()); } diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index d620edb3dce6..c446f05876e1 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -633,7 +633,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) { pModel->SetChanged(); Reference< XInterface > xSource( xAnnotation, UNO_QUERY ); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAnnotationRemoved" ) ), xSource ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( "OnAnnotationRemoved" ), xSource ); } } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 375ade4e7397..bdaddea1b098 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -392,7 +392,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DocumentBaseURL" ) ); + aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); } diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index bfe6b18b5db0..3e2f947a20f4 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -87,7 +87,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) ); + aWindow.WindowServiceName = ::rtl::OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 3a0f78af567e..337316229a8e 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -321,19 +321,19 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly ) Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxMSF ); Sequence< Any > aCreationArguments( 2 ); aCreationArguments[0] = makeAny( PropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0, + OUString( "nodepath" ), 0, makeAny( GetPathToConfigurationRoot() ), PropertyState_DIRECT_VALUE ) ); aCreationArguments[1] = makeAny(beans::PropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ), + OUString( "lazywrite" ), 0, makeAny( true ), PropertyState_DIRECT_VALUE ) ); OUString sAccessService; if ( bReadOnly ) - sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess" ) ); + sAccessService = OUString( + "com.sun.star.configuration.ConfigurationAccess" ); else - sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationUpdateAccess" ) ); + sAccessService = OUString( + "com.sun.star.configuration.ConfigurationUpdateAccess" ); xRoot = xProvider->createInstanceWithArguments( sAccessService, aCreationArguments ); diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index e341b5a2b21a..28c0ba53be97 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -74,7 +74,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext // collecting a list of impress filters Reference< XNameAccess > xFilters( rxContext->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ), rxContext ), UNO_QUERY_THROW ); + OUString( "com.sun.star.document.FilterFactory" ), rxContext ), UNO_QUERY_THROW ); Sequence< OUString > aFilterList( xFilters->getElementNames() ); for ( int i = 0; i < aFilterList.getLength(); i++ ) { @@ -119,7 +119,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext } Reference< XNameAccess > xTypes( rxContext->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxContext ), UNO_QUERY_THROW ); + OUString( "com.sun.star.document.TypeDetection" ), rxContext ), UNO_QUERY_THROW ); Sequence< OUString > aTypeList( xFilters->getElementNames() ); // mxFilePicker->setDefaultName( ); diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index e72bb272a4df..4d58933248be 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -181,7 +181,7 @@ sal_Int64 PPPOptimizer::GetFileSize( const rtl::OUString& rURL ) OUString PPPOptimizer_getImplementationName() { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.PPPOptimizerImp" ) ); + return OUString( "com.sun.star.comp.PPPOptimizerImp" ); } Sequence< OUString > PPPOptimizer_getSupportedServiceNames() diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index c80145ead648..d7632d299e37 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -185,7 +185,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatus OUString PPPOptimizerDialog_getImplementationName() { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.SunPresentationMinimizerImp" ) ); + return OUString( "com.sun.star.comp.SunPresentationMinimizerImp" ); } Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index bb28f1127638..62859f82ca9c 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -46,16 +46,16 @@ using namespace ::com::sun::star::script; UnoDialog::UnoDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame ) : mxMSF( rxMSF ), mxController( rxFrame->getController() ), - mxDialogModel( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.awt.UnoControlDialogModel" ) ), mxMSF ), UNO_QUERY_THROW ), + mxDialogModel( mxMSF->getServiceManager()->createInstanceWithContext( OUString( + "com.sun.star.awt.UnoControlDialogModel" ), mxMSF ), UNO_QUERY_THROW ), mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelPropertySet( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelNameContainer( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelNameAccess( mxDialogModel, UNO_QUERY_THROW ), mxControlModel( mxDialogModel, UNO_QUERY_THROW ), - mxDialog( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.awt.UnoControlDialog" ) ), mxMSF ), UNO_QUERY_THROW ), + mxDialog( mxMSF->getServiceManager()->createInstanceWithContext( OUString( + "com.sun.star.awt.UnoControlDialog" ), mxMSF ), UNO_QUERY_THROW ), mxControl( mxDialog, UNO_QUERY_THROW ), mbStatus( sal_False ) { @@ -149,10 +149,10 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< Reference< XButton > xButton; try { - Reference< XInterface > xButtonModel( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ) ), + Reference< XInterface > xButtonModel( insertControlModel( OUString( "com.sun.star.awt.UnoControlButtonModel" ), rName, rPropertyNames, rPropertyValues ) ); Reference< XPropertySet > xPropertySet( xButtonModel, UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xButton = Reference< XButton >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); if ( xActionListener.is() ) @@ -175,9 +175,9 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const Reference< XFixedText > xFixedText; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedTextModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xFixedText = Reference< XFixedText >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -193,9 +193,9 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S Reference< XCheckBox > xCheckBox; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlCheckBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xCheckBox = Reference< XCheckBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -211,9 +211,9 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co Reference< XControl > xControl; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFormattedFieldModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFormattedFieldModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xControl = Reference< XControl >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -229,9 +229,9 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S Reference< XComboBox > xControl; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlComboBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xControl = Reference< XComboBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -247,9 +247,9 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c Reference< XRadioButton > xControl; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlRadioButtonModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xControl = Reference< XRadioButton >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -265,9 +265,9 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq Reference< XListBox > xControl; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlListBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xControl = Reference< XListBox >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) @@ -283,9 +283,9 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque Reference< XControl > xControl; try { - Reference< XPropertySet > xPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ) ), + Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlImageControlModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); - xPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( rName ) ); + xPropertySet->setPropertyValue( OUString( "Name" ), Any( rName ) ); xControl = Reference< XControl >( mxDialogControlContainer->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 235a9d38ff75..503971629ab8 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -98,50 +98,50 @@ namespace { const rtl::OUString& rFilename ) { m_xListbox.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))), + rtl::OUString( "ListBox" )), uno::UNO_QUERY_THROW ); m_xWriterText.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoWriter" ))), + rtl::OUString( "InfoWriter" )), uno::UNO_QUERY_THROW ); m_xImpressText.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoImpress" ))), + rtl::OUString( "InfoImpress" )), uno::UNO_QUERY_THROW ); m_xDrawText.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InfoDraw" ))), + rtl::OUString( "InfoDraw" )), uno::UNO_QUERY_THROW ); uno::Reference<awt::XWindow> xControl; xControl.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxWriter" ))), + rtl::OUString( "ListBoxWriter" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxImpress" ))), + rtl::OUString( "ListBoxImpress" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBoxDraw" ))), + rtl::OUString( "ListBoxDraw" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); uno::Reference<beans::XPropertySet> xPropSet( xControls->getControl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboLabel" )))->getModel(), + rtl::OUString( "ComboLabel" ))->getModel(), uno::UNO_QUERY_THROW ); rtl::OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) ); rtl::OUString aLabel; - xPropSet->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ))) >>= aLabel; + xPropSet->getPropertyValue(rtl::OUString( "Label" )) >>= aLabel; const char pFileName[] = "%FILENAME"; aLabel = aLabel.replaceAt( aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1), SAL_N_ELEMENTS(pFileName)-1, aFilename ); - xPropSet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), + xPropSet->setPropertyValue(rtl::OUString( "Label" ), uno::makeAny(aLabel)); uno::Sequence<rtl::OUString> aListboxItems(3); - aListboxItems[DRAW_INDEX] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Drawing" )); - aListboxItems[IMPRESS_INDEX] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Presentation" )); - aListboxItems[WRITER_INDEX] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text Document" )); + aListboxItems[DRAW_INDEX] = rtl::OUString( "Drawing" ); + aListboxItems[IMPRESS_INDEX] = rtl::OUString( "Presentation" ); + aListboxItems[WRITER_INDEX] = rtl::OUString( "Text Document" ); m_xListbox->addItems(aListboxItems,0); m_xListbox->selectItemPos(0,sal_True); @@ -167,7 +167,7 @@ namespace { virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aMethods(1); - aMethods[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectionChanged" )); + aMethods[0] = rtl::OUString( "SelectionChanged" ); return aMethods; } }; @@ -434,14 +434,14 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) ) - aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_pdf_addstream_import" ) ); + aOutFilterName = rtl::OUString( "writer_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" ) - aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_pdf_addstream_import" ) ); + aOutFilterName = rtl::OUString( "impress_pdf_addstream_import" ); else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) ) - aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw_pdf_addstream_import" ) ); + aOutFilterName = rtl::OUString( "draw_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" ) - aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_pdf_addstream_import" ) ); + aOutFilterName = rtl::OUString( "calc_pdf_addstream_import" ); } } @@ -454,9 +454,9 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); rFilterData[ nFilterNamePos ].Name = - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); + rtl::OUString( "FilterName" ); } - aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") ); + aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); OSL_TRACE( "setting filter name %s, input stream %s\n", rtl::OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), @@ -466,7 +466,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue if( xEmbedStream.is() ) { rFilterData.realloc( ++nAttribs ); - rFilterData[nAttribs-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EmbeddedSubstream" ) ); + rFilterData[nAttribs-1].Name = rtl::OUString( "EmbeddedSubstream" ); rFilterData[nAttribs-1].Value <<= xEmbedStream; } if( !aPwd.isEmpty() ) @@ -475,7 +475,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nPwdPos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nPwdPos ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ); + rFilterData[ nPwdPos ].Name = rtl::OUString( "Password" ); } rFilterData[ nPwdPos ].Value <<= aPwd; } @@ -486,7 +486,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nFilterNamePos ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); + rFilterData[ nFilterNamePos ].Name = rtl::OUString( "FilterName" ); } const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL); @@ -497,22 +497,22 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue else switch( nDocumentType ) { case 0: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw_pdf_import" ) ); + rFilterData[nFilterNamePos].Value <<= rtl::OUString( "draw_pdf_import" ); break; case 1: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_pdf_import" ) ); + rFilterData[nFilterNamePos].Value <<= rtl::OUString( "impress_pdf_import" ); break; case 2: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_pdf_import" ) ); + rFilterData[nFilterNamePos].Value <<= rtl::OUString( "writer_pdf_import" ); break; default: OSL_FAIL("Unexpected case"); } - aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") ); + aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); } } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 60080cfe9aac..609dc3d8424d 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -148,7 +148,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert try { xSubFilter = uno::Reference<document::XFilter>( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OwnSubFilter" ) ), + rtl::OUString( "com.sun.star.document.OwnSubFilter" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -169,8 +169,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert { nPwPos = aFilterData.getLength(); aFilterData.realloc( nPwPos+1 ); - aFilterData[nPwPos].Name = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Password" ) ); + aFilterData[nPwPos].Name = rtl::OUString( "Password" ); } aFilterData[nPwPos].Value <<= aPwd; bRet = xSubFilter->filter( aFilterData ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 56e29c0f0971..9f55a2298912 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -780,7 +780,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize ) if( m_xStatusIndicator.is() ) { if( nNextPageNr == 1 ) - startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) ); + startIndicator( rtl::OUString( " " ) ); m_xStatusIndicator->setValue( nNextPageNr ); } m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr); @@ -802,7 +802,7 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, ElementTreeVisitorSharedPtr optimizingVisitor( rVisitorFactory.createOptimizingVisitor(*this)); // FIXME: localization - startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) ); + startIndicator( rtl::OUString( " " ) ); m_pDocument->visitedBy( *optimizingVisitor, std::list<Element*>::const_iterator()); #if OSL_DEBUG_LEVEL > 1 @@ -1015,7 +1015,7 @@ rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString ) { m_bMirrorMapperTried = true; uno::Reference< lang::XMultiComponentFactory > xMSF( m_xContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.StringMirror")), m_xContext); + uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.awt.StringMirror"), m_xContext); m_xMirrorMapper = uno::Reference< util::XStringMapping >( xInterface, uno::UNO_QUERY ); #if OSL_DEBUG_LEVEL > 1 if( m_xMirrorMapper.is() ) diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index d9076290ba1a..487bc7a5a6dd 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -64,7 +64,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] = + aProps[ rtl::OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 4df8067ba64f..18500ee0e2ab 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -330,8 +330,8 @@ void PresenterProtocolHandler::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterProtocolHandler object has already been disposed")), + OUString( + "PresenterProtocolHandler object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -486,8 +486,8 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterProtocolHandler::Dispatch object has already been disposed")), + OUString( + "PresenterProtocolHandler::Dispatch object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index bb5ec1aa5bcb..46c763a08cfd 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -543,8 +543,8 @@ void PresenterViewFactory::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterViewFactory object has already been disposed")), + OUString( + "PresenterViewFactory object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index bcc47372e906..8f0447bf4689 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -98,7 +98,7 @@ Image SAL_CALL GetImage( if ( pSlot ) { - aCommandURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); + aCommandURL = rtl::OUString( ".uno:" ); aCommandURL += rtl::OUString::createFromAscii( pSlot->GetUnoName() ); } else diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 3ad5d2bcd8c1..cd645b7da1b4 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -95,8 +95,8 @@ void ImeStatusWindow::init() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "ShowStatusWindow"))) + rtl::OUString( + "ShowStatusWindow")) >>= bShow) Application::ShowImeStatusWindow(bShow); } @@ -114,7 +114,7 @@ bool ImeStatusWindow::isShowing() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow"))) + rtl::OUString("ShowStatusWindow")) >>= bShow) return bShow; } @@ -133,7 +133,7 @@ void ImeStatusWindow::show(bool bShow) { css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig()); xConfig->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + rtl::OUString("ShowStatusWindow"), css::uno::makeAny(static_cast< sal_Bool >(bShow))); css::uno::Reference< css::util::XChangesBatch > xCommit( xConfig, css::uno::UNO_QUERY); @@ -162,7 +162,7 @@ ImeStatusWindow::~ImeStatusWindow() try { m_xConfig->removePropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + rtl::OUString("ShowStatusWindow"), m_xConfigListener); } catch (css::uno::Exception &) @@ -202,17 +202,15 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() if (!m_xContext.is()) throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "null comphelper::getProcessServiceFactory")), + "null comphelper::getProcessServiceFactory"), 0); css::uno::Reference< css::lang::XMultiServiceFactory > xProvider = css::configuration::theDefaultProvider::get( m_xContext ); css::beans::PropertyValue aArg( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + rtl::OUString("nodepath"), -1, css::uno::makeAny( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.Office.Common/I18N/InputMethod"))), + "/org.openoffice.Office.Common/I18N/InputMethod")), css::beans::PropertyState_DIRECT_VALUE); css::uno::Sequence< css::uno::Any > aArgs(1); aArgs[0] <<= aArg; @@ -220,8 +218,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() = css::uno::Reference< css::beans::XPropertySet >( xProvider->createInstanceWithArguments( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationUpdateAccess")), + "com.sun.star.configuration.ConfigurationUpdateAccess"), aArgs), css::uno::UNO_QUERY); if (!m_xConfig.is()) @@ -241,7 +238,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() // no dispose notifications): m_xConfigListener = new WeakPropertyChangeListener(this); xConfig->addPropertyChangeListener( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + rtl::OUString("ShowStatusWindow"), m_xConfigListener); } return xConfig; diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index 7fcc17439386..b80a1678b4db 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -63,8 +63,7 @@ bool sfx2::openUriExternally( if (e.ArgumentPosition != 0) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unexpected IllegalArgumentException: ")) + "unexpected IllegalArgumentException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); } diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 42f0c3853553..5d3fef78480d 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -66,7 +66,7 @@ GFileMonitor* pMonitor = NULL; static void open_url_cb( GtkWidget *, gpointer data ) { ShutdownIcon::OpenURL( *(OUString *)data, - OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) ); + OUString( "_default" ) ); } static void open_file_cb( GtkWidget * ) diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index e7212722add6..0a379df68e9f 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -182,7 +182,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr if ( xPropSet.is() ) { aValue = xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LockCount" )) ); + ::rtl::OUString( "LockCount" ) ); aValue >>= m_pWrkWin->m_nLock; } } diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index ada8fbe4ae25..ee741d346949 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -603,7 +603,7 @@ void ThumbnailViewAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + ::rtl::OUString("object has been already disposed"), static_cast<uno::XWeak*>(this)); } else diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 327f76b0c617..87a20873131c 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -145,10 +145,10 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< frame::XFrame > xFrame( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs(2); beans::PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = rtl::OUString( "Frame" ); aPropValue.Value = uno::makeAny( xFrame ); aArgs[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); + aPropValue.Name = rtl::OUString( "ResourceURL" ); // create a resource URL from the nId provided by the sfx2 ::rtl::OUString aResourceURL( aDockWindowResourceURL ); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 7fa12d46d11e..fa8ef1845853 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1964,7 +1964,7 @@ void SfxMedium::Transfer_Impl() // LongName wasn't defined anywhere, only used here... get the Title instead // as it's less probably empty rtl::OUString aFileName; - Any aAny = aDestContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )) ); + Any aAny = aDestContent.getPropertyValue( ::rtl::OUString("Title" ) ); aAny >>= aFileName; if ( aFileName.isEmpty() ) aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 5f8f174384fc..e23229e1e491 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - ::rtl::OUString aStringID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "groupuinames.xml" ) ); + ::rtl::OUString aStringID = ::rtl::OUString( "groupuinames.xml" ); return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } @@ -63,9 +63,9 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R ::comphelper::AttributeList* pRootAttrList = new ::comphelper::AttributeList; uno::Reference< xml::sax::XAttributeList > xRootAttrList( pRootAttrList ); pRootAttrList->AddAttribute( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "xmlns" ) ), + ::rtl::OUString( "xmlns" ), aCDATAString, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "http://openoffice.org/2006/groupuinames" ) ) ); + ::rtl::OUString( "http://openoffice.org/2006/groupuinames" ) ); xWriterHandler->startDocument(); xWriterHandler->startElement( aGroupListElement, xRootAttrList ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 45262ebedf06..bd3910ac7716 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -194,7 +194,7 @@ public: uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY_THROW ); m_xDocumentSettings.set( xDocSettingsSupplier->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), + ::rtl::OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY_THROW ); ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) ); @@ -460,19 +460,19 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() //------------------------------------------------------------------------- ::rtl::OUString ModelData_Impl::GetDocServiceName() { - return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDocumentService")), ::rtl::OUString()); + return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString("ooSetupFactoryDocumentService"), ::rtl::OUString()); } //------------------------------------------------------------------------- void ModelData_Impl::CheckInteractionHandler() { ::comphelper::SequenceAsHashMap::const_iterator aInteractIter = - m_aMediaDescrHM.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ); + m_aMediaDescrHM.find( ::rtl::OUString("InteractionHandler") ); if ( aInteractIter == m_aMediaDescrHM.end() ) { try { - m_aMediaDescrHM[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ] + m_aMediaDescrHM[ ::rtl::OUString("InteractionHandler") ] <<= task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), 0); } catch( const uno::Exception& ) @@ -492,7 +492,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > aProps; ::rtl::OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter")), + ::rtl::OUString("ooSetupFactoryDefaultFilter"), ::rtl::OUString() ); m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aProps; @@ -509,7 +509,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter if ( aProps.getLength() ) { ::comphelper::SequenceAsHashMap aFiltHM( aProps ); - sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), + sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) ) aFilterProps = aProps; @@ -523,7 +523,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")); + aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -541,9 +541,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( { // Preselect PDF-Filter for EXPORT uno::Sequence< beans::NamedValue > aSearchRequest( 2 ); - aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")); - aSearchRequest[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format")); - aSearchRequest[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")); + aSearchRequest[0].Name = ::rtl::OUString("Type"); + aSearchRequest[0].Value <<= ::rtl::OUString("pdf_Portable_Document_Format"); + aSearchRequest[1].Name = ::rtl::OUString("DocumentService"); aSearchRequest[1].Value <<= GetDocServiceName(); aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -647,7 +647,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // it is done only for documents that have persistence already uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( comphelper::getProcessComponentContext(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common" ) ), + ::rtl::OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); // should the saving proceed as usual instead? @@ -659,11 +659,11 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // the saving is acceptable // in case the configuration entry is not set or set to false // or in case of version creation - ::rtl::OUString aVersionCommentString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VersionComment")); + ::rtl::OUString aVersionCommentString = ::rtl::OUString("VersionComment"); if ( ( ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Save/Document/" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AlwaysSaveAs" ) ) ) >>= bAlwaysSaveAs ) + ::rtl::OUString( "Save/Document/" ), + ::rtl::OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs ) && bAlwaysSaveAs && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { @@ -765,13 +765,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); + nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); } // only a temporary solution until default filter retrieving feature is implemented // then GetDocServiceDefaultFilter() must be used ::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 ); - sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); + sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); // if the old filter is not acceptable // and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs @@ -791,12 +791,12 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) { // the default filter is acceptable and the old filter is alian one // so ask to make a saveAs operation - ::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), ::rtl::OUString() ); - ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), ::rtl::OUString() ); ::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreusedFilterName")), + ::rtl::OUString("PreusedFilterName"), ::rtl::OUString() ); if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) ) { @@ -847,7 +847,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")); + aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); uno::Reference< container::XEnumeration > xFilterEnum = @@ -860,7 +860,7 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { ::comphelper::SequenceAsHashMap aPropsHM( pProps ); ::rtl::OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent")), + ::rtl::OUString("UIComponent"), ::rtl::OUString() ); if ( !aUIServName.isEmpty() ) return sal_True; @@ -884,7 +884,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, sal_Bool bUseFilterOptions = sal_False; ::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter = - GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite")) ); + GetMediaDescr().find( ::rtl::OUString("Overwrite") ); // the file name must be specified if overwrite option is set if ( aOverwriteIter != GetMediaDescr().end() ) @@ -938,10 +938,10 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // this is a PDF export // the filter options has been shown already ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString("UIName"), ::rtl::OUString() ); - pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ), rStandardDir, rBlackList )); + pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( "pdf" ), rStandardDir, rBlackList )); pFileDlg->SetCurrentFilter( aFilterUIName ); } else @@ -990,7 +990,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, { // it is export, set the preselected filter ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString("UIName"), ::rtl::OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } @@ -1006,24 +1006,24 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps; ::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps ); - sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); + sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont ) { // the suggested type will be changed, the extension should be adjusted aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")), + ::rtl::OUString("Type"), ::rtl::OUString() ); ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString("UIName"), ::rtl::OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } else { pFileDlg->SetCurrentFilter( aOldFiltPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), + ::rtl::OUString("UIName"), ::rtl::OUString() ) ); } } @@ -1037,7 +1037,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY ); if ( xSel.is() && xSel->getSelection().hasValue() ) - GetMediaDescr()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionOnly"))] <<= sal_True; + GetMediaDescr()[::rtl::OUString("SelectionOnly")] <<= sal_True; // This is a temporary hardcoded solution must be removed when // dialogs do not need parameters in SidSet representation any more @@ -1166,7 +1166,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, } // merge in results of the dialog execution - GetMediaDescr()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))] <<= + GetMediaDescr()[::rtl::OUString("URL")] <<= ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); GetMediaDescr()[sFilterNameString] <<= aFilterName; @@ -1186,14 +1186,14 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() if ( xFrameDispatch.is() ) { util::URL aURL; - aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SetDocumentProperties")); + aURL.Complete = ::rtl::OUString(".uno:SetDocumentProperties"); uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); if ( xTransformer->parseStrict( aURL ) ) { uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch( aURL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), + ::rtl::OUString("_self"), 0 ); if ( xDispatch.is() ) { @@ -1217,7 +1217,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ::rtl::OUString aRecommendedDir; if ( ( !aSuggestedDir.isEmpty() || GetStorable()->hasLocation() ) - && !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")), + && !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString("RepairPackage"), sal_False ) ) { INetURLObject aLocation; @@ -1272,18 +1272,18 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() { // adjust the extension to the type uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ), + comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.TypeDetection") ), uno::UNO_QUERY ); if ( xTypeDetection.is() ) { - INetURLObject aObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "file:///c:/" ) ) + aRecommendedName ); + INetURLObject aObj( ::rtl::OUString( "file:///c:/" ) + aRecommendedName ); uno::Sequence< beans::PropertyValue > aTypeNameProps; if ( ( xTypeDetection->getByName( aTypeName ) >>= aTypeNameProps ) && aTypeNameProps.getLength() ) { ::comphelper::SequenceAsHashMap aTypeNamePropsHM( aTypeNameProps ); uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")), + ::rtl::OUString("Extensions"), ::uno::Sequence< ::rtl::OUString >() ); if ( aExtensions.getLength() ) aObj.SetExtension( aExtensions[0] ); @@ -1312,7 +1312,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio if ( !m_xFilterCFG.is() ) { m_xFilterCFG = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ), + comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); if ( !m_xFilterCFG.is() ) @@ -1371,7 +1371,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStoreMode & SAVEAS_REQUESTED ) { ::comphelper::SequenceAsHashMap::const_iterator aSaveToIter = - aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveTo")) ); + aModelData.GetMediaDescr().find( ::rtl::OUString("SaveTo") ); if ( aSaveToIter != aModelData.GetMediaDescr().end() ) { sal_Bool bWideExport = sal_False; @@ -1465,7 +1465,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel ::comphelper::SequenceAsHashMap aFilterPropsHM( aFilterProps ); ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), + ::rtl::OUString("Name"), ::rtl::OUString() ); const ::rtl::OUString sFilterNameString(aFilterNameString); @@ -1478,7 +1478,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel ::rtl::OUString() ); sal_Bool bUseFilterOptions = sal_False; - ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ); + ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); const ::rtl::OUString sFilterOptionsString(aFilterOptionsString); const ::rtl::OUString sFilterDataString(aFilterDataString); @@ -1502,7 +1502,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel { sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; ::comphelper::SequenceAsHashMap::const_iterator aDlgIter = - aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemDialog")) ); + aModelData.GetMediaDescr().find( ::rtl::OUString("UseSystemDialog") ); if ( aDlgIter != aModelData.GetMediaDescr().end() ) { sal_Bool bUseSystemDialog = sal_True; @@ -1516,28 +1516,28 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } // The Dispatch supports parameter FolderName that overwrites SuggestedSaveAsDir - ::rtl::OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FolderName" ) ), ::rtl::OUString() ); + ::rtl::OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "FolderName" ), ::rtl::OUString() ); if ( aSuggestedDir.isEmpty() ) { - aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuggestedSaveAsDir" ) ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); if ( aSuggestedDir.isEmpty() ) - aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuggestedSaveAsDir" ) ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); } - aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuggestedSaveAsName" ) ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); if ( aSuggestedName.isEmpty() ) - aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuggestedSaveAsName" ) ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); ::rtl::OUString sStandardDir; ::comphelper::SequenceAsHashMap::const_iterator aStdDirIter = - aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StandardDir")) ); + aModelData.GetMediaDescr().find( ::rtl::OUString("StandardDir") ); if ( aStdDirIter != aModelData.GetMediaDescr().end() ) aStdDirIter->second >>= sStandardDir; ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter = - aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BlackList")) ); + aModelData.GetMediaDescr().find( ::rtl::OUString("BlackList") ); if ( aBlackListIter != aModelData.GetMediaDescr().end() ) aBlackListIter->second >>= aBlackList; @@ -1569,7 +1569,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } bDialogUsed = sal_True; - aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ); + aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); } else { @@ -1616,7 +1616,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } ::comphelper::SequenceAsHashMap::const_iterator aIter = - aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterFlags")) ); + aModelData.GetMediaDescr().find( ::rtl::OUString("FilterFlags") ); sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet @@ -1635,7 +1635,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(), aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED ); - OSL_ENSURE( aModelData.GetMediaDescr().find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); + OSL_ENSURE( aModelData.GetMediaDescr().find( ::rtl::OUString( "Password" ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); if ( aOptions.IsDocInfoSave() && ( !aModelData.GetStorable()->hasLocation() || INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL ) ) @@ -1715,7 +1715,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( { ::comphelper::SequenceAsHashMap aPropsHM( aProps ); ::rtl::OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent")), + ::rtl::OUString("UIComponent"), ::rtl::OUString() ); if( !aServiceName.isEmpty() ) bUseFilterOptions = sal_True; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 1d921c7009c5..492c366348e3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1397,7 +1397,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) { // check the version of the document uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ) ) >>= aODFVersion; + xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aODFVersion; } catch( uno::Exception& ) {} diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 99ee9b5ce7df..abb67f5c672c 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -272,7 +272,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nV Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sLoaderURL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ), + ::rtl::OUString( "_self" ), 0, aLoadArgs ); @@ -339,7 +339,7 @@ void SfxFrame::SetPresentationMode( sal_Bool bSet ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -391,7 +391,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); aValue >>= xLayoutManager; } diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx index 2b315dfc5118..db1d0d809fc8 100644 --- a/sfx2/workben/custompanel/ctp_factory.cxx +++ b/sfx2/workben/custompanel/ctp_factory.cxx @@ -93,7 +93,7 @@ namespace sd { namespace colortoolpanel { OSL_FAIL( "ToolPanelFactory::createUIElement: no parent window in the args!" ); throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No parent window provided in the creation arguments. Cannot create tool panel." ) ), + ::rtl::OUString( "No parent window provided in the creation arguments. Cannot create tool panel." ), *this, 2 ); @@ -113,7 +113,7 @@ namespace sd { namespace colortoolpanel //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ) ); + return ::rtl::OUString( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ); } //------------------------------------------------------------------------------------------------------------------ @@ -141,7 +141,7 @@ namespace sd { namespace colortoolpanel Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) { Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.example.colorpanel.ToolPanelFactory" ) ); + aServiceNames[0] = ::rtl::OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); return aServiceNames; } diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx index d41f2e64a847..c7a0587cb50d 100644 --- a/sfx2/workben/custompanel/ctp_panel.cxx +++ b/sfx2/workben/custompanel/ctp_panel.cxx @@ -85,7 +85,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) ); + aWindow.WindowServiceName = ::rtl::OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index a5631c9d7486..c83401082cfa 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -55,8 +55,7 @@ namespace { rtl::OUString SAL_CALL getDefaultImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.DesktopBackend")); + "com.sun.star.comp.configuration.backend.DesktopBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() { @@ -147,8 +146,7 @@ void Default::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } @@ -198,8 +196,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::getCurrentContext()); if (current.is()) { current->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; } @@ -209,20 +206,17 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.GconfBackend"))); + "com.sun.star.configuration.backend.GconfBackend")); } else if ( desktop == "KDE" ) { backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDEBackend"))); + "com.sun.star.configuration.backend.KDEBackend")); } else if ( desktop == "KDE4" ) { backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDE4Backend"))); + "com.sun.star.configuration.backend.KDE4Backend")); } return backend.is() ? backend : static_cast< cppu::OWeakObject * >(new Default); diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 71276daae499..34aa138f10a7 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -69,8 +69,7 @@ GConfClient* getGconfClient() mClient = gconf_client_get_default(); if (!mClient) { - throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM - ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection")),NULL); + throw uno::RuntimeException(rtl::OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); } static const char * const PreloadValuesList[] = diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index ac7b736dc72b..b4f258af9b08 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.GconfBackend")); + "com.sun.star.comp.configuration.backend.GconfBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "GNOME"; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index ca41910d5118..f6b7fb9bf8d2 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.KDE4Backend")); + "com.sun.star.comp.configuration.backend.KDE4Backend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 4945433e5abc..82a4989e8df2 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.KDEBackend")); + "com.sun.star.comp.configuration.backend.KDEBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE" && KApplication::kApplication() != 0; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 737bbb9aa8e9..4ea1d9b8c220 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -69,8 +69,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Rotate") ), + ::rtl::OUString("Rotate"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -80,8 +79,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewX") ), + ::rtl::OUString("SkewX"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -91,8 +89,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewY") ), + ::rtl::OUString("SkewY"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index e0b894ebbb65..b803b441a39f 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -249,7 +249,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) ), + rtl::OUString( "node-type" ), uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); @@ -719,7 +719,7 @@ void BaseNode::showState() const // read shape name ::rtl::OUString aName; if( (xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) + ::rtl::OUString("Name") ) >>= aName) ) { const ::rtl::OString& rAsciiName( diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index b07c87e80fed..355892abf130 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -154,8 +154,8 @@ namespace slideshow sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ) ) >>= nDocHeight; + xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; mpMtf = pMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index e9d596e87dd5..69ed0c3d7ff7 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -782,7 +782,7 @@ namespace public: MainSequenceSearcher() { - maSearchKey.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) ); + maSearchKey.Name = ::rtl::OUString( "node-type" ); maSearchKey.Value <<= presentation::EffectNodeType::MAIN_SEQUENCE; } @@ -978,8 +978,8 @@ bool SlideImpl::applyInitialShapeAttributes( xPropsCreator.set( xFac->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.animations.TargetPropertiesCreator") ), + ::rtl::OUString( + "com.sun.star.animations.TargetPropertiesCreator"), maContext.mxComponentContext ), uno::UNO_QUERY_THROW ); } @@ -1231,8 +1231,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ) ) >>= nDocHeight; + xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 8d3309e5b00f..00b716b13efd 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -112,8 +112,8 @@ namespace slideshow if( !mxPlayer.is() ) throw lang::NoSupportException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No sound support for ") ) + rSoundURL, + rtl::OUString( + "No sound support for ") + rSoundURL, uno::Reference<uno::XInterface>() ); } diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index b31dbcab9ec2..0e45dac82284 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -745,7 +745,7 @@ namespace slideshow // read bound rect awt::Rectangle aTmpRect; if( !(xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundRect") ) ) >>= aTmpRect) ) + ::rtl::OUString("BoundRect") ) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); @@ -767,7 +767,7 @@ namespace slideshow // read prio sal_Int32 nPrio(0); if( !(xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ) ) >>= nPrio) ) + ::rtl::OUString("ZOrder") ) >>= nPrio) ) { ENSURE_OR_THROW( false, "getAPIShapePrio(): Could not get \"ZOrder\" property from shape" ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2141fb3c7c8b..2db843b47390 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -354,8 +354,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Opacity") ), + ::rtl::OUString("Opacity"), rShape, rShapeManager, rSlideSize ), diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 36b3585f40a5..8714c0ac68f3 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -138,16 +138,14 @@ void Test::test() { rtl::OUString doc; CPPUNIT_ASSERT( test::getTestArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc)); + rtl::OUString("smoketest.doc"), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(2); - args[0].Name = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); + args[0].Name = rtl::OUString("MacroExecutionMode"); args[0].Handle = -1; args[0].Value <<= com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = css::beans::PropertyState_DIRECT_VALUE; - args[1].Name = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + args[1].Name = rtl::OUString("ReadOnly"); args[1].Handle = -1; args[1].Value <<= sal_True; args[1].State = css::beans::PropertyState_DIRECT_VALUE; @@ -165,12 +163,12 @@ void Test::test() { css::uno::Reference< css::frame::XModel >( xDesktop->loadComponentFromURL( test::toAbsoluteFileUrl(doc), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), + rtl::OUString("_default"), 0, args), css::uno::UNO_QUERY_THROW)->getCurrentController(), css::uno::UNO_SET_THROW)->getFrame(), css::uno::UNO_QUERY_THROW)->queryDispatch( - url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0), + url, rtl::OUString("_self"), 0), css::uno::UNO_QUERY_THROW); Result result; // Shifted to main thread to work around potential deadlocks (i112867): diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx index 8f8ccb5e7212..4bc0eb53acba 100644 --- a/stoc/source/corereflection/crarray.cxx +++ b/stoc/source/corereflection/crarray.cxx @@ -90,13 +90,13 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen ) if (eTC != TypeClass_SEQUENCE && eTC != TypeClass_ARRAY) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ), + OUString("no sequence given!"), (XWeak *)(OWeakObject *)this, 0 ); } if (nLen < 0) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal length given!") ), + OUString("illegal length given!"), (XWeak *)(OWeakObject *)this, 1 ); } @@ -115,7 +115,7 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray ) if (eTC != TypeClass_SEQUENCE && eTC != TypeClass_ARRAY) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ), + OUString("no sequence given!"), (XWeak *)(OWeakObject *)this, 0 ); } @@ -129,7 +129,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex ) if (eTC != TypeClass_SEQUENCE && eTC != TypeClass_ARRAY) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ), + OUString("no sequence given!"), (XWeak *)(OWeakObject *)this, 0 ); } @@ -137,7 +137,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex ) if (pSeq->nElements <= nIndex) { throw ArrayIndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal index given!") ), + OUString("illegal index given!"), (XWeak *)(OWeakObject *)this ); } @@ -160,7 +160,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal if (eTC != TypeClass_SEQUENCE && eTC != TypeClass_ARRAY) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ), + OUString("no sequence given!"), (XWeak *)(OWeakObject *)this, 0 ); } @@ -168,7 +168,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal if (pSeq->nElements <= nIndex) { throw ArrayIndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal index given!") ), + OUString("illegal index given!"), (XWeak *)(OWeakObject *)this ); } @@ -188,7 +188,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal { TYPELIB_DANGER_RELEASE( pElemTypeDescr ); throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("sequence element is not assignable by given value!") ), + OUString("sequence element is not assignable by given value!"), (XWeak *)(OWeakObject *)this, 2 ); } TYPELIB_DANGER_RELEASE( pElemTypeDescr ); diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index 6ee7ee009024..5835840b5f41 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -203,7 +203,7 @@ Any IdlCompFieldImpl::get( const Any & rObj ) TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal object given!") ), + OUString("illegal object given!"), (XWeak *)(OWeakObject *)this, 0 ); } //__________________________________________________________________________________________________ @@ -232,14 +232,14 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue ) else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal value given!") ), + OUString("illegal value given!"), (XWeak *)(OWeakObject *)this, 1 ); } } TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal object given!") ), + OUString("illegal object given!"), (XWeak *)(OWeakObject *)this, 0 ); } @@ -269,14 +269,14 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue ) else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal value given!") ), + OUString("illegal value given!"), (XWeak *)(OWeakObject *)this, 1 ); } } TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal object given!") ), + OUString("illegal object given!"), (XWeak *)(OWeakObject *)this, 0 ); } diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index a51f58a6b35c..5015c69659fa 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -69,8 +69,8 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl( , _aElements( CACHE_SIZE ) { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); - xContext->getValueByName( OUString( RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) ) >>= _xTDMgr; + xContext->getValueByName( OUString( + "/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) >>= _xTDMgr; OSL_ENSURE( _xTDMgr.is(), "### cannot get singleton \"TypeDescriptionManager\" from context!" ); } //__________________________________________________________________________________________________ @@ -399,7 +399,7 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno() if (! _aCpp2Uno.is()) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get c++ to uno mapping!") ), + OUString("cannot get c++ to uno mapping!"), (XWeak *)(OWeakObject *)this ); } } @@ -422,7 +422,7 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp() if (! _aUno2Cpp.is()) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get uno to c++ mapping!") ), + OUString("cannot get uno to c++ mapping!"), (XWeak *)(OWeakObject *)this ); } } @@ -439,7 +439,7 @@ uno_Interface * IdlReflectionServiceImpl::mapToUno( return (uno_Interface *)getCpp2Uno().mapInterface( xObj.get(), pTo ); throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal object given!") ), + OUString("illegal object given!"), (XWeak *)(OWeakObject *)this ); } diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index e37e35028034..a2040639d5e7 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -160,7 +160,7 @@ void IdlEnumFieldImpl::set( const Any &, const Any & ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { throw IllegalAccessException( - OUString( RTL_CONSTASCII_USTRINGPARAM("enum field is constant!") ), + OUString("enum field is constant!"), (XWeak *)(OWeakObject *)this ); } //__________________________________________________________________________________________________ @@ -168,7 +168,7 @@ void IdlEnumFieldImpl::set( Any &, const Any & ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { throw IllegalAccessException( - OUString( RTL_CONSTASCII_USTRINGPARAM("enum field is constant!") ), + OUString("enum field is constant!"), (XWeak *)(OWeakObject *)this ); } diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 99db43221fdf..12d6a6bd2b25 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -206,7 +206,7 @@ Any IdlAttributeFieldImpl::get( const Any & rObj ) return aRet; } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal object given!") ), + OUString("illegal object given!"), (XWeak *)(OWeakObject *)this, 0 ); } //__________________________________________________________________________________________________ @@ -216,7 +216,7 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue ) if (getAttributeTypeDescr()->bReadOnly) { throw IllegalAccessException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot set readonly attribute!") ), + OUString("cannot set readonly attribute!"), (XWeak *)(OWeakObject *)this ); } @@ -292,11 +292,11 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue ) (*pUnoI->release)( pUnoI ); throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal value given!") ), + OUString("illegal value given!"), *(const Reference< XInterface > *)rObj.getValue(), 1 ); } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal destination object given!") ), + OUString("illegal destination object given!"), (XWeak *)(OWeakObject *)this, 0 ); } //__________________________________________________________________________________________________ @@ -625,7 +625,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & { (*pUnoI->release)( pUnoI ); throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("arguments len differ!") ), + OUString("arguments len differ!"), *(const Reference< XInterface > *)rObj.getValue(), 1 ); } @@ -699,7 +699,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & if (! bAssign) { IllegalArgumentException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot coerce argument type during corereflection call!") ), + OUString("cannot coerce argument type during corereflection call!"), *(const Reference< XInterface > *)rObj.getValue(), (sal_Int16)nPos ); // cleanup @@ -738,7 +738,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & InvocationTargetException aExc; aExc.Context = *(const Reference< XInterface > *)rObj.getValue(); - aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred during invocation!") ); + aExc.Message = OUString("exception occurred during invocation!"); uno_any_destruct( &aExc.TargetException, reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); @@ -776,7 +776,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & return aRet; } throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal destination object given!") ), + OUString("illegal destination object given!"), (XWeak *)(OWeakObject *)this, 0 ); } diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 07b4129726cb..568bc0560e7d 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -642,7 +642,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest, OUString linkTarget = xKey->getLinkTarget(relativKey); OUString linkName(xKey->getKeyName().copy(xUnoKey->getKeyName().getLength())); - linkName = linkName + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + relativKey; + linkName = linkName + OUString("/") + relativKey; if (bRegister) { diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index 489a27b4b37c..830abdf32280 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -155,8 +155,8 @@ void mergeKeys( if (xDest->isReadOnly()) { throw registry::InvalidRegistryException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "destination registry is read-only! cannot merge!") ), + OUString( + "destination registry is read-only! cannot merge!"), Reference< XInterface >() ); } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 5948fc621942..1fc00707d356 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -1661,7 +1661,7 @@ ImplIntrospection::ImplIntrospection( const Reference<XMultiServiceFactory> & rX mpTypeProviderCache = NULL; // Spezielle Klassen holen -// Reference< XInterface > xServiceIface = m_xSMgr->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ); +// Reference< XInterface > xServiceIface = m_xSMgr->createInstance( ::rtl::OUString("com.sun.star.reflection.CoreReflection") ); // if( xServiceIface.is() ) // mxCoreReflection = Reference< XIdlReflection >::query( xServiceIface ); Reference< XPropertySet > xProps( rXSMgr, UNO_QUERY ); @@ -1670,30 +1670,30 @@ ImplIntrospection::ImplIntrospection( const Reference<XMultiServiceFactory> & rX { Reference< XComponentContext > xContext; xProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; + ::rtl::OUString("DefaultContext") ) >>= xContext; OSL_ASSERT( xContext.is() ); if (xContext.is()) { xContext->getValueByName( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection") ) ) >>= mxCoreReflection; + ::rtl::OUString("/singletons/com.sun.star.reflection.theCoreReflection") ) >>= mxCoreReflection; OSL_ENSURE( mxCoreReflection.is(), "### CoreReflection singleton not accessible!?" ); } } if (! mxCoreReflection.is()) { throw DeploymentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible") ), + ::rtl::OUString("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible"), Reference< XInterface >() ); } - mxElementAccessClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XElementAccess")) ); - mxNameContainerClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XNameContainer")) ); - mxNameAccessClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XNameAccess")) ); - mxIndexContainerClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XIndexContainer")) ); - mxIndexAccessClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XIndexAccess")) ); - mxEnumerationAccessClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XEnumerationAccess")) ); - mxInterfaceClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")) ); - mxAggregationClass = mxCoreReflection->forName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XAggregation")) ); + mxElementAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XElementAccess") ); + mxNameContainerClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XNameContainer") ); + mxNameAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XNameAccess") ); + mxIndexContainerClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XIndexContainer") ); + mxIndexAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XIndexAccess") ); + mxEnumerationAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XEnumerationAccess") ); + mxInterfaceClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.uno.XInterface") ); + mxAggregationClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.uno.XAggregation") ); mbDisposed = sal_False; } @@ -1888,7 +1888,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS ::rtl::OUString sOWName( pTD->pTypeName ); if( !xRefl.is() ) { - xRefl = Reference< XIdlReflection >( xMgr->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY ); + xRefl = Reference< XIdlReflection >( xMgr->createInstance( ::rtl::OUString("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); } xRetClass = xRefl->forName( sOWName ); @@ -2318,7 +2318,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( } else { - if( aMethName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("queryInterface")) ) + if( aMethName != ::rtl::OUString("queryInterface") ) { rMethodConcept_i |= MethodConcept::DANGEROUS; continue; diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index f1d8c2b3654e..fd2d75e29123 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -531,7 +531,7 @@ Any Invocation_Impl::getValue( const OUString& PropertyName ) } throw UnknownPropertyException( - OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get value ") ) + PropertyName, + OUString("cannot get value ") + PropertyName, Reference< XInterface >() ); } @@ -560,7 +560,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) PropertyName, xTypeConverter->convertTo( Value, aProp.Type ) ); else throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no type converter service!") ), + OUString("no type converter service!"), Reference< XInterface >() ); } // NameContainer @@ -575,7 +575,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) aConv = xTypeConverter->convertTo( Value, _xNameContainer->getElementType() ); else throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no type converter service!") ), + OUString("no type converter service!"), Reference< XInterface >() ); // bei Vorhandensein ersetzen, ansonsten einfuegen @@ -586,7 +586,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) } else throw UnknownPropertyException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no introspection nor name container!") ), + OUString("no introspection nor name container!"), Reference< XInterface >() ); } catch (UnknownPropertyException &) @@ -635,7 +635,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& if (nFParamsLen != InParams.getLength()) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("incorrect number of parameters passed invoking function ") ) + FunctionName, + OUString("incorrect number of parameters passed invoking function ") + FunctionName, (OWeakObject *) this, (sal_Int16) 1 ); } @@ -674,7 +674,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& { CannotConvertException aExc; aExc.Context = *this; - aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("invocation type mismatch!") ); + aExc.Message = OUString("invocation type mismatch!"); throw aExc; } } @@ -714,7 +714,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& RuntimeException aExc; aExc.Context = *this; - aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("invocation lacking of introspection access!") ); + aExc.Message = OUString("invocation lacking of introspection access!"); throw aExc; } @@ -1103,24 +1103,23 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); xTypeConverter = Reference<XTypeConverter>( mxSMgr->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")), + OUString("com.sun.star.script.Converter"), xCtx ), UNO_QUERY ); xIntrospection = Introspection::create(xCtx); mxCtx->getValueByName( - OUString( - RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection")) ) + OUString("/singletons/com.sun.star.reflection.theCoreReflection") ) >>= xCoreReflection; OSL_ENSURE( xCoreReflection.is(), "### CoreReflection singleton not accessible!?" ); if (! xCoreReflection.is()) { throw DeploymentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible") ), + OUString("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible"), Reference< XInterface >() ); } // xCoreReflection = Reference<XIdlReflection>( // mxSMgr->createInstanceWithContext( -// OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")), +// OUString("com.sun.star.reflection.CoreReflection"), // xCtx), // UNO_QUERY); } @@ -1156,7 +1155,7 @@ Sequence< OUString > InvocationService::getSupportedServiceNames(void) throw( Ru //-------------------------------------------------------------------------------------------------- Reference<XInterface> InvocationService::createInstance(void) throw( Exception, RuntimeException ) { - //TODO:throw( Exception(OUString( RTL_CONSTASCII_USTRINGPARAM("no default construction of invocation adapter possible!")), *this) ); + //TODO:throw( Exception(OUString("no default construction of invocation adapter possible!"), *this) ); return Reference<XInterface>(); // dummy } @@ -1172,7 +1171,7 @@ Reference<XInterface> InvocationService::createInstanceWithArguments( } else { - //TODO:throw( Exception(OUString( RTL_CONSTASCII_USTRINGPARAM("no default construction of invocation adapter possible!")), *this) ); + //TODO:throw( Exception(OUString("no default construction of invocation adapter possible!"), *this) ); return Reference<XInterface>(); } } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 1472dd604e2d..92b04fba70ec 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -716,8 +716,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) // type converter Reference< script::XTypeConverter > xConverter( xContext->getServiceManager()->createInstanceWithContext( - OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), + OUString("com.sun.star.script.Converter"), xContext ), UNO_QUERY_THROW ); m_pConverter = (uno_Interface *)m_aCpp2Uno.mapInterface( diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 38029b181356..352782ede2e8 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -70,17 +70,14 @@ static Mutex & getInitMutex(); static Sequence< OUString > loader_getSupportedServiceNames() { Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java") ); - seqNames.getArray()[1] = OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java2") ); + seqNames.getArray()[0] = OUString( "com.sun.star.loader.Java"); + seqNames.getArray()[1] = OUString( "com.sun.star.loader.Java2"); return seqNames; } static OUString loader_getImplementationName() { - return OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.JavaComponentLoader" ) ); + return OUString( "com.sun.star.comp.stoc.JavaComponentLoader" ); } class JavaComponentLoader : public WeakImplHelper2<XImplementationLoader, XServiceInfo> @@ -185,40 +182,40 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL // instantiate the java JavaLoader jclass jcClassLoader = pJNIEnv->FindClass("java/lang/ClassLoader"); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - could not find class java/lang/ClassLoader")), + throw RuntimeException(OUString( + "javaloader error - could not find class java/lang/ClassLoader"), css::uno::Reference<XInterface>()); jmethodID jmLoadClass = pJNIEnv->GetMethodID( jcClassLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - could not find method java/lang/ClassLoader.loadClass")), + throw RuntimeException(OUString( + "javaloader error - could not find method java/lang/ClassLoader.loadClass"), css::uno::Reference<XInterface>()); jvalue arg; arg.l = pJNIEnv->NewStringUTF( "com.sun.star.comp.loader.JavaLoader"); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - could not create string")), + throw RuntimeException(OUString( + "javaloader error - could not create string"), css::uno::Reference<XInterface>()); jclass jcJavaLoader = static_cast< jclass >( pJNIEnv->CallObjectMethodA( static_cast< jobject >(xVirtualMachine->getClassLoader()), jmLoadClass, &arg)); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - could not find class com/sun/star/comp/loader/JavaLoader")), + throw RuntimeException(OUString( + "javaloader error - could not find class com/sun/star/comp/loader/JavaLoader"), css::uno::Reference<XInterface>()); jmethodID jmJavaLoader_init = pJNIEnv->GetMethodID(jcJavaLoader, "<init>", "()V"); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - instantiation of com.sun.star.comp.loader.JavaLoader failed")), + throw RuntimeException(OUString( + "javaloader error - instantiation of com.sun.star.comp.loader.JavaLoader failed"), css::uno::Reference<XInterface>()); jobject joJavaLoader = pJNIEnv->NewObject(jcJavaLoader, jmJavaLoader_init); if(pJNIEnv->ExceptionOccurred()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - instantiation of com.sun.star.comp.loader.JavaLoader failed")), + throw RuntimeException(OUString( + "javaloader error - instantiation of com.sun.star.comp.loader.JavaLoader failed"), css::uno::Reference<XInterface>()); // map the java JavaLoader to this environment @@ -226,20 +223,20 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL uno_getEnvironment(&pJava_environment, sJava.pData, xVirtualMachine.get()); if(!pJava_environment) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - no Java environment available")), css::uno::Reference<XInterface>()); + throw RuntimeException(OUString( + "javaloader error - no Java environment available"), css::uno::Reference<XInterface>()); // why is there no convinient contructor? OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)); uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL); if(!pUno_environment) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - no C++ environment available")), css::uno::Reference<XInterface>()); + throw RuntimeException(OUString( + "javaloader error - no C++ environment available"), css::uno::Reference<XInterface>()); Mapping java_curr(pJava_environment, pUno_environment); if(!java_curr.is()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - no mapping from java to C++ ")), css::uno::Reference<XInterface>()); + throw RuntimeException(OUString( + "javaloader error - no mapping from java to C++ "), css::uno::Reference<XInterface>()); // release java environment pJava_environment->release(pJava_environment); @@ -252,16 +249,16 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL getCppuType((css::uno::Reference<XImplementationLoader> *) 0). getDescription((typelib_TypeDescription **) & pType_XImplementationLoader); if(!pType_XImplementationLoader) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - no type information for XImplementationLoader")), + throw RuntimeException(OUString( + "javaloader error - no type information for XImplementationLoader"), css::uno::Reference<XInterface>()); m_javaLoader = css::uno::Reference<XImplementationLoader>(reinterpret_cast<XImplementationLoader *>( java_curr.mapInterface(joJavaLoader, pType_XImplementationLoader))); pJNIEnv->DeleteLocalRef( joJavaLoader ); if(!m_javaLoader.is()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - mapping of java XImplementationLoader to c++ failed")), + throw RuntimeException(OUString( + "javaloader error - mapping of java XImplementationLoader to c++ failed"), css::uno::Reference<XInterface>()); typelib_typedescription_release(reinterpret_cast<typelib_TypeDescription *>(pType_XImplementationLoader)); @@ -278,8 +275,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL // set the service manager at the javaloader css::uno::Reference<XInitialization> javaLoader_XInitialization(m_javaLoader, UNO_QUERY); if(!javaLoader_XInitialization.is()) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "javaloader error - initialization of java javaloader failed, no XInitialization")), + throw RuntimeException(OUString( + "javaloader error - initialization of java javaloader failed, no XInitialization"), css::uno::Reference<XInterface>()); Any any; @@ -354,7 +351,7 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( return loader->writeRegistryInfo(xKey, blabla, rLibName); else throw CannotRegisterImplementationException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Could not create Java implementation loader")), NULL); + OUString("Could not create Java implementation loader"), NULL); } @@ -368,7 +365,7 @@ css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader::activate( return loader->activate(rImplName, blabla, rLibName, xKey); else throw CannotActivateFactoryException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Could not create Java implementation loader")), NULL); + OUString("Could not create Java implementation loader"), NULL); } static Mutex & getInitMutex() diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 03811aba78a6..102605c072f1 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -210,8 +210,8 @@ bool SingletonFactory::m_bDisposed = false; rtl::OUString serviceGetImplementationName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.stoc.JavaVirtualMachine")); + return rtl::OUString( + "com.sun.star.comp.stoc.JavaVirtualMachine"); } css::uno::Sequence< rtl::OUString > serviceGetSupportedServiceNames() @@ -268,8 +268,7 @@ bool askForRetry(css::uno::Any const & rException) { css::uno::Reference< css::task::XInteractionHandler > xHandler; xContext->getValueByName(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "java-vm.interaction-handler"))) + "java-vm.interaction-handler")) >>= xHandler; if (xHandler.is()) { @@ -289,30 +288,30 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw (css::uno::Exception) { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationRegistry")), + rtl::OUString("com.sun.star.configuration.ConfigurationRegistry"), xCtx ); - if(!xConfRegistry.is()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + if(!xConfRegistry.is()) throw css::uno::RuntimeException(rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference<css::registry::XSimpleRegistry> xConfRegistry_simple(xConfRegistry, css::uno::UNO_QUERY); - if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException(rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); - xConfRegistry_simple->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Inet")), sal_True, sal_False); + xConfRegistry_simple->open(rtl::OUString("org.openoffice.Inet"), sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); // if ooInetProxyType is not 0 then read the settings - css::uno::Reference<css::registry::XRegistryKey> proxyEnable= xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetProxyType"))); + css::uno::Reference<css::registry::XRegistryKey> proxyEnable= xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetProxyType")); if( proxyEnable.is() && 0 != proxyEnable->getLongValue()) { // read ftp proxy name - css::uno::Reference<css::registry::XRegistryKey> ftpProxy_name = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetFTPProxyName"))); + css::uno::Reference<css::registry::XRegistryKey> ftpProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetFTPProxyName")); if(ftpProxy_name.is() && !ftpProxy_name->getStringValue().isEmpty()) { - rtl::OUString ftpHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyHost=")); + rtl::OUString ftpHost = rtl::OUString("ftp.proxyHost="); ftpHost += ftpProxy_name->getStringValue(); // read ftp proxy port - css::uno::Reference<css::registry::XRegistryKey> ftpProxy_port = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetFTPProxyPort"))); + css::uno::Reference<css::registry::XRegistryKey> ftpProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetFTPProxyPort")); if(ftpProxy_port.is() && ftpProxy_port->getLongValue()) { - rtl::OUString ftpPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyPort=")); + rtl::OUString ftpPort = rtl::OUString("ftp.proxyPort="); ftpPort += rtl::OUString::valueOf(ftpProxy_port->getLongValue()); pjvm->pushProp(ftpHost); @@ -321,15 +320,15 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read http proxy name - css::uno::Reference<css::registry::XRegistryKey> httpProxy_name = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetHTTPProxyName"))); + css::uno::Reference<css::registry::XRegistryKey> httpProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPProxyName")); if(httpProxy_name.is() && !httpProxy_name->getStringValue().isEmpty()) { - rtl::OUString httpHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http.proxyHost=")); + rtl::OUString httpHost = rtl::OUString("http.proxyHost="); httpHost += httpProxy_name->getStringValue(); // read http proxy port - css::uno::Reference<css::registry::XRegistryKey> httpProxy_port = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetHTTPProxyPort"))); + css::uno::Reference<css::registry::XRegistryKey> httpProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPProxyPort")); if(httpProxy_port.is() && httpProxy_port->getLongValue()) { - rtl::OUString httpPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http.proxyPort=")); + rtl::OUString httpPort = rtl::OUString("http.proxyPort="); httpPort += rtl::OUString::valueOf(httpProxy_port->getLongValue()); pjvm->pushProp(httpHost); @@ -338,15 +337,15 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read https proxy name - css::uno::Reference<css::registry::XRegistryKey> httpsProxy_name = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetHTTPSProxyName"))); + css::uno::Reference<css::registry::XRegistryKey> httpsProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPSProxyName")); if(httpsProxy_name.is() && !httpsProxy_name->getStringValue().isEmpty()) { - rtl::OUString httpsHost = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("https.proxyHost=")); + rtl::OUString httpsHost = rtl::OUString("https.proxyHost="); httpsHost += httpsProxy_name->getStringValue(); // read https proxy port - css::uno::Reference<css::registry::XRegistryKey> httpsProxy_port = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetHTTPSProxyPort"))); + css::uno::Reference<css::registry::XRegistryKey> httpsProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPSProxyPort")); if(httpsProxy_port.is() && httpsProxy_port->getLongValue()) { - rtl::OUString httpsPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("https.proxyPort=")); + rtl::OUString httpsPort = rtl::OUString("https.proxyPort="); httpsPort += rtl::OUString::valueOf(httpsProxy_port->getLongValue()); pjvm->pushProp(httpsHost); @@ -355,10 +354,10 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read nonProxyHosts - css::uno::Reference<css::registry::XRegistryKey> nonProxies_name = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetNoProxy"))); + css::uno::Reference<css::registry::XRegistryKey> nonProxies_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetNoProxy")); if(nonProxies_name.is() && !nonProxies_name->getStringValue().isEmpty()) { - rtl::OUString httpNonProxyHosts = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http.nonProxyHosts=")); - rtl::OUString ftpNonProxyHosts= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp.nonProxyHosts=")); + rtl::OUString httpNonProxyHosts = rtl::OUString("http.nonProxyHosts="); + rtl::OUString ftpNonProxyHosts= rtl::OUString("ftp.nonProxyHosts="); rtl::OUString value= nonProxies_name->getStringValue(); // replace the separator ";" by "|" value= value.replace((sal_Unicode)';', (sal_Unicode)'|'); @@ -397,23 +396,23 @@ void getDefaultLocaleFromConfig( { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationRegistry")), xCtx ); + rtl::OUString( + "com.sun.star.configuration.ConfigurationRegistry"), xCtx ); if(!xConfRegistry.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference<css::registry::XSimpleRegistry> xConfRegistry_simple( xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); - xConfRegistry_simple->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")), sal_True, sal_False); + xConfRegistry_simple->open(rtl::OUString("org.openoffice.Setup"), sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); // read locale - css::uno::Reference<css::registry::XRegistryKey> locale = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale"))); + css::uno::Reference<css::registry::XRegistryKey> locale = xRegistryRootKey->openKey(rtl::OUString("L10N/ooLocale")); if(locale.is() && !locale->getStringValue().isEmpty()) { rtl::OUString language; rtl::OUString country; @@ -452,39 +451,39 @@ void getJavaPropsFromSafetySettings( { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationRegistry")), + rtl::OUString( + "com.sun.star.configuration.ConfigurationRegistry"), xCtx); if(!xConfRegistry.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference<css::registry::XSimpleRegistry> xConfRegistry_simple( xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), 0); + rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); xConfRegistry_simple->open( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Java")), + rtl::OUString("org.openoffice.Office.Java"), sal_True, sal_False); css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey(); if (xRegistryRootKey.is()) { - css::uno::Reference<css::registry::XRegistryKey> key_NetAccess= xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VirtualMachine/NetAccess"))); + css::uno::Reference<css::registry::XRegistryKey> key_NetAccess= xRegistryRootKey->openKey(rtl::OUString("VirtualMachine/NetAccess")); if (key_NetAccess.is()) { sal_Int32 val= key_NetAccess->getLongValue(); rtl::OUString sVal; switch( val) { - case 0: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("host")); + case 0: sVal= rtl::OUString("host"); break; - case 1: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unrestricted")); + case 1: sVal= rtl::OUString("unrestricted"); break; - case 3: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")); + case 3: sVal= rtl::OUString("none"); break; } rtl::OUString sProperty( RTL_CONSTASCII_USTRINGPARAM("appletviewer.security.mode=")); @@ -492,15 +491,15 @@ void getJavaPropsFromSafetySettings( pjvm->pushProp(sProperty); } css::uno::Reference<css::registry::XRegistryKey> key_CheckSecurity= xRegistryRootKey->openKey( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VirtualMachine/Security"))); + rtl::OUString("VirtualMachine/Security")); if( key_CheckSecurity.is()) { sal_Bool val= (sal_Bool) key_CheckSecurity->getLongValue(); rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("stardiv.security.disableSecurity=")); if( val) - sProperty= sProperty + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")); + sProperty= sProperty + rtl::OUString("false"); else - sProperty= sProperty + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")); + sProperty= sProperty + rtl::OUString("true"); pjvm->pushProp( sProperty); } } @@ -526,7 +525,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() { #endif if (!strcmp(TIMEZONE, p)) - pjvm->pushProp(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user.timezone=ECT"))); + pjvm->pushProp(rtl::OUString("user.timezone=ECT")); } void initVMConfiguration( @@ -628,8 +627,8 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); if (m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "bad call to initialize")), + rtl::OUString( + "bad call to initialize"), static_cast< cppu::OWeakObject * >(this)); css::beans::NamedValue val; if (rArguments.getLength() == 1 && (rArguments[0] >>= val) && val.Name == "UnoVirtualMachine" ) @@ -658,8 +657,7 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & } catch (jvmaccess::UnoVirtualMachine::CreationException &) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "jvmaccess::UnoVirtualMachine::CreationException")), + "jvmaccess::UnoVirtualMachine::CreationException"), static_cast< cppu::OWeakObject * >(this)); } } @@ -1146,74 +1144,74 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( } else if ( aAccessor == "ooInetHTTPProxyName" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "http.proxyHost")); + aPropertyName = rtl::OUString( + "http.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetHTTPProxyPort" ) { aPropertyName - = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http.proxyPort")); + = rtl::OUString("http.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } else if ( aAccessor == "ooInetHTTPSProxyName" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "https.proxyHost")); + aPropertyName = rtl::OUString( + "https.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetHTTPSProxyPort" ) { aPropertyName - = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("https.proxyPort")); + = rtl::OUString("https.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } else if ( aAccessor == "ooInetFTPProxyName" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "ftp.proxyHost")); + aPropertyName = rtl::OUString( + "ftp.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetFTPProxyPort" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "ftp.proxyPort")); + aPropertyName = rtl::OUString( + "ftp.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } else if ( aAccessor == "ooInetNoProxy" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "http.nonProxyHosts")); - aPropertyName2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "ftp.nonProxyHosts")); + aPropertyName = rtl::OUString( + "http.nonProxyHosts"); + aPropertyName2 = rtl::OUString( + "ftp.nonProxyHosts"); rEvent.Element >>= aPropertyValue; aPropertyValue = aPropertyValue.replace(';', '|'); } else if ( aAccessor == "NetAccess" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "appletviewer.security.mode")); + aPropertyName = rtl::OUString( + "appletviewer.security.mode"); sal_Int32 n = 0; if (rEvent.Element >>= n) switch (n) { case 0: - aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "host")); + aPropertyValue = rtl::OUString( + "host"); break; case 1: - aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "unrestricted")); + aPropertyValue = rtl::OUString( + "unrestricted"); break; case 3: - aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "none")); + aPropertyValue = rtl::OUString( + "none"); break; } else @@ -1222,16 +1220,16 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( } else if ( aAccessor == "Security" ) { - aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "stardiv.security.disableSecurity")); + aPropertyName = rtl::OUString( + "stardiv.security.disableSecurity"); sal_Bool b = sal_Bool(); if (rEvent.Element >>= b) if (b) - aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "false")); + aPropertyValue = rtl::OUString( + "false"); else - aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "true")); + aPropertyValue = rtl::OUString( + "true"); else return; bSecurityChanged = true; @@ -1257,12 +1255,12 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // call java.lang.System.setProperty // String setProperty( String key, String value) jclass jcSystem= pJNIEnv->FindClass("java/lang/System"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:FindClass java/lang/System")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/lang/System"), 0); jmethodID jmSetProps= pJNIEnv->GetStaticMethodID( jcSystem, "setProperty","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetStaticMethodID java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); jstring jsPropName= pJNIEnv->NewString( aPropertyName.getStr(), aPropertyName.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); // remove the property if it does not have a value ( user left the dialog field empty) // or if the port is set to 0 @@ -1273,14 +1271,14 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // call java.lang.System.getProperties jmethodID jmGetProps= pJNIEnv->GetStaticMethodID( jcSystem, "getProperties","()Ljava/util/Properties;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetStaticMethodID java.lang.System.getProperties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); jobject joProperties= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetProps); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.getProperties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); // call java.util.Properties.remove jclass jcProperties= pJNIEnv->FindClass("java/util/Properties"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:FindClass java/util/Properties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/util/Properties"), 0); jmethodID jmRemove= pJNIEnv->GetMethodID( jcProperties, "remove", "(Ljava/lang/Object;)Ljava/lang/Object;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetMethodID java.util.Properties.remove")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.util.Properties.remove"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsPropName); // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only @@ -1288,7 +1286,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( if (!aPropertyName2.isEmpty()) { jstring jsPropName2= pJNIEnv->NewString( aPropertyName2.getStr(), aPropertyName2.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsPropName2); } } @@ -1296,20 +1294,20 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // Change the Value of the property jstring jsPropValue= pJNIEnv->NewString( aPropertyValue.getStr(), aPropertyValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsPropName, jsPropValue); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only // has a value for two java properties if (!aPropertyName2.isEmpty()) { jstring jsPropName2= pJNIEnv->NewString( aPropertyName2.getStr(), aPropertyName2.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jsPropValue= pJNIEnv->NewString( aPropertyValue.getStr(), aPropertyValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsPropName2, jsPropValue); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } } @@ -1319,7 +1317,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( if (bSecurityChanged) { jmethodID jmGetSecur= pJNIEnv->GetStaticMethodID( jcSystem,"getSecurityManager","()Ljava/lang/SecurityManager;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetStaticMethodID java.lang.System.getSecurityManager")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getSecurityManager"), 0); jobject joSecur= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetSecur); if (joSecur != 0) { @@ -1333,9 +1331,9 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // The SecurityManagers class Name must be com.sun.star.lib.sandbox.SandboxSecurity jclass jcSec= pJNIEnv->GetObjectClass( joSecur); jclass jcClass= pJNIEnv->FindClass("java/lang/Class"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:FindClass java.lang.Class")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java.lang.Class"), 0); jmethodID jmName= pJNIEnv->GetMethodID( jcClass,"getName","()Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetMethodID java.lang.Class.getName")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.lang.Class.getName"), 0); jstring jsClass= (jstring) pJNIEnv->CallObjectMethod( jcSec, jmName); const jchar* jcharName= pJNIEnv->GetStringChars( jsClass, NULL); rtl::OUString sName( jcharName); @@ -1350,9 +1348,9 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // call SandboxSecurity.reset jmethodID jmReset= pJNIEnv->GetMethodID( jcSec,"reset","()V"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetMethodID com.sun.star.lib.sandbox.SandboxSecurity.reset")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); pJNIEnv->CallVoidMethod( joSecur, jmReset); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallVoidMethod com.sun.star.lib.sandbox.SandboxSecurity.reset")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallVoidMethod com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); } } } @@ -1421,8 +1419,8 @@ void JavaVirtualMachine::registerConfigChangesListener() try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( - m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationProvider")), m_xContext), css::uno::UNO_QUERY); + m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( + "com.sun.star.configuration.ConfigurationProvider"), m_xContext), css::uno::UNO_QUERY); if (xConfigProvider.is()) { @@ -1430,13 +1428,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // arguments for ConfigurationAccess css::uno::Sequence< css::uno::Any > aArguments(2); aArguments[0] <<= css::beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), + rtl::OUString("nodepath"), 0, - css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Inet/Settings"))), + css::uno::makeAny(rtl::OUString("org.openoffice.Inet/Settings")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments[1] <<= css::beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), + rtl::OUString("depth"), 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); @@ -1445,8 +1443,7 @@ void JavaVirtualMachine::registerConfigChangesListener() = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess")), + "com.sun.star.configuration.ConfigurationAccess"), aArguments), css::uno::UNO_QUERY); @@ -1456,13 +1453,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // now register as listener to changes in org.openoffice.Java/VirtualMachine css::uno::Sequence< css::uno::Any > aArguments2(2); aArguments2[0] <<= css::beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), + rtl::OUString("nodepath"), 0, - css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Java/VirtualMachine"))), + css::uno::makeAny(rtl::OUString("org.openoffice.Office.Java/VirtualMachine")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments2[1] <<= css::beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), + rtl::OUString("depth"), 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); @@ -1471,8 +1468,7 @@ void JavaVirtualMachine::registerConfigChangesListener() = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess")), + "com.sun.star.configuration.ConfigurationAccess"), aArguments2), css::uno::UNO_QUERY); @@ -1513,32 +1509,32 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) // creat Java Properties as JNI strings jstring jsFtpProxyHost= pJNIEnv->NewString( sFtpProxyHost.getStr(), sFtpProxyHost.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jstring jsFtpProxyPort= pJNIEnv->NewString( sFtpProxyPort.getStr(), sFtpProxyPort.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jstring jsFtpNonProxyHosts= pJNIEnv->NewString( sFtpNonProxyHosts.getStr(), sFtpNonProxyHosts.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jstring jsHttpProxyHost= pJNIEnv->NewString( sHttpProxyHost.getStr(), sHttpProxyHost.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jstring jsHttpProxyPort= pJNIEnv->NewString( sHttpProxyPort.getStr(), sHttpProxyPort.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); jstring jsHttpNonProxyHosts= pJNIEnv->NewString( sHttpNonProxyHosts.getStr(), sHttpNonProxyHosts.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); // prepare java.lang.System.setProperty jclass jcSystem= pJNIEnv->FindClass("java/lang/System"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:FindClass java/lang/System")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/lang/System"), 0); jmethodID jmSetProps= pJNIEnv->GetStaticMethodID( jcSystem, "setProperty","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetStaticMethodID java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); // call java.lang.System.getProperties jmethodID jmGetProps= pJNIEnv->GetStaticMethodID( jcSystem, "getProperties","()Ljava/util/Properties;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetStaticMethodID java.lang.System.getProperties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); jobject joProperties= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetProps); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.getProperties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); // prepare java.util.Properties.remove jclass jcProperties= pJNIEnv->FindClass("java/util/Properties"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:FindClass java/util/Properties")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/util/Properties"), 0); if (set_reset) { @@ -1558,44 +1554,44 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) if( propName.equals( sFtpProxyHost)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpProxyHost, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sFtpProxyPort)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpProxyPort, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sFtpNonProxyHosts)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpNonProxyHosts, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpProxyHost)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpProxyHost, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpProxyPort)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpProxyPort, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpNonProxyHosts)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:NewString")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpNonProxyHosts, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:CallStaticObjectMethod java.lang.System.setProperty")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } } } @@ -1603,7 +1599,7 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) { // call java.util.Properties.remove jmethodID jmRemove= pJNIEnv->GetMethodID( jcProperties, "remove", "(Ljava/lang/Object;)Ljava/lang/Object;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JNI:GetMethodID java.util.Property.remove")), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.util.Property.remove"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpProxyHost); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpProxyPort); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpNonProxyHosts); @@ -1628,20 +1624,17 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { rtl::OUString baseUrl; try { baseUrl = exp->expandMacros( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("$URE_INTERNAL_JAVA_DIR/"))); + rtl::OUString("$URE_INTERNAL_JAVA_DIR/")); } catch (css::lang::IllegalArgumentException &) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com::sun::star::lang::IllegalArgumentException")), + "com::sun::star::lang::IllegalArgumentException"), static_cast< cppu::OWeakObject * >(this)); } rtl::OUString classPath; try { classPath = exp->expandMacros( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("$URE_INTERNAL_JAVA_CLASSPATH"))); + rtl::OUString("$URE_INTERNAL_JAVA_CLASSPATH")); } catch (css::lang::IllegalArgumentException &) {} jclass class_URLClassLoader = environment->FindClass( "java/net/URLClassLoader"); @@ -1737,8 +1730,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { } catch (jvmaccess::UnoVirtualMachine::CreationException &) { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "jvmaccess::UnoVirtualMachine::CreationException")), + "jvmaccess::UnoVirtualMachine::CreationException"), static_cast< cppu::OWeakObject * >(this)); } } @@ -1746,8 +1738,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { void JavaVirtualMachine::handleJniException(JNIEnv * environment) { environment->ExceptionClear(); throw css::uno::RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("JNI exception occurred")), + rtl::OUString("JNI exception occurred"), static_cast< cppu::OWeakObject * >(this)); } diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 038fc3cfcccb..b2e20e37f8c6 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -193,11 +193,11 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( if( xKey.is() ) { Reference<XRegistryKey > xActivatorKey = xKey->openKey( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) ); + rtl::OUString("/UNO/ACTIVATOR") ); if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII ) { Reference<XRegistryKey > xPrefixKey = xKey->openKey( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) ); + rtl::OUString("/UNO/PREFIX") ); if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII ) { aPrefix = xPrefixKey->getAsciiValue(); diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx index 8840451355fe..0d7d160ddb31 100644 --- a/stoc/source/registry_tdprovider/functiondescription.cxx +++ b/stoc/source/registry_tdprovider/functiondescription.cxx @@ -73,8 +73,7 @@ FunctionDescription::getExceptions() const { } catch (const css::container::NoSuchElementException & e) { throw new css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: ")) + "com.sun.star.container.NoSuchElementException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); //TODO } @@ -82,8 +81,7 @@ FunctionDescription::getExceptions() const { || exceptions[i]->getTypeClass() != css::uno::TypeClass_EXCEPTION) { throw new css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("not an exception type: ")) + (rtl::OUString("not an exception type: ") + name), css::uno::Reference< css::uno::XInterface >()); //TODO } diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx index fd2d6c3343aa..d5ab8e14099d 100644 --- a/stoc/source/registry_tdprovider/methoddescription.cxx +++ b/stoc/source/registry_tdprovider/methoddescription.cxx @@ -92,8 +92,7 @@ css::uno::Reference< css::reflection::XTypeDescription > Parameter::getType() } catch (const css::container::NoSuchElementException & e) { throw new css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: ")) + "com.sun.star.container.NoSuchElementException: ") + e.Message), static_cast< cppu::OWeakObject * >(this)); } diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx index 50be0cb335df..4c2cd50da07a 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx @@ -272,8 +272,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xTD; throw container::NoSuchElementException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), + rtl::OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx index 3251fd1812d2..5c2959a857ad 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.cxx +++ b/stoc/source/registry_tdprovider/structtypedescription.cxx @@ -110,7 +110,7 @@ css::uno::Sequence< rtl::OUString > StructTypeDescription::getTypeParameters() return parameters; } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + rtl::OUString("std::bad_alloc"), static_cast< cppu::OWeakObject * >(this)); } } diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx index 0ec64d9e4c8e..36c17f913b94 100644 --- a/stoc/source/registry_tdprovider/tdiface.cxx +++ b/stoc/source/registry_tdprovider/tdiface.cxx @@ -339,8 +339,7 @@ void InterfaceTypeDescriptionImpl::checkInterfaceType( if (resolveTypedefs(type)->getTypeClass() != TypeClass_INTERFACE) { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Interface base is not an interface type")), + "Interface base is not an interface type"), static_cast< OWeakObject * >(this)); } } @@ -537,8 +536,7 @@ InterfaceTypeDescriptionImpl::getBaseTypes() throw (RuntimeException) { } catch (const NoSuchElementException & e) { throw RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: ")) + "com.sun.star.container.NoSuchElementException: ") + e.Message), static_cast< OWeakObject * >(this)); } @@ -565,8 +563,7 @@ InterfaceTypeDescriptionImpl::getOptionalBaseTypes() throw (RuntimeException) { } catch (const NoSuchElementException & e) { throw RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: ")) + "com.sun.star.container.NoSuchElementException: ") + e.Message), static_cast< OWeakObject * >(this)); } diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index 92dbc92ddeab..84223360787b 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -272,7 +272,7 @@ void ProviderImpl::initialize( if (xRegistry.is() && xRegistry->isValid()) { com::sun::star::uno::Reference< XRegistryKey > xKey( xRegistry->getRootKey()->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/UCR") ) ) ); + OUString("/UCR") ) ); if (xKey.is() && xKey->isValid()) { _aBaseKeys.push_back( xKey ); diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 585a0268eed2..294f000db92c 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -347,8 +347,7 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) { { throw RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Service has bad constructors")), + "Service has bad constructors"), static_cast< OWeakObject * >(this)); } (*ctors)[i] = new Constructor( @@ -375,8 +374,7 @@ void ServiceTypeDescriptionImpl::getReferences() if (superTypes > 1) { throw RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Service has more than one supertype")), + "Service has more than one supertype"), static_cast< OWeakObject * >(this)); } if (superTypes == 1) { @@ -398,8 +396,7 @@ void ServiceTypeDescriptionImpl::getReferences() { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: " ) ) + "com.sun.star.container.NoSuchElementException: " ) + e.Message, static_cast< OWeakObject * >( this ) ); } @@ -466,8 +463,7 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aOptionalServices[ nOS ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Service 'export' is not a service" ) ), + "Service 'export' is not a service" ), static_cast< OWeakObject * >( this ) ); nOS++; } @@ -477,8 +473,7 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aMandatoryServices[ nMS ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Service 'export' is not a service" ) ), + "Service 'export' is not a service" ), static_cast< OWeakObject * >( this ) ); nMS++; } diff --git a/stoc/source/registry_tdprovider/tdsingleton.cxx b/stoc/source/registry_tdprovider/tdsingleton.cxx index f995558e9fc6..b777974049d7 100644 --- a/stoc/source/registry_tdprovider/tdsingleton.cxx +++ b/stoc/source/registry_tdprovider/tdsingleton.cxx @@ -41,8 +41,7 @@ void SingletonTypeDescriptionImpl::init() { } catch (NoSuchElementException const & e) { throw RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.container.NoSuchElementException: ")) + "com.sun.star.container.NoSuchElementException: ") + e.Message), static_cast< OWeakObject * >(this)); } @@ -56,8 +55,7 @@ void SingletonTypeDescriptionImpl::init() { } else { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Singleton is based on neither interface nor service")), + "Singleton is based on neither interface nor service"), static_cast< OWeakObject * >(this)); } } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index c58e065ae69b..3b2c25b7abcf 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -82,43 +82,39 @@ namespace stoc_bootstrap Sequence< OUString > smgr_wrapper_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") ); + seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory"); return seqNames; } OUString smgr_wrapper_getImplementationName() { - return OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManagerWrapper")); + return OUString("com.sun.star.comp.stoc.OServiceManagerWrapper"); } Sequence< OUString > smgr_getSupportedServiceNames() { Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") ); - seqNames.getArray()[1] = OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceManager") ); + seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory"); + seqNames.getArray()[1] = OUString("com.sun.star.lang.ServiceManager"); return seqNames; } OUString smgr_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManager")); + return OUString("com.sun.star.comp.stoc.OServiceManager"); } Sequence< OUString > regsmgr_getSupportedServiceNames() { Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory")); - seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.RegistryServiceManager")); + seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory"); + seqNames.getArray()[1] = OUString("com.sun.star.lang.RegistryServiceManager"); return seqNames; } OUString regsmgr_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.ORegistryServiceManager" ) ); + return OUString( "com.sun.star.comp.stoc.ORegistryServiceManager" ); } } @@ -702,7 +698,7 @@ void SAL_CALL OServiceManagerWrapper::setPropertyValue( else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no XComponentContext given!") ), + OUString("no XComponentContext given!"), (OWeakObject *)this, 1 ); } } @@ -755,7 +751,7 @@ OServiceManagerWrapper::OServiceManagerWrapper( if (! m_root.is()) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no service manager to wrap") ), + OUString("no service manager to wrap"), Reference< XInterface >() ); } } @@ -980,14 +976,14 @@ void OServiceManager::setPropertyValue( else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no XComponentContext given!") ), + OUString("no XComponentContext given!"), (OWeakObject *)this, 1 ); } } else { throw UnknownPropertyException( - OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property ") ) + PropertyName, + OUString("unknown property ") + PropertyName, (OWeakObject *)this ); } } @@ -1007,7 +1003,7 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName) else { UnknownPropertyException except; - except.Message = OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager : unknown property " ) ); + except.Message = OUString( "ServiceManager : unknown property " ); except.Message += PropertyName; throw except; } @@ -1096,7 +1092,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( { Reference< XComponentContext > xDefContext; xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xDefContext; + OUString("DefaultContext") ) >>= xDefContext; OSL_ENSURE( xContext == xDefContext, "### default context of service manager singleton differs from context holding it!" ); @@ -1160,7 +1156,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( { Reference< XComponentContext > xDefContext; xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xDefContext; + OUString("DefaultContext") ) >>= xDefContext; OSL_ENSURE( xContext == xDefContext, "### default context of service manager singleton differs from context holding it!" ); @@ -1385,7 +1381,7 @@ void OServiceManager::insert( const Any & Element ) if( Element.getValueTypeClass() != TypeClass_INTERFACE ) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no interface given!") ), + OUString("no interface given!"), Reference< XInterface >(), 0 ); } Reference<XInterface > xEle( Element, UNO_QUERY_THROW ); @@ -1396,7 +1392,7 @@ void OServiceManager::insert( const Any & Element ) if( aIt != m_ImplementationMap.end() ) { throw ElementExistException( - OUString( RTL_CONSTASCII_USTRINGPARAM("element already exists!") ), + OUString("element already exists!"), Reference< XInterface >() ); } @@ -1457,7 +1453,7 @@ void OServiceManager::remove( const Any & Element ) if (iFind == m_ImplementationNameMap.end()) { throw NoSuchElementException( - OUString( RTL_CONSTASCII_USTRINGPARAM("element is not in: ") ) + OUString("element is not in: ") + implName, static_cast< OWeakObject * >(this) ); } xEle = iFind->second; @@ -1465,8 +1461,8 @@ void OServiceManager::remove( const Any & Element ) else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "neither interface nor string given!") ), + OUString( + "neither interface nor string given!"), Reference< XInterface >(), 0 ); } @@ -1480,7 +1476,7 @@ void OServiceManager::remove( const Any & Element ) if( aIt == m_ImplementationMap.end() ) { throw NoSuchElementException( - OUString( RTL_CONSTASCII_USTRINGPARAM("element is not in!") ), + OUString("element is not in!"), static_cast< OWeakObject * >(this) ); } //First remove all factories which have been loaded by ORegistryServiceManager. @@ -1631,7 +1627,7 @@ Reference<XRegistryKey > ORegistryServiceManager::getRootKey() m_xRegistry.set( createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.DefaultRegistry") ), + OUString("com.sun.star.registry.DefaultRegistry"), m_xContext ), UNO_QUERY ); } @@ -1656,7 +1652,7 @@ Reference<XInterface > ORegistryServiceManager::loadWithImplementationName( try { - OUString implementationName = OUString( RTL_CONSTASCII_USTRINGPARAM("/IMPLEMENTATIONS/") ) + name; + OUString implementationName = OUString("/IMPLEMENTATIONS/") + name; Reference<XRegistryKey > xImpKey = m_xRootKey->openKey(implementationName); if( xImpKey.is() ) @@ -1723,7 +1719,7 @@ void ORegistryServiceManager::fillAllNamesFromRegistry( HashSet_OWString & rSet try { Reference<XRegistryKey > xServicesKey = xRootKey->openKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("SERVICES") ) ); + OUString("SERVICES") ); // root + /Services + / if( xServicesKey.is() ) { diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 2b2a7110c008..816c35547bcc 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -1134,8 +1134,7 @@ void SimpleRegistry::open( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.registry.SimpleRegistry.open(")) + + "com.sun.star.registry.SimpleRegistry.open(") + rURL + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -1254,14 +1253,12 @@ css::uno::Reference< css::uno::XInterface > SimpleRegistry_CreateInstance( css::uno::Sequence< rtl::OUString > simreg_getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry")); + names[0] = rtl::OUString("com.sun.star.registry.SimpleRegistry"); return names; } rtl::OUString simreg_getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.SimpleRegistry")); + return rtl::OUString("com.sun.star.comp.stoc.SimpleRegistry"); } } diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index 51af243c0c62..458bded2165c 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -257,7 +257,7 @@ Any EnumerationImpl::nextElement() if (_nPos >= _pMgr->_aProviders.size()) { throw NoSuchElementException( - OUString( RTL_CONSTASCII_USTRINGPARAM("there is no further element!") ), + OUString("there is no further element!"), (XWeak *)(OWeakObject *)this ); } return makeAny( _pMgr->_aProviders[_nPos++] ); @@ -423,7 +423,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) if (find( newProvs.begin(), newProvs.end(), xElem ) != newProvs.end()) { throw ElementExistException( - OUString( RTL_CONSTASCII_USTRINGPARAM("provider already inserted!") ), + OUString("provider already inserted!"), (XWeak *)(OWeakObject *)this ); } @@ -530,7 +530,7 @@ void SAL_CALL ManagerImpl::remove( const Any & rElement ) if (! (rElement >>= xElem)) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("no type description provider given!") ), + OUString("no type description provider given!"), (XWeak *)(OWeakObject *)this, 0 ); } @@ -539,7 +539,7 @@ void SAL_CALL ManagerImpl::remove( const Any & rElement ) if (iFind == _aProviders.end()) { throw NoSuchElementException( - OUString( RTL_CONSTASCII_USTRINGPARAM("provider not found!") ), + OUString("provider not found!"), (XWeak *)(OWeakObject *)this ); } _aProviders.erase( iFind ); @@ -654,7 +654,7 @@ TypeClass SequenceTypeDescriptionImpl::getTypeClass() OUString SequenceTypeDescriptionImpl::getName() throw(::com::sun::star::uno::RuntimeException) { - return (OUString( RTL_CONSTASCII_USTRINGPARAM("[]") ) + _xElementTD->getName()); + return (OUString("[]") + _xElementTD->getName()); } // XIndirectTypeDescription diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx index 7433d11b84cc..ea44a750835e 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx @@ -88,8 +88,7 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement() return xEnum->nextElement(); throw container::NoSuchElementException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), + rtl::OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } @@ -111,8 +110,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xEnum->nextTypeDescription(); throw container::NoSuchElementException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), + rtl::OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index e9564768cc1a..125f50bf5ce2 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -370,7 +370,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6 return nRet; } throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("UNSIGNED HYPER out of range!") ), + OUString("UNSIGNED HYPER out of range!"), Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } @@ -384,7 +384,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6 return nRet; } throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("FLOAT out of range!") ), + OUString("FLOAT out of range!"), Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } case TypeClass_DOUBLE: @@ -396,7 +396,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6 return nRet; } throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("DOUBLE out of range!") ), + OUString("DOUBLE out of range!"), Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } @@ -407,27 +407,27 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6 if (! getHyperValue( fVal, *(OUString const *)rAny.getValue() )) { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("invalid STRING value!") ), + OUString("invalid STRING value!"), Reference<XInterface>(), aDestinationClass, FailReason::IS_NOT_NUMBER, 0 ); } nRet = (fVal > SAL_INT64_MAX ? (sal_Int64)(sal_uInt64)fVal : (sal_Int64)fVal); if (fVal >= min && (fVal < 0 || ((sal_uInt64)fVal) <= max)) return nRet; throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("STRING value out of range!") ), + OUString("STRING value out of range!"), Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } default: throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("TYPE is not supported!") ), + OUString("TYPE is not supported!"), Reference<XInterface>(), aDestinationClass, FailReason::TYPE_NOT_SUPPORTED, 0 ); } if (nRet >= min && (nRet < 0 || (sal_uInt64)nRet <= max)) return nRet; throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("VALUE is out of range!") ), + OUString("VALUE is out of range!"), Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } @@ -493,7 +493,7 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c if (! getNumericValue( fRet, *(OUString *)rAny.getValue() )) { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("invalid STRING value!") ), + OUString("invalid STRING value!"), Reference<XInterface>(), aDestinationClass, FailReason::IS_NOT_NUMBER, 0 ); } break; @@ -501,14 +501,14 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c default: throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("TYPE is not supported!") ), + OUString("TYPE is not supported!"), Reference< XInterface >(), aDestinationClass, FailReason::TYPE_NOT_SUPPORTED, 0 ); } if (fRet >= min && fRet <= max) return fRet; throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("VALUE is out of range!") ), + OUString("VALUE is out of range!"), Reference< XInterface >(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 ); } @@ -550,7 +550,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy else { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("value is not of same or derived type!") ), + OUString("value is not of same or derived type!"), Reference< XInterface >(), aDestinationClass, FailReason::SOURCE_IS_NO_DERIVED_TYPE, 0 ); } @@ -571,14 +571,14 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy !*(XInterface * const *)rVal.getValue()) { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("value is no interface!") ), + OUString("value is no interface!"), Reference< XInterface >(), aDestinationClass, FailReason::NO_SUCH_INTERFACE, 0 ); } if (! (aRet = (*(XInterface * const *)rVal.getValue())->queryInterface( aDestType )).hasValue()) { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("value has no such interface!") ), + OUString("value has no such interface!"), Reference< XInterface >(), aDestinationClass, FailReason::NO_SUCH_INTERFACE, 0 ); } break; @@ -681,8 +681,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy else { throw CannotConvertException( - OUString( - RTL_CONSTASCII_USTRINGPARAM("value cannot be converted to demanded ENUM!") ), + OUString("value cannot be converted to demanded ENUM!"), Reference< XInterface >(), aDestinationClass, FailReason::IS_NOT_ENUM, 0 ); } break; @@ -704,7 +703,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy return aRet; throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("conversion not possible!") ), + OUString("conversion not possible!"), Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 ); } @@ -727,7 +726,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina case TypeClass_UNKNOWN: case TypeClass_MODULE: throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("destination type is not simple!") ), + OUString("destination type is not simple!"), Reference< XInterface >(), (sal_Int16) 1 ); default: break; @@ -766,12 +765,12 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina case TypeClass_STRING: { const OUString & aStr = *(const OUString *)rVal.getValue(); - if ( aStr == "0" || aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) )) + if ( aStr == "0" || aStr.equalsIgnoreAsciiCase( OUString("false") )) { sal_Bool bFalse = sal_False; aRet.setValue( &bFalse, getCppuBooleanType() ); } - else if ( aStr == "1" || aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) )) + else if ( aStr == "1" || aStr.equalsIgnoreAsciiCase( OUString("true") )) { sal_Bool bTrue = sal_True; aRet.setValue( &bTrue, getCppuBooleanType() ); @@ -779,7 +778,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina else { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("STRING has no boolean value!") ), + OUString("STRING has no boolean value!"), Reference< XInterface >(), aDestinationClass, FailReason::IS_NOT_BOOL, 0 ); } } @@ -862,7 +861,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina else { throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("value is not ENUM!") ), + OUString("value is not ENUM!"), Reference< XInterface >(), aDestinationClass, FailReason::IS_NOT_ENUM, 0 ); } break; @@ -870,8 +869,8 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina case TypeClass_BOOLEAN: aRet <<= (*(sal_Bool *)rVal.getValue()) ? - OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : - OUString(RTL_CONSTASCII_USTRINGPARAM("false")); + OUString("true") : + OUString("false"); break; case TypeClass_CHAR: aRet <<= OUString( (sal_Unicode *)rVal.getValue(), 1 ); @@ -914,7 +913,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina return aRet; throw CannotConvertException( - OUString( RTL_CONSTASCII_USTRINGPARAM("conversion not possible!") ), + OUString("conversion not possible!"), Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 ); } } diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index cad73741f527..0888326e340a 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -209,19 +209,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Translator(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); + rtl::OUString("std::bad_alloc"), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.ExternalUriReferenceTranslator")); + return rtl::OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator"); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")); + s[0] = rtl::OUString("com.sun.star.uri.ExternalUriReferenceTranslator"); return s; } diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index ef947c1f90e4..a5f6041339ab 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -411,7 +411,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( throw; } catch (const css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("creating service ")) + rtl::OUString("creating service ") + serviceName, static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); //TODO: preserve type of e @@ -430,7 +430,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( uriRef = parseGeneric(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + rtl::OUString("std::bad_alloc"), static_cast< cppu::OWeakObject * >(this)); } } @@ -694,19 +694,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); + rtl::OUString("std::bad_alloc"), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriReferenceFactory")); + return rtl::OUString("com.sun.star.comp.uri.UriReferenceFactory"); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")); + s[0] = rtl::OUString("com.sun.star.uri.UriReferenceFactory"); return s; } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index 47b2bc7b965c..ffeb1dbde867 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -213,7 +213,7 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse( return new UrlReference(scheme, schemeSpecificPart); } catch (::std::bad_alloc &) { throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + ::rtl::OUString("std::bad_alloc"), css::uno::Reference< css::uno::XInterface >()); } } @@ -232,22 +232,20 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< ::cppu::OWeakObject * >(new Parser); } catch (::std::bad_alloc &) { throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + ::rtl::OUString("std::bad_alloc"), css::uno::Reference< css::uno::XInterface >()); } } ::rtl::OUString getImplementationName() { return ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand")); + "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand"); } css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > s(1); s[0] = ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand")); + "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand"); return s; } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 9db6f7300a5f..073d279dafb5 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -436,7 +436,7 @@ Parser::parse( return new UrlReference(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); + rtl::OUString("std::bad_alloc"), 0); } } @@ -455,19 +455,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Parser); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); + rtl::OUString("std::bad_alloc"), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript")); + return rtl::OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript")); + s[0] = rtl::OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); return s; } diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index 50a0fbdd4c6d..2083d056715f 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -136,19 +136,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); + rtl::OUString("std::bad_alloc"), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory")); + return rtl::OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory")); + s[0] = rtl::OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"); return s; } diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index fb6fb97973f3..405df9342e56 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -174,7 +174,7 @@ sal_Bool test1(const Reference< XMultiServiceFactory > & xMgr ) SAL_IMPLEMENT_MAIN() { Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), + xreg->open( OUString("applicat.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 2d35f761e0ad..8e2f769582da 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -116,7 +116,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) SAL_IMPLEMENT_MAIN() { Reference<XSimpleRegistry> xreg= createSimpleRegistry(); - xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), + xreg->open( OUString("applicat.rdb"), sal_False, sal_False ); Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 9a8f162803de..8708e826c096 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -297,66 +297,66 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) sal_uInt32 nElems = 0; // ==BYTE== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xff")); + aVal <<= OUString("0xff"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("255")); + aVal <<= OUString("255"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)0xffu; pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x80")); + aVal <<= OUString("0x80"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("128")); + aVal <<= OUString("128"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 0x80u ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7f")); + aVal <<= OUString("0x7f"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("127")); + aVal <<= OUString("127"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 0x7f ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("5")); + aVal <<= OUString("5"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+5")); + aVal <<= OUString("+5"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-5")); + aVal <<= OUString("-5"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa aVal <<= (sal_Int8)( -5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256")); + aVal <<= OUString("256"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==UINT16== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65535")); + aVal <<= OUString("65535"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffff")); + aVal <<= OUString("0xffff"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0xffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32768")); + aVal <<= OUString("32768"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x8000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32767")); + aVal <<= OUString("32767"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fff")); + aVal <<= OUString("0x7fff"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x7fff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256")); + aVal <<= OUString("256"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100")); + aVal <<= OUString("0x100"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x100 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 ); @@ -387,33 +387,33 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==UINT32== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+4294967295")); + aVal <<= OUString("+4294967295"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("4294967295")); + aVal <<= OUString("4294967295"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffffffff")); + aVal <<= OUString("0xffffffff"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0xffffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-2147483648")); + aVal <<= OUString("-2147483648"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0x80000000")); + aVal <<= OUString("-0x80000000"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa aVal <<= (sal_uInt32)( 0x80000000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("2147483647")); + aVal <<= OUString("2147483647"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fffffff")); + aVal <<= OUString("0x7fffffff"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0x7fffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65536")); + aVal <<= OUString("65536"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x10000")); + aVal <<= OUString("0x10000"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0x10000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -424,7 +424,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= (sal_uInt32)( 5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xfffffffb")); + aVal <<= OUString("0xfffffffb"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( -5 ); // is 0xfffffffb pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -452,27 +452,27 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==FLOAT== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-3.4e+38")); + aVal <<= OUString("-3.4e+38"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (float)( MIN_FLOAT ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+3.4e+38")); + aVal <<= OUString("+3.4e+38"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (float)( MAX_FLOAT ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("9e-20")); + aVal <<= OUString("9e-20"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( 9e-20 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+.7071067811865")); + aVal <<= OUString("+.7071067811865"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( .7071067811865 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("3.14159265359")); + aVal <<= OUString("3.14159265359"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( 3.14159265359 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); @@ -481,12 +481,12 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==DOUBLE== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-1.7976931348623155e+308")); + aVal <<= OUString("-1.7976931348623155e+308"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (double)( MIN_DOUBLE ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1.7976931348623155e+308")); + aVal <<= OUString("1.7976931348623155e+308"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (double)( MAX_DOUBLE ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -512,7 +512,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= (double)( 0xffffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100000000")); + aVal <<= OUString("0x100000000"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (double)( SAL_CONST_INT64(0x100000000) ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -525,20 +525,20 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal.setValue( &c, ::getCharCppuType() ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("A")); + aVal <<= OUString("A"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==BOOL== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0")); + aVal <<= OUString("0"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + aVal <<= OUString("1"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("False")); + aVal <<= OUString("False"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("true")); + aVal <<= OUString("true"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa @@ -550,17 +550,17 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= OUString(); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-")); + aVal <<= OUString("-"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0")); + aVal <<= OUString("-0"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==TYPECLASS ENUM== - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("eNuM")); + aVal <<= OUString("eNuM"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")); + aVal <<= OUString("DOUBLE"); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa int e = 1; @@ -590,19 +590,19 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) Sequence< Any > aAnySeq( 2 ), aAnySeq2( 2 ), aAnySeq3( 2 ); Any * pAnySeq = aAnySeq.getArray(); pAnySeq[0] = makeAny( aINT32Seq ); - pAnySeq[1] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("lala")) ); + pAnySeq[1] = makeAny( OUString("lala") ); aVal <<= aAnySeq; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa pAnySeq = aAnySeq2.getArray(); pAnySeq[0] <<= (sal_Int32)4711; - pAnySeq[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0815")); + pAnySeq[1] <<= OUString("0815"); aVal <<= aAnySeq2; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa pAnySeq = aAnySeq3.getArray(); - pAnySeq[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_UNION")); - pAnySeq[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_ENUM")); + pAnySeq[0] <<= OUString("TypeClass_UNION"); + pAnySeq[1] <<= OUString("TypeClass_ENUM"); aVal <<= aAnySeq3; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa @@ -615,7 +615,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) printf( "test_Conversion(): start...\n" ); Reference< XTypeConverter > xConverter( xMgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), UNO_QUERY ); + OUString("com.sun.star.script.Converter") ), UNO_QUERY ); ConvBlock * pTestBlocks = new ConvBlock[256]; sal_Int32 nPos = initBlocks( pTestBlocks ); @@ -665,18 +665,18 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) SAL_IMPLEMENT_MAIN() { - Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")) ) ); + Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString("stoctest.rdb") ) ); try { Reference< XImplementationRegistration > xImplReg( - xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY ); + xMgr->createInstance( OUString("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); OUString aLibName( RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) ); xImplReg->registerImplementation( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), + OUString("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); test_Conversion( xMgr ); diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx index 58c2bcf20a8f..4d8b08214127 100644 --- a/stoc/test/testsmgr2.cxx +++ b/stoc/test/testsmgr2.cxx @@ -45,8 +45,8 @@ SAL_IMPLEMENT_MAIN() Reference< XSimpleRegistry > r1 = createSimpleRegistry(); Reference< XSimpleRegistry > r2 = createSimpleRegistry(); - r1->open( OUString( RTL_CONSTASCII_USTRINGPARAM( "test1.rdb" ) ), sal_True, sal_False ); - r2->open( OUString( RTL_CONSTASCII_USTRINGPARAM( "test2.rdb" ) ), sal_True, sal_False ); + r1->open( OUString( "test1.rdb" ), sal_True, sal_False ); + r2->open( OUString( "test2.rdb" ), sal_True, sal_False ); Reference< XSimpleRegistry > r = createNestedRegistry( ); Reference< XInitialization > rInit( r, UNO_QUERY ); Sequence< Any > seq( 2 ); @@ -59,7 +59,7 @@ SAL_IMPLEMENT_MAIN() Reference< XContentEnumerationAccess > xCtAccess( rComp->getServiceManager(), UNO_QUERY ); Reference< XEnumeration > rEnum = - xCtAccess->createContentEnumeration( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.Bridge" ) ) ); + xCtAccess->createContentEnumeration( OUString( "com.sun.star.bridge.Bridge" ) ); sal_Int32 n = 0; while( rEnum->hasMoreElements() ) @@ -88,7 +88,7 @@ SAL_IMPLEMENT_MAIN() try { xCtAccess->createContentEnumeration( - OUString( RTL_CONSTASCII_USTRINGPARAM( "blabla" ) ) ); + OUString( "blabla" ) ); } catch (DisposedException &) { diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 1b12d9ad8dbe..2fd907dea9b8 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -85,7 +85,7 @@ namespace svgio rtl::OUString XSvgParser_getImplementationName() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "svgio::svgreader::XSvgParser" ) ); + return rtl::OUString( "svgio::svgreader::XSvgParser" ); } uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index f32a11c40a90..0ba1a76d16c4 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -215,45 +215,45 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e switch( eObjType ) { case ::svt::BBTYPE_BROWSEBOX: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox" ) ); + aRetText = OUString( "BrowseBox" ); break; case ::svt::BBTYPE_TABLE: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ); + aRetText = OUString( "Table" ); break; case ::svt::BBTYPE_ROWHEADERBAR: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderBar" ) ); + aRetText = OUString( "RowHeaderBar" ); break; case ::svt::BBTYPE_COLUMNHEADERBAR: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) ); + aRetText = OUString( "ColumnHeaderBar" ); break; case ::svt::BBTYPE_TABLECELL: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TableCell" ) ); + aRetText = OUString( "TableCell" ); #if OSL_DEBUG_LEVEL > 1 - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); + aRetText += OUString( " [" ); aRetText += OUString::valueOf(sal_Int32(GetCurRow())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ); + aRetText += OUString( "," ); aRetText += OUString::valueOf(sal_Int32(GetCurColumnId())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) ); + aRetText += OUString( "]" ); #endif break; case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) ); + aRetText = OUString( "RowHeaderCell" ); #if OSL_DEBUG_LEVEL > 1 - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); + aRetText += OUString( " [" ); aRetText += OUString::valueOf(sal_Int32(GetCurRow())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ); + aRetText += OUString( "," ); aRetText += OUString::valueOf(sal_Int32(GetCurColumnId())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) ); + aRetText += OUString( "]" ); #endif break; case ::svt::BBTYPE_COLUMNHEADERCELL: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderCell" ) ); + aRetText = OUString( "ColumnHeaderCell" ); #if OSL_DEBUG_LEVEL > 1 - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); + aRetText += OUString( " [" ); aRetText += OUString::valueOf(sal_Int32(GetCurRow())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ); + aRetText += OUString( "," ); aRetText += OUString::valueOf(sal_Int32(GetCurColumnId())); - aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) ); + aRetText += OUString( "]" ); #endif break; default: @@ -269,25 +269,25 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb switch( eObjType ) { case ::svt::BBTYPE_BROWSEBOX: - aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox description" ) ); + aRetText = OUString( "BrowseBox description" ); break; case ::svt::BBTYPE_TABLE: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) ); + // aRetText = OUString( "TABLE description" ); break; case ::svt::BBTYPE_ROWHEADERBAR: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) ); + // aRetText = OUString( "ROWHEADERBAR description" ); break; case ::svt::BBTYPE_COLUMNHEADERBAR: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) ); + // aRetText = OUString( "COLUMNHEADERBAR description" ); break; case ::svt::BBTYPE_TABLECELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) ); + // aRetText = OUString( "TABLECELL description" ); break; case ::svt::BBTYPE_ROWHEADERCELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) ); + // aRetText = OUString( "ROWHEADERCELL description" ); break; case ::svt::BBTYPE_COLUMNHEADERCELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) ); + // aRetText = OUString( "COLUMNHEADERCELL description" ); break; case ::svt::BBTYPE_CHECKBOXCELL: break; diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 98d270a1dc6f..068430cd05f3 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False; SvtTabAppearanceCfg::SvtTabAppearanceCfg() - :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View"))) + :ConfigItem(OUString("Office.Common/View")) ,nDragMode ( DEFAULT_DRAGMODE ) ,nScaleFactor ( DEFAULT_SCALEFACTOR ) ,nSnapMode ( DEFAULT_SNAPMODE ) diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 9235317f6c36..5c5e75e9a827 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -269,7 +269,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName)); } - *pIter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Entries")); + *pIter += ::rtl::OUString("/Entries"); uno::Sequence < ::rtl::OUString > aDisplayNames = GetPropertyNames(*pIter); lcl_addString(aDisplayNames,sDisplayName); @@ -296,7 +296,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) { //detect current scheme name uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/CurrentColorScheme")); + aCurrent.getArray()[0] = ::rtl::OUString("ExtendedColorScheme/CurrentColorScheme"); uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) @@ -313,7 +313,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } if ( m_sLoadedScheme.isEmpty() ) - m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")); + m_sLoadedScheme = ::rtl::OUString("default"); if ( sScheme != "default" ) { @@ -473,7 +473,7 @@ sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeN ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes")); uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase); - sBase += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + _sSchemeName; + sBase += ::rtl::OUString("/") + _sSchemeName; const ::rtl::OUString* pCompIter = aComponentNames.getConstArray(); const ::rtl::OUString* pCompEnd = pCompIter + aComponentNames.getLength(); for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter) diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index b54cac24fab3..03debe3783d3 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -50,7 +50,7 @@ struct SvtFontSubstConfig_Impl }; SvtFontSubstConfig::SvtFontSubstConfig() : - ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/Substitution"))), + ConfigItem(rtl::OUString("Office.Common/Font/Substitution")), bIsEnabled(sal_False), pImpl(new SvtFontSubstConfig_Impl) { @@ -69,13 +69,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() : Sequence<OUString> aPropNames(aNodeNames.getLength() * 4); OUString* pNames = aPropNames.getArray(); sal_Int32 nName = 0; - sPropPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + sPropPrefix += rtl::OUString("/"); sal_Int32 nNode; for(nNode = 0; nNode < aNodeNames.getLength(); nNode++) { OUString sStart(sPropPrefix); sStart += pNodeNames[nNode]; - sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + sStart += rtl::OUString("/"); pNames[nName] = sStart; pNames[nName++] += cReplaceFont; pNames[nName] = sStart; pNames[nName++] += cSubstituteFont; pNames[nName] = sStart; pNames[nName++] += cAlways; diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index f2e2cd2a1fcd..4c8ea3f38ed7 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -149,7 +149,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() // ----------------------------------------------------------------------- SvtHelpOptions_Impl::SvtHelpOptions_Impl() - : ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Help" )) ) + : ConfigItem( OUString( "Office.Common/Help" ) ) , bExtendedHelp( sal_False ) , bHelpTips( sal_True ) , bHelpAgentEnabled( sal_False ) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index b0990afabf88..942417a3937f 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -40,15 +40,15 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) +#define ROOTNODE_MENU OUString("Office.Common/View/Menu" ) #define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False #define DEFAULT_FOLLOWMOUSE sal_True #define DEFAULT_MENUICONS 2 -#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" )) -#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" )) -#define PROPERTYNAME_SHOWICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues" )) -#define PROPERTYNAME_SYSTEMICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus" )) +#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString("DontHideDisabledEntry" ) +#define PROPERTYNAME_FOLLOWMOUSE OUString("FollowMouse" ) +#define PROPERTYNAME_SHOWICONSINMENUES OUString("ShowIconsInMenues" ) +#define PROPERTYNAME_SYSTEMICONSINMENUES OUString("IsSystemIconsInMenus" ) #define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0 #define PROPERTYHANDLE_FOLLOWMOUSE 1 diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index fc602aa00a27..415c501121fa 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -40,7 +40,7 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) +#define ROOTNODE_START OUString("Office.Common/Drawinglayer" ) #define DEFAULT_OVERLAYBUFFER sal_True #define DEFAULT_PAINTBUFFER sal_True #define DEFAULT_STRIPE_COLOR_A 0 @@ -80,43 +80,43 @@ using namespace ::com::sun::star::uno ; #define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT 70 -#define PROPERTYNAME_OVERLAYBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer" )) -#define PROPERTYNAME_PAINTBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer" )) -#define PROPERTYNAME_STRIPE_COLOR_A OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA" )) -#define PROPERTYNAME_STRIPE_COLOR_B OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB" )) -#define PROPERTYNAME_STRIPE_LENGTH OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength" )) +#define PROPERTYNAME_OVERLAYBUFFER OUString("OverlayBuffer" ) +#define PROPERTYNAME_PAINTBUFFER OUString("PaintBuffer" ) +#define PROPERTYNAME_STRIPE_COLOR_A OUString("StripeColorA" ) +#define PROPERTYNAME_STRIPE_COLOR_B OUString("StripeColorB" ) +#define PROPERTYNAME_STRIPE_LENGTH OUString("StripeLength" ) // #i73602# -#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc")) -#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer")) -#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress")) +#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString("OverlayBuffer_Calc") +#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString("OverlayBuffer_Writer") +#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString("OverlayBuffer_DrawImpress") // #i74769#, #i75172# -#define PROPERTYNAME_PAINTBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc")) -#define PROPERTYNAME_PAINTBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer")) -#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress")) +#define PROPERTYNAME_PAINTBUFFER_CALC OUString("PaintBuffer_Calc") +#define PROPERTYNAME_PAINTBUFFER_WRITER OUString("PaintBuffer_Writer") +#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString("PaintBuffer_DrawImpress") // #i4219# -#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth")) -#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight")) -#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin")) -#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin")) -#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin")) -#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin")) +#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString("MaximumPaperWidth") +#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString("MaximumPaperHeight") +#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString("MaximumPaperLeftMargin") +#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString("MaximumPaperRightMargin") +#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString("MaximumPaperTopMargin") +#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString("MaximumPaperBottomMargin") // primitives -#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing")) -#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete")) -#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate")) -#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect")) -#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect")) -#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit")) -#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit")) +#define PROPERTYNAME_ANTIALIASING OUString("AntiAliasing") +#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString("SnapHorVerLinesToDiscrete") +#define PROPERTYNAME_SOLIDDRAGCREATE OUString("SolidDragCreate") +#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString("RenderDecoratedTextDirect") +#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString("RenderSimpleTextDirect") +#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString("Quadratic3DRenderLimit") +#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString("QuadraticFormControlRenderLimit") // #i97672# selection settings -#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection")) -#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent")) -#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent")) +#define PROPERTYNAME_TRANSPARENTSELECTION OUString("TransparentSelection") +#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString("TransparentSelectionPercent") +#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString("SelectionMaximumLuminancePercent") #define PROPERTYHANDLE_OVERLAYBUFFER 0 #define PROPERTYHANDLE_PAINTBUFFER 1 diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 87e8e353b312..f36fc74cba50 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -41,20 +41,20 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; #define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray)) -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option")) -#define ROOTNODE_PRINTOPTION OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")) - -#define PROPERTYNAME_REDUCETRANSPARENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency")) -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode")) -#define PROPERTYNAME_REDUCEGRADIENTS OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients")) -#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode")) -#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount")) -#define PROPERTYNAME_REDUCEBITMAPS OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps")) -#define PROPERTYNAME_REDUCEDBITMAPMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode")) -#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution")) -#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency")) -#define PROPERTYNAME_CONVERTTOGREYSCALES OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales")) -#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString(RTL_CONSTASCII_USTRINGPARAM("PDFAsStandardPrintJobFormat")) +#define ROOTNODE_START OUString("Office.Common/Print/Option") +#define ROOTNODE_PRINTOPTION OUString("org.openoffice.Office.Common/Print/Option") + +#define PROPERTYNAME_REDUCETRANSPARENCY OUString("ReduceTransparency") +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString("ReducedTransparencyMode") +#define PROPERTYNAME_REDUCEGRADIENTS OUString("ReduceGradients") +#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString("ReducedGradientMode") +#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString("ReducedGradientStepCount") +#define PROPERTYNAME_REDUCEBITMAPS OUString("ReduceBitmaps") +#define PROPERTYNAME_REDUCEDBITMAPMODE OUString("ReducedBitmapMode") +#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION OUString("ReducedBitmapResolution") +#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY OUString("ReducedBitmapIncludesTransparency") +#define PROPERTYNAME_CONVERTTOGREYSCALES OUString("ConvertToGreyscales") +#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString("PDFAsStandardPrintJobFormat") using namespace ::utl; using namespace ::rtl; @@ -724,7 +724,7 @@ SvtPrinterOptions::SvtPrinterOptions() if( m_pStaticDataContainer == NULL ) { OUString aRootPath( ROOTNODE_START ); - m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/Printer" ) ) ); + m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/Printer" ) ); pPrinterOptionsDataContainer = m_pStaticDataContainer; svtools::ItemHolder2::holdConfigItem(E_PRINTOPTIONS); } @@ -758,7 +758,7 @@ SvtPrintFileOptions::SvtPrintFileOptions() if( m_pStaticDataContainer == NULL ) { OUString aRootPath( ROOTNODE_START ); - m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/File" ) ) ); + m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/File" ) ); pPrintFileOptionsDataContainer = m_pStaticDataContainer; svtools::ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS); diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 766221a5badc..16fd91535a54 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -159,18 +159,18 @@ namespace svt Reference< XResultSet > xResultSet; Sequence< OUString > aProps(12); - aProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )); - aProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" )); - aProps[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )); - aProps[3] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" )); - aProps[4] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" )); - aProps[5] = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); - aProps[6] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" )); - aProps[7] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVolume" )); - aProps[8] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemote" )); - aProps[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" )); - aProps[10] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFloppy" )); - aProps[11] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCompactDisc" )); + aProps[0] = OUString( "Title" ); + aProps[1] = OUString( "Size" ); + aProps[2] = OUString( "DateModified" ); + aProps[3] = OUString( "DateCreated" ); + aProps[4] = OUString( "IsFolder" ); + aProps[5] = OUString( "TargetURL" ); + aProps[6] = OUString( "IsHidden" ); + aProps[7] = OUString( "IsVolume" ); + aProps[8] = OUString( "IsRemote" ); + aProps[9] = OUString( "IsRemoveable" ); + aProps[10] = OUString( "IsFloppy" ); + aProps[11] = OUString( "IsCompactDisc" ); Reference< XCommandEnvironment > xEnvironment; try @@ -266,8 +266,8 @@ namespace svt ::ucbhelper::Content aCnt( aTargetURL, xEnvironment, comphelper::getProcessComponentContext() ); try { - aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= pData->maSize; - aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDT; + aCnt.getPropertyValue( OUString( "Size" ) ) >>= pData->maSize; + aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDT; } catch (...) {} } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 5b021fb8341b..25b1269270fa 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -823,7 +823,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) if ( aCommands.is() ) bEnableDelete = aCommands->hasCommandByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) ); + OUString( "delete" ) ); else bEnableDelete = false; } @@ -842,7 +842,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) { Property aProp = aProps->getPropertyByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) ); + OUString( "Title" ) ); bEnableRename = !( aProp.Attributes & PropertyAttribute::READONLY ); } @@ -926,7 +926,7 @@ void ViewTabListBox_Impl::DeleteEntries() if ( aCommands.is() ) canDelete = aCommands->hasCommandByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) ); + OUString( "delete" ) ); else canDelete = false; } @@ -1118,7 +1118,7 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent ) try { ::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString( "delete" ), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException const & ) { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index d52382c87077..c433ef97a78a 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -1089,7 +1089,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin case ::svt::BBTYPE_ROWHEADERBAR: case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "error" ) ); + aRetText = ::rtl::OUString( "error" ); break; default: diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index f8547c2c12b8..e499cfd93e1e 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -665,7 +665,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL ) uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); uno::Sequence < beans::PropertyValue> aProps(1); - aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); + aProps[0].Name = ::rtl::OUString( "InteractionHandler" ); aProps[0].Value <<= xInteractionHandler; m_xDocProps->loadFromMedium( rURL, aProps ); pEditWin->fill( m_xDocProps, rURL ); @@ -747,7 +747,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); - aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); + aArgs[3].Name = ::rtl::OUString( "InteractionHandler" ); aArgs[3].Value <<= xInteractionHandler; b = sal_False; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index ceed216572fd..983e4ca311f0 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -374,8 +374,8 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(2); OUString* pProps = aProps.getArray(); - pProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); - pProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ); + pProps[0] = OUString( "Title" ); + pProps[1] = OUString( "IsFolder" ); try { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 7d7e2b440e0e..93e57f345946 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -762,7 +762,7 @@ namespace svt if ( mpID ) { - ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." )); + ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( "." ); mpID->SetText( aIDText ); } @@ -838,7 +838,7 @@ namespace svt { // calculate widths long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100." )) ); + long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( "100." ) ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 3d0642b680bc..56537b97cee4 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -226,7 +226,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException) OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException) { ThrowIfDisposed(); - return OUString( RTL_CONSTASCII_USTRINGPARAM( "ToolbarMenu" ) ); + return OUString( "ToolbarMenu" ); } // ----------------------------------------------------------------------------- @@ -599,7 +599,7 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { - throw DisposedException ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), static_cast<XWeak*>(this)); + throw DisposedException ( ::rtl::OUString("object has been already disposed"), static_cast<XWeak*>(this)); } } diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index bb9623dc733e..0df398ece368 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -747,7 +747,7 @@ void ValueSetAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + ::rtl::OUString("object has been already disposed"), static_cast<uno::XWeak*>(this)); } else diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index a9e3e4dd9060..51b93e538db8 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -391,7 +391,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) // Get the Content ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() ); Sequence< rtl::OUString > aProps( 1 ); - aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); + aProps[0] = rtl::OUString( "Title" ); try { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3df3fbff76d0..639ddfe8dca9 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -321,9 +321,9 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- AssignmentPersistentData::AssignmentPersistentData() - :ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.DataAccess/AddressBook" ))) + :ConfigItem( ::rtl::OUString( "Office.DataAccess/AddressBook" )) { - Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fields"))); + Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString("Fields")); const ::rtl::OUString* pStoredNames = aStoredNames.getConstArray(); for (sal_Int32 i=0; i<aStoredNames.getLength(); ++i, ++pStoredNames) m_aStoredFields.insert(*pStoredNames); @@ -348,7 +348,7 @@ void AssignmentPersistentData::Commit() { ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/")); sFieldPath += _rLogicalName; - sFieldPath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName")); + sFieldPath += ::rtl::OUString("/AssignedFieldName"); sAssignment = getStringProperty(sFieldPath); } return sAssignment; @@ -421,17 +421,17 @@ void AssignmentPersistentData::Commit() // Fields/<field> ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath); - sFieldElementNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + sFieldElementNodePath += ::rtl::OUString("/"); sFieldElementNodePath += _rLogicalName; Sequence< PropertyValue > aNewFieldDescription(2); // Fields/<field>/ProgrammaticFieldName aNewFieldDescription[0].Name = sFieldElementNodePath; - aNewFieldDescription[0].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/ProgrammaticFieldName")); + aNewFieldDescription[0].Name += ::rtl::OUString("/ProgrammaticFieldName"); aNewFieldDescription[0].Value <<= _rLogicalName; // Fields/<field>/AssignedFieldName aNewFieldDescription[1].Name = sFieldElementNodePath; - aNewFieldDescription[1].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName")); + aNewFieldDescription[1].Name += ::rtl::OUString("/AssignedFieldName"); aNewFieldDescription[1].Value <<= _rAssignment; // just set the new value @@ -1236,7 +1236,7 @@ void AssignmentPersistentData::Commit() if ( xProp.is() ) { ::rtl::OUString sName; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName; + xProp->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sName; INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 0b7cfbcd78a0..92c64ff6f177 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -87,7 +87,7 @@ short SvColorDialog::Execute() Sequence< PropertyValue > props( 2 ); props[0].Name = sColor; props[0].Value <<= (sal_Int32) maColor.GetColor(); - props[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) ); + props[1].Name = OUString( "Mode" ); props[1].Value <<= (sal_Int16) meMode; xPropertyAccess->setPropertyValues( props ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index af30375a2bee..29078cc949dd 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -108,8 +108,8 @@ void SvObjectServerList::FillInsertObjects() ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); - aPathProp.Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/ObjectNames" )); + aPathProp.Name = ::rtl::OUString( "nodepath" ); + aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); aArguments[0] <<= aPathProp; uno::Reference< container::XNameAccess > xNameAccess( @@ -135,8 +135,8 @@ void SvObjectServerList::FillInsertObjects() { ::rtl::OUString aUIName; ::rtl::OUString aClassID; - xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectUIName" )) ) >>= aUIName; - xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" )) ) >>= aClassID; + xEntry->getByName( ::rtl::OUString( "ObjectUIName" ) ) >>= aUIName; + xEntry->getByName( ::rtl::OUString( "ClassID" ) ) >>= aClassID; if ( !aUIName.isEmpty() ) { diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 19597874dc79..e17dfb8bdf1d 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -53,7 +53,7 @@ uno::Reference< uno::XInterface > OUString SvFilterOptionsDialog_getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.SvFilterOptionsDialog" ) ); + return OUString( "com.sun.star.comp.svtools.SvFilterOptionsDialog" ); } #define SERVICE_NAME "com.sun.star.ui.dialog.FilterOptionsDialog" sal_Bool SAL_CALL SvFilterOptionsDialog_supportsService( const OUString& ServiceName ) @@ -238,9 +238,9 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp ( xDoc, uno::UNO_QUERY ); if ( xServiceInfo.is() ) { - if ( xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) ) + if ( xServiceInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) aConfigPath = String( RTL_CONSTASCII_USTRINGPARAM( "Office.Impress/Layout/Other/MeasureUnit" ) ); - else if ( xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) ) + else if ( xServiceInfo->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) ) ) aConfigPath = String( RTL_CONSTASCII_USTRINGPARAM( "Office.Draw/Layout/Other/MeasureUnit" ) ); if ( aConfigPath.Len() ) { diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index f0e5e7f603ab..ee322a14152a 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -119,7 +119,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() ::rtl::OUString Graphic::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.Graphic" ) ); + return ::rtl::OUString( "com.sun.star.comp.graphic.Graphic" ); } // ------------------------------------------------------------------------------ @@ -129,7 +129,7 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.Graphic" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.Graphic" ); return aSeq; } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 7148fa3568a4..07817c818b8d 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -70,7 +70,7 @@ GraphicProvider::~GraphicProvider() ::rtl::OUString GraphicProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicProvider" ) ); + return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicProvider" ); } // ------------------------------------------------------------------------------ @@ -80,7 +80,7 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" ); return aSeq; } diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 8091ee53820b..2f90fa39a885 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -67,7 +67,7 @@ GraphicRendererVCL::~GraphicRendererVCL() ::rtl::OUString GraphicRendererVCL::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicRendererVCL" ) ); + return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); } // ------------------------------------------------------------------------------ @@ -77,7 +77,7 @@ uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_St { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRendererVCL" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicRendererVCL" ); return aSeq; } diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 0cf4d7d120fd..da76739afc95 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -87,7 +87,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq xWindow->setVisible( sal_False ); // reparent the window - xWinPeer->setProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginParent" ) ), + xWinPeer->setProperty( ::rtl::OUString( "PluginParent" ), uno::makeAny( (sal_Int64) 0 ) ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -206,13 +206,13 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg sal_Int32 nLen = aArguments.getLength(); if ( nLen != 1 ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Wrong count of parameters!" ) ), + ::rtl::OUString("Wrong count of parameters!" ), uno::Reference< uno::XInterface >(), 0 ); if ( !( aArguments[0] >>= m_xFrame ) || !m_xFrame.is() ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonempty reference is expected as the first argument!" ) ), + ::rtl::OUString("Nonempty reference is expected as the first argument!" ), uno::Reference< uno::XInterface >(), 0 ); @@ -259,7 +259,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupport // -------------------------------------------------------- ::rtl::OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.DocumentCloser" ) ); + return rtl::OUString( "com.sun.star.comp.embed.DocumentCloser" ); } // -------------------------------------------------------- diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 02848c2284c1..033710bc439a 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -31,15 +31,15 @@ using namespace ::com::sun::star; uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.HatchWindowFactory" )); - aRet[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" )); + aRet[0] = ::rtl::OUString( "com.sun.star.embed.HatchWindowFactory" ); + aRet[1] = ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" )); + return ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); } //------------------------------------------------------------------------- diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 6bd32c9e3e89..b167234f937d 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -296,65 +296,65 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) switch( aKey.KeyCode ) { case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) ); + return rtl::OUString( ".uno:DelToStartOfLine" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) ); + return rtl::OUString( ".uno:DelToEndOfLine" ); case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) ); + return rtl::OUString( ".uno:DelToStartOfPara" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) ); + return rtl::OUString( ".uno:DelToEndOfPara" ); case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) ); + return rtl::OUString( ".uno:DelToStartOfWord" ); case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) ); + return rtl::OUString( ".uno:DelToEndOfWord" ); case com::sun::star::awt::Key::INSERT_LINEBREAK: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) ); + return rtl::OUString( ".uno:InsertLinebreak" ); case com::sun::star::awt::Key::INSERT_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) ); + return rtl::OUString( ".uno:InsertPara" ); case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) ); + return rtl::OUString( ".uno:GoToPrevWord" ); case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) ); + return rtl::OUString( ".uno:GoToNextWord" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) ); + return rtl::OUString( ".uno:GoToStartOfLine" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) ); + return rtl::OUString( ".uno:GoToEndOfLine" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) ); + return rtl::OUString( ".uno:GoToStartOfPara" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) ); + return rtl::OUString( ".uno:GoToEndOfPara" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) ); + return rtl::OUString( ".uno:GoToStartOfDoc" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) ); + return rtl::OUString( ".uno:GoToEndOfDoc" ); case com::sun::star::awt::Key::SELECT_BACKWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) ); + return rtl::OUString( ".uno:CharLeftSel" ); case com::sun::star::awt::Key::SELECT_FORWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) ); + return rtl::OUString( ".uno:CharRightSel" ); case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) ); + return rtl::OUString( ".uno:WordLeftSel" ); case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) ); + return rtl::OUString( ".uno:WordRightSel" ); case com::sun::star::awt::Key::SELECT_WORD: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) ); + return rtl::OUString( ".uno:SelectWord" ); case com::sun::star::awt::Key::SELECT_LINE: return rtl::OUString(); case com::sun::star::awt::Key::SELECT_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) ); + return rtl::OUString( ".uno:SelectText" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) ); + return rtl::OUString( ".uno:StartOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) ); + return rtl::OUString( ".uno:EndOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) ); + return rtl::OUString( ".uno:StartOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) ); + return rtl::OUString( ".uno:EndOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) ); + return rtl::OUString( ".uno:StartOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) ); + return rtl::OUString( ".uno:EndOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_ALL: - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) ); + return rtl::OUString( ".uno:SelectAll" ); default: break; } diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 7a15af515753..b21d576ab632 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -148,7 +148,7 @@ namespace svt // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMediaProperties[0].Name = ::rtl::OUString( "URL" ); aMediaProperties[0].Value <<= _rImageResourceURL; Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) ); OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" ); @@ -163,10 +163,10 @@ namespace svt ); aMediaProperties.realloc( 2 ); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) ); + aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); aMediaProperties[0].Value <<= xBufferAccess; - aMediaProperties[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) ); - aMediaProperties[1].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) ); + aMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); + aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" ); xProvider->storeGraphic( xGraphic, aMediaProperties ); pMemBuffer->Seek( 0 ); diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 42be4cad5173..c6d7a719338f 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -425,7 +425,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) break; } case USCRIPT_LATIN: - sSampleText = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lorem ipsum")); + sSampleText = rtl::OUString("Lorem ipsum"); break; default: break; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 538c2246111a..2039c3d41c5b 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -602,10 +602,10 @@ namespace svt // create a content for the current folder root Reference< XResultSet > xResultSet; Sequence< ::rtl::OUString > aContentProperties( 4); - aContentProperties[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )); - aContentProperties[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )); - aContentProperties[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" )); - aContentProperties[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" )); + aContentProperties[0] = ::rtl::OUString( "Title" ); + aContentProperties[1] = ::rtl::OUString( "DateModified" ); + aContentProperties[2] = ::rtl::OUString( "DateCreated" ); + aContentProperties[3] = ::rtl::OUString( "IsFolder" ); // get the set of sub contents in the folder try diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index e702089e8d08..8b8990903f05 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1393,33 +1393,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT; rDataFlavorExVector.push_back( aFlavorEx ); } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) { // add, if it is a UTF-8 byte buffer if( xMimeType->hasParameter( aCharsetStr ) ) { - if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) || - xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) ) + if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) || + xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING; } } } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/rtf" )) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-objectdescriptor-xml" )) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR; } @@ -2276,19 +2276,19 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: { if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) ) { - if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) ) + if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) { // special handling for text/plain media types const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" )); if( !xRequestType2->hasParameter( aCharsetString ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) ) + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) || + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ) { bRet = sal_True; } } - else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice" )) ) ) + else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) ) { // special handling for application/x-openoffice media types const ::rtl::OUString aFormatString(RTL_CONSTASCII_USTRINGPARAM( "windows_formatname" )); diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 5b46420c8826..6a1fc18447fe 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -295,16 +295,16 @@ namespace svt { namespace table switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid control" ) ); + aRetText = ::rtl::OUString( "Grid control" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid conrol" ) ); + aRetText = ::rtl::OUString( "Grid conrol" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderBar" ) ); + aRetText = ::rtl::OUString( "RowHeaderBar" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) ); + aRetText = ::rtl::OUString( "ColumnHeaderBar" ); break; case TCTYPE_TABLECELL: //the name of the cell constists of column name and row name if defined @@ -340,16 +340,16 @@ namespace svt { namespace table switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Grid control description" ) ); + aRetText = ::rtl::OUString( "Grid control description" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) ); + aRetText = ::rtl::OUString( "TABLE description" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) ); + aRetText = ::rtl::OUString( "ROWHEADERBAR description" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) ); + aRetText = ::rtl::OUString( "COLUMNHEADERBAR description" ); break; case TCTYPE_TABLECELL: // the description of the cell consists of column name and row name if defined @@ -365,10 +365,10 @@ namespace svt { namespace table } break; case TCTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) ); + aRetText = ::rtl::OUString( "ROWHEADERCELL description" ); break; case TCTYPE_COLUMNHEADERCELL: - aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) ); + aRetText = ::rtl::OUString( "COLUMNHEADERCELL description" ); break; } return aRetText; @@ -378,7 +378,7 @@ namespace svt { namespace table ::rtl::OUString TableControl::GetRowDescription( sal_Int32 _nRow) const { (void)_nRow; - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "row description" ) ); + return rtl::OUString( "row description" ); } //------------------------------------------------------------------------------------------------------------------ @@ -393,7 +393,7 @@ namespace svt { namespace table ::rtl::OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const { (void)_nColumn; - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "col description" ) ); + return rtl::OUString( "col description" ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index f40f964732e1..5de9580fd3fa 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -96,7 +96,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory ( { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" )); + OUString( "com.sun.star.ui.AddressBookSourceDialog" ); xFactory = ::cppu::createSingleFactory ( reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ), @@ -109,7 +109,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory ( { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilterOptionsDialog" )); + OUString( "com.sun.star.ui.dialogs.FilterOptionsDialog" ); xFactory = ::cppu::createSingleFactory ( reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ), diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 6707dfcb0d68..86bdf797e6cb 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -404,7 +404,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An { Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY ); if ( !xDataModel.is() ) - throw GridInvalidDataException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid data model." ) ), *this ); + throw GridInvalidDataException( ::rtl::OUString( "Invalid data model." ), *this ); m_pTableModel->setDataModel( xDataModel ); impl_checkTableModelInit(); @@ -416,7 +416,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An // obtain new col model Reference< XGridColumnModel > const xColumnModel( aValue, UNO_QUERY ); if ( !xColumnModel.is() ) - throw GridInvalidModelException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid column model." ) ), *this ); + throw GridInvalidModelException( ::rtl::OUString( "Invalid column model." ), *this ); // remove all old columns m_pTableModel->removeAllColumns(); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 14e3bc4960cf..becdcd04bbbf 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -148,7 +148,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const { try { - xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))),UNO_QUERY); + xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )),UNO_QUERY); } catch ( Exception& ) { @@ -380,7 +380,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence<PropertyValue> aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = rtl::OUString( "KeyModifier" ); aArgs[0].Value = makeAny( KeyModifier ); aTargetURL.Complete = aCommandURL; diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 809cf61c83ba..692b23a9a9c2 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1467,7 +1467,7 @@ bool TreeControlPeer::loadImage( const ::rtl::OUString& rURL, Image& rImage ) if( mxGraphicProvider.is() ) try { ::com::sun::star::beans::PropertyValues aProps( 1 ); - aProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aProps[0].Name = OUString( "URL" ); aProps[0].Value <<= rURL; Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic( aProps ) ); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 49edf88dd409..43612825ac3f 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1449,7 +1449,7 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE xRoadmapItem = evt.Source; sal_Int32 nID = 0; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ))); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); aValue >>= nID; ::com::sun::star::uno::Any rVal = evt.NewValue; @@ -1498,11 +1498,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); if ( xPropertySet.is() ) { - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ))); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Label" )); aValue >>= aCurRMItemData.Label; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ))); + aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); aValue >>= aCurRMItemData.n_ID; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ))); + aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Enabled" )); aValue >>= aCurRMItemData.b_Enabled; } return aCurRMItemData; diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 26ba6f636c03..8fa36eb35faf 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -401,18 +401,18 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam throw(RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" )); + aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.image.ImageMapObject" ); switch( mnType ) { case IMAP_OBJ_POLYGON: default: - aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" )); + aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapPolygonObject" ); break; case IMAP_OBJ_RECTANGLE: - aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject" )); + aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapRectangleObject" ); break; case IMAP_OBJ_CIRCLE: - aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject" )); + aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapCircleObject" ); break; } return aSNS; @@ -424,11 +424,11 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam { case IMAP_OBJ_POLYGON: default: - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") ); + return ::rtl::OUString("org.openoffice.comp.svt.ImageMapPolygonObject"); case IMAP_OBJ_CIRCLE: - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") ); + return ::rtl::OUString("org.openoffice.comp.svt.ImageMapCircleObject"); case IMAP_OBJ_RECTANGLE: - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") ); + return ::rtl::OUString("org.openoffice.comp.svt.ImageMapRectangleObject"); } } @@ -721,7 +721,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException) ::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svt.SvUnoImageMap" ) ); + return ::rtl::OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); } sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName ) diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 5d9ffac6ebc2..bb8a2bfcbd61 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -158,7 +158,7 @@ namespace svt { namespace uno { if ( i_rPaths[i][0] != nFirstPageId ) throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "All paths must start with the same page id." ) ), + ::rtl::OUString( "All paths must start with the same page id." ), i_rContext, 2 ); } } @@ -240,14 +240,14 @@ namespace svt { namespace uno //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) ); + return ::rtl::OUString( "com.sun.star.comp.svtools.uno.Wizard" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) { Sequence< ::rtl::OUString > aServices(1); - aServices[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Wizard" ) ); + aServices[0] = ::rtl::OUString( "com.sun.star.ui.dialogs.Wizard" ); return aServices; } diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index dcc40f9c2215..81a809263ab0 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -119,7 +119,7 @@ namespace svx try { Reference< XTablesSupplier > xSupTab; - _rxForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupTab; + _rxForm->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupTab; if(xSupTab.is()) { diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 8706b5006d01..1f0b1df05096 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -82,7 +82,7 @@ namespace svx Reference<XPropertySet> xProp; m_aDescriptor[daComponent] >>= xProp; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsForm"))) >>= bForm; + xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bForm; } catch(Exception) {} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index dda5a52e74c5..9ea4b1698494 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -337,7 +337,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) // not interested in any results Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY); - xStatProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); + xStatProps->setPropertyValue(rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); xResultSet = xStatement->executeQuery(); Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY); diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index a9b315d49429..a8bd7f674f30 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -163,7 +163,7 @@ namespace svx ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_aContext.getUNOContext(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) + ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) ); ::rtl::OUString sDatabaseFilter; OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter ); @@ -195,7 +195,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.odb" ) ); + m_aFilterExtensions[0] = ::rtl::OUString( "*.odb" ); } } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 816fae4235df..1f104056df5f 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -82,36 +82,36 @@ namespace svxform //............................................................................ // properties of instance - #define PN_INSTANCE_MODEL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Instance" ) ) - #define PN_INSTANCE_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ) - #define PN_INSTANCE_URL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) + #define PN_INSTANCE_MODEL ::rtl::OUString( "Instance" ) + #define PN_INSTANCE_ID ::rtl::OUString( "ID" ) + #define PN_INSTANCE_URL ::rtl::OUString( "URL" ) // properties of binding - #define PN_BINDING_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BindingID" ) ) - #define PN_BINDING_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BindingExpression" ) ) - #define PN_BINDING_MODEL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ) - #define PN_BINDING_NAMESPACES ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModelNamespaces" ) ) - #define PN_READONLY_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadonlyExpression" ) ) - #define PN_RELEVANT_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelevantExpression" ) ) - #define PN_REQUIRED_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RequiredExpression" ) ) - #define PN_CONSTRAINT_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConstraintExpression" ) ) - #define PN_CALCULATE_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CalculateExpression" ) ) - #define PN_BINDING_TYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) + #define PN_BINDING_ID ::rtl::OUString( "BindingID" ) + #define PN_BINDING_EXPR ::rtl::OUString( "BindingExpression" ) + #define PN_BINDING_MODEL ::rtl::OUString( "Model" ) + #define PN_BINDING_NAMESPACES ::rtl::OUString( "ModelNamespaces" ) + #define PN_READONLY_EXPR ::rtl::OUString( "ReadonlyExpression" ) + #define PN_RELEVANT_EXPR ::rtl::OUString( "RelevantExpression" ) + #define PN_REQUIRED_EXPR ::rtl::OUString( "RequiredExpression" ) + #define PN_CONSTRAINT_EXPR ::rtl::OUString( "ConstraintExpression" ) + #define PN_CALCULATE_EXPR ::rtl::OUString( "CalculateExpression" ) + #define PN_BINDING_TYPE ::rtl::OUString( "Type" ) // properties of submission - #define PN_SUBMISSION_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ) - #define PN_SUBMISSION_BIND ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bind" ) ) - #define PN_SUBMISSION_REF ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Ref" ) ) - #define PN_SUBMISSION_ACTION ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) ) - #define PN_SUBMISSION_METHOD ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Method" ) ) - #define PN_SUBMISSION_REPLACE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Replace" ) ) + #define PN_SUBMISSION_ID ::rtl::OUString( "ID" ) + #define PN_SUBMISSION_BIND ::rtl::OUString( "Bind" ) + #define PN_SUBMISSION_REF ::rtl::OUString( "Ref" ) + #define PN_SUBMISSION_ACTION ::rtl::OUString( "Action" ) + #define PN_SUBMISSION_METHOD ::rtl::OUString( "Method" ) + #define PN_SUBMISSION_REPLACE ::rtl::OUString( "Replace" ) // other const strings #define TRUE_VALUE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true()" ) ) - #define NEW_ELEMENT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "newElement" ) ) - #define NEW_ATTRIBUTE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "newAttribute" ) ) - #define EVENTTYPE_CHARDATA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DOMCharacterDataModified" ) ) - #define EVENTTYPE_ATTR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DOMAttrModified" ) ) + #define NEW_ELEMENT ::rtl::OUString( "newElement" ) + #define NEW_ATTRIBUTE ::rtl::OUString( "newAttribute" ) + #define EVENTTYPE_CHARDATA ::rtl::OUString( "DOMCharacterDataModified" ) + #define EVENTTYPE_ATTR ::rtl::OUString( "DOMAttrModified" ) #define MIN_PAGE_COUNT 3 // at least one instance, one submission and one binding page @@ -1683,7 +1683,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ), + ::rtl::OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); @@ -1713,7 +1713,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); sal_Bool bExternalData = sal_False; OSL_VERIFY( xModelProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ) ) >>= bExternalData ); + ::rtl::OUString( "ExternalData" ) ) >>= bExternalData ); bDocumentData = ( bExternalData == sal_False ); } catch( const Exception& ) @@ -1733,7 +1733,7 @@ namespace svxform Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW ); Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ), + ::rtl::OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); bIsDocModified = true; } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 77ad8ff33801..847e96f2a7b1 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -211,7 +211,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame") ), UNO_QUERY); if (m_xMeAsFrame.is()) { // create an intermediate window, which is to be the container window of the frame @@ -224,7 +224,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); m_xMeAsFrame->initialize( m_xFrameContainerWindow ); - m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form property browser")) ); + m_xMeAsFrame->setName(::rtl::OUString("form property browser") ); if ( _pBindings->GetDispatcher() ) { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > @@ -285,10 +285,10 @@ FmPropBrw::~FmPropBrw() Reference<XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ) }; + const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) + , ::rtl::OUString( "DialogParentWindow" ) + , ::rtl::OUString( "ControlContext" ) + , ::rtl::OUString( "ControlShapeAccess" ) }; for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i ) xName->removeByName( pProps[i] ); } @@ -567,10 +567,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlContext" ), makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 85c9f3f06d4c..754e34e6b465 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -98,24 +98,24 @@ namespace svxform Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY ); if ( xDocumentSI.is() ) { - if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ) ) - || xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) + if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.TextDocument" ) ) + || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.WebDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphStyles" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); + _rFamilyName = ::rtl::OUString( "ParagraphStyles" ); + _rStyleName = ::rtl::OUString( "Standard" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) ) + else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Default" ) ); + _rFamilyName = ::rtl::OUString( "CellStyles" ); + _rStyleName = ::rtl::OUString( "Default" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) - || xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) + else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ) ) + || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "standard" ) ); + _rFamilyName = ::rtl::OUString( "graphics" ); + _rStyleName = ::rtl::OUString( "standard" ); } else bSuccess = false; @@ -164,7 +164,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) ); + sCharLocalePropertyName = ::rtl::OUString( "CharLocale" ); if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -180,7 +180,7 @@ namespace svxform Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" ) ), + ::rtl::OUString( "FontDescriptor" ), makeAny( aFontDesc ) ); } @@ -204,7 +204,7 @@ namespace svxform // the names of the family, and the style - depends on the document type we live in ::rtl::OUString sFamilyName, sStyleName; if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown document type!" ) ), NULL ); + throw RuntimeException( ::rtl::OUString( "unknown document type!" ), NULL ); // the concrete style Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); @@ -232,7 +232,7 @@ namespace svxform // let's see what the configuration says about the visual effect OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualEffect" ) ) ); + Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( "VisualEffect" ) ); if ( aVisualEffect.hasValue() ) { ::rtl::OUString sVisualEffect; @@ -283,7 +283,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - ::rtl::OUString sConfigName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Forms/ControlLayout/" ) ); + ::rtl::OUString sConfigName = ::rtl::OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO @@ -294,7 +294,7 @@ namespace svxform bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType ) { OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DynamicBorderColors" ) ) ); + Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( "DynamicBorderColors" ) ); bool bDynamicBorderColor = false; OSL_VERIFY( aDynamicBorderColor >>= bDynamicBorderColor ); return bDynamicBorderColor; @@ -306,7 +306,7 @@ namespace svxform if ( _eDocType == eUnknownDocumentType ) return false; OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseDocumentTextMetrics" ) ) ); + Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( "UseDocumentTextMetrics" ) ); bool bUseRefDevice = false; OSL_VERIFY( aUseRefDevice >>= bUseRefDevice ); return bUseRefDevice; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 609cb0c2b2d4..9e6c13d23165 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -359,7 +359,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) Reference< XInterface > xSourceContainer = xSourceAsChild->getParent(); m_xEnvironmentHistory = Reference< XIndexContainer >( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms")) ), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.form.Forms") ), UNO_QUERY); DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !"); @@ -564,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > { // create and insert (into the destination) a copy of the form xCurrentDestForm.set( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DataForm" )) ), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString( "com.sun.star.form.component.DataForm" ) ), UNO_QUERY_THROW ); ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm ); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 760de57f48d4..2169173729b1 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -200,7 +200,7 @@ namespace svxform Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW ); ::rtl::OUString sMethodDescription( _rListenerType ); - sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" )); + sMethodDescription += ::rtl::OUString( "::" ); sMethodDescription += _rMethodName; Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW ); @@ -413,7 +413,7 @@ namespace svxform { Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW ); Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW ); - aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ); + aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); } catch( Exception& ) {} } @@ -471,9 +471,9 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application" ) ); + sMacroLocation = ::rtl::OUString( "application" ); else - sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "document" ) ); + sMacroLocation = ::rtl::OUString( "document" ); } ::rtl::OUStringBuffer aScriptURI; diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index e230a3fa4797..dac2e255754e 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -80,7 +80,7 @@ namespace svxform // ------------------------------------------------------------------------ // FormController REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) ); - REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ) ); + REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( "com.sun.star.form.FormController" ) ); // ------------------------------------------------------------------------ // FormController diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a4f75b5fe6d9..ca72d6757eaf 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -773,7 +773,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Position" )), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, ::rtl::OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 2e5edd8354dc..bdd0d75528d9 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -201,8 +201,8 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB { switch ((TriState)m_xBox->getState()) { - case STATE_NOCHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); - case STATE_CHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + case STATE_NOCHECK: return rtl::OUString("0"); + case STATE_CHECK: return rtl::OUString("1"); default: break; } return rtl::OUString(); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 32195c121280..be8046f2498a 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -456,7 +456,7 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ); + sSlotUnoName = ::rtl::OUString( ".uno:" ); sSlotUnoName += ::rtl::OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 @@ -534,7 +534,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RichText" ) ); + ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( "RichText" ); if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -597,7 +597,7 @@ namespace svx if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<unknown>" ) ); + sUnoSlotName = ::rtl::OUString( "<unknown>" ); ::rtl::OString sUnoSlotNameAscii( "\"" ); sUnoSlotNameAscii += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; @@ -732,7 +732,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enable" ) ); + aArgs[ 0 ].Name = ::rtl::OUString( "Enable" ); aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 3e9afde78fd9..82e2343d8424 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -121,7 +121,7 @@ private: // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell(); ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" ); - xListenerProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ), makeAny( xObjectShell->GetModel() ) ); + xListenerProps->setPropertyValue( ::rtl::OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); m_vbaListener = xScriptListener; } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index cc60833cfbc1..ac4be38cbc38 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -216,7 +216,7 @@ namespace svxform if ( !sDataSourceName.isEmpty() ) xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getUNOContext() ) ); if ( xDsProperties.is() ) - xDsProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Info" ) ) ) >>= aInfo; + xDsProperties->getPropertyValue( ::rtl::OUString( "Info" ) ) >>= aInfo; } catch( const Exception& ) { @@ -405,7 +405,7 @@ namespace svxform switch ( nClassId ) { case FormComponentType::SCROLLBAR: - _rxControlModel->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LiveScroll" ) ), makeAny( (sal_Bool)sal_True ) ); + _rxControlModel->setPropertyValue( ::rtl::OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); // NO break! case FormComponentType::SPINBUTTON: { diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 7e98d01b3913..4f0c7c1b5303 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -41,7 +41,7 @@ namespace svxform // the layout manager Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY ); if ( xFrameProps.is() ) - xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ) >>= m_xLayouter; + xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ) >>= m_xLayouter; } //-------------------------------------------------------------------- diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index b3f0641e9ef8..82347c4a55ae 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -182,7 +182,7 @@ namespace svxform //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svx.LegacyFormController" ) ); + return ::rtl::OUString( "org.openoffice.comp.svx.LegacyFormController" ); } //-------------------------------------------------------------------- @@ -200,8 +200,8 @@ namespace svxform Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ); - aServices.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController") ); + aServices.getArray()[0] = ::rtl::OUString( "com.sun.star.form.FormController" ); + aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); return aServices; } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 8ac388c91cf2..a61c849981b9 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,10 +85,10 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Position" )); + aArgs[0].Name = rtl::OUString( "Position" ); aPositionParam.QueryValue( a ); aArgs[0].Value = a; - m_pController->Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AbsoluteRecord" )), + m_pController->Dispatch( rtl::OUString( ".uno:AbsoluteRecord" ), aArgs ); m_pController->updateStatus(); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 77e1eaa2d31a..3a85aacdb586 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -228,7 +228,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa util::DateTime aDateTimeModified; DateTime aDateTime( DateTime::EMPTY ); - aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTimeModified; + aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDateTimeModified; ::utl::typeConvert( aDateTimeModified, aDateTime ); rData.aThemeChangeDate = aDateTime; rData.aThemeChangeTime = aDateTime; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 071ff8aabf2a..94f12a5820c4 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -38,35 +38,35 @@ #include <com/sun/star/lang/XComponent.hpp> -#define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:")) - -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave" )) -#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery" )) -#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport" )) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")) -#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave" )) -#define RECOVERY_CMD_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery" )) -#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup" )) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp" )) - -#define PROP_STATUSINDICATOR rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" )) -#define PROP_DISPATCHASYNCHRON rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DispatchAsynchron")) -#define PROP_SAVEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SavePath" )) -#define PROP_ENTRYID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EntryID" )) - -#define STATEPROP_ID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID" )) -#define STATEPROP_STATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentState")) -#define STATEPROP_ORGURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OriginalURL" )) -#define STATEPROP_TEMPURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TempURL" )) -#define STATEPROP_FACTORYURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FactoryURL" )) -#define STATEPROP_TEMPLATEURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TemplateURL" )) -#define STATEPROP_TITLE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) -#define STATEPROP_MODULE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Module" )) - -#define RECOVERY_OPERATIONSTATE_START rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "start" )) -#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stop" )) -#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "update")) +#define RECOVERY_CMDPART_PROTOCOL rtl::OUString( "vnd.sun.star.autorecovery:") + +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString( "/doEmergencySave" ) +#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString( "/doAutoRecovery" ) +#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString( "/doCrashReport" ) + +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") +#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) +#define RECOVERY_CMD_DO_RECOVERY rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) +#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) + +#define PROP_STATUSINDICATOR rtl::OUString( "StatusIndicator" ) +#define PROP_DISPATCHASYNCHRON rtl::OUString( "DispatchAsynchron") +#define PROP_SAVEPATH rtl::OUString( "SavePath" ) +#define PROP_ENTRYID rtl::OUString( "EntryID" ) + +#define STATEPROP_ID rtl::OUString( "ID" ) +#define STATEPROP_STATE rtl::OUString( "DocumentState") +#define STATEPROP_ORGURL rtl::OUString( "OriginalURL" ) +#define STATEPROP_TEMPURL rtl::OUString( "TempURL" ) +#define STATEPROP_FACTORYURL rtl::OUString( "FactoryURL" ) +#define STATEPROP_TEMPLATEURL rtl::OUString( "TemplateURL" ) +#define STATEPROP_TITLE rtl::OUString( "Title" ) +#define STATEPROP_MODULE rtl::OUString( "Module" ) + +#define RECOVERY_OPERATIONSTATE_START rtl::OUString( "start" ) +#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString( "stop" ) +#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString( "update") #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 62705b641393..9c498f250263 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -21,55 +21,55 @@ #include <svx/svxdllapi.h> -#define FM_COMPONENT_EDIT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) ) -#define FM_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) ) -#define FM_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) ) -#define FM_COMPONENT_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ComboBox" ) ) -#define FM_COMPONENT_RADIOBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.RadioButton" ) ) -#define FM_COMPONENT_GROUPBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GroupBox" ) ) -#define FM_COMPONENT_FIXEDTEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FixedText" ) ) -#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CommandButton" ) ) -#define FM_COMPONENT_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CheckBox" ) ) -#define FM_COMPONENT_GRID rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Grid" ) ) -#define FM_COMPONENT_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GridControl" ) ) -#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageButton" ) ) -#define FM_COMPONENT_FILECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FileControl" ) ) -#define FM_COMPONENT_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TimeField" ) ) -#define FM_COMPONENT_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.DateField" ) ) -#define FM_COMPONENT_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.NumericField" ) ) -#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CurrencyField" ) ) -#define FM_COMPONENT_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.PatternField" ) ) -#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FormattedField" ) ) -#define FM_COMPONENT_HIDDEN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Hidden" ) ) -#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.HiddenControl" ) ) -#define FM_COMPONENT_IMAGECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageControl" ) ) -#define FM_CONTROL_GRID rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.Grid" ) ) -#define FM_CONTROL_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.GridControl" ) ) -#define SRV_SDB_CONNECTION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.Connection" ) ) -#define FM_SUN_COMPONENT_FORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.Form" ) ) -#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ) ) -#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ) ) -#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ) ) -#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ) ) -#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GroupBox" ) ) -#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ) ) -#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ) ) -#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ) ) -#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GridControl" ) ) -#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageButton" ) ) -#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FileControl" ) ) -#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TimeField" ) ) -#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DateField" ) ) -#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NumericField" ) ) -#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CurrencyField" ) ) -#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.PatternField" ) ) -#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.HiddenControl" ) ) -#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ) ) -#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) ) -#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" ) ) -#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.SpinButton" ) ) -#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NavigationToolBar" ) ) -#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.GridControl" ) ) +#define FM_COMPONENT_EDIT rtl::OUString( "stardiv.one.form.component.Edit" ) +#define FM_COMPONENT_TEXTFIELD rtl::OUString( "stardiv.one.form.component.TextField" ) +#define FM_COMPONENT_LISTBOX rtl::OUString( "stardiv.one.form.component.ListBox" ) +#define FM_COMPONENT_COMBOBOX rtl::OUString( "stardiv.one.form.component.ComboBox" ) +#define FM_COMPONENT_RADIOBUTTON rtl::OUString( "stardiv.one.form.component.RadioButton" ) +#define FM_COMPONENT_GROUPBOX rtl::OUString( "stardiv.one.form.component.GroupBox" ) +#define FM_COMPONENT_FIXEDTEXT rtl::OUString( "stardiv.one.form.component.FixedText" ) +#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( "stardiv.one.form.component.CommandButton" ) +#define FM_COMPONENT_CHECKBOX rtl::OUString( "stardiv.one.form.component.CheckBox" ) +#define FM_COMPONENT_GRID rtl::OUString( "stardiv.one.form.component.Grid" ) +#define FM_COMPONENT_GRIDCONTROL rtl::OUString( "stardiv.one.form.component.GridControl" ) +#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( "stardiv.one.form.component.ImageButton" ) +#define FM_COMPONENT_FILECONTROL rtl::OUString( "stardiv.one.form.component.FileControl" ) +#define FM_COMPONENT_TIMEFIELD rtl::OUString( "stardiv.one.form.component.TimeField" ) +#define FM_COMPONENT_DATEFIELD rtl::OUString( "stardiv.one.form.component.DateField" ) +#define FM_COMPONENT_NUMERICFIELD rtl::OUString( "stardiv.one.form.component.NumericField" ) +#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( "stardiv.one.form.component.CurrencyField" ) +#define FM_COMPONENT_PATTERNFIELD rtl::OUString( "stardiv.one.form.component.PatternField" ) +#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( "stardiv.one.form.component.FormattedField" ) +#define FM_COMPONENT_HIDDEN rtl::OUString( "stardiv.one.form.component.Hidden" ) +#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( "stardiv.one.form.component.HiddenControl" ) +#define FM_COMPONENT_IMAGECONTROL rtl::OUString( "stardiv.one.form.component.ImageControl" ) +#define FM_CONTROL_GRID rtl::OUString( "stardiv.one.form.control.Grid" ) +#define FM_CONTROL_GRIDCONTROL rtl::OUString( "stardiv.one.form.control.GridControl" ) +#define SRV_SDB_CONNECTION rtl::OUString( "com.sun.star.sdb.Connection" ) +#define FM_SUN_COMPONENT_FORM rtl::OUString( "com.sun.star.form.component.Form" ) +#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( "com.sun.star.form.component.TextField" ) +#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( "com.sun.star.form.component.ListBox" ) +#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( "com.sun.star.form.component.ComboBox" ) +#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( "com.sun.star.form.component.RadioButton" ) +#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( "com.sun.star.form.component.GroupBox" ) +#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( "com.sun.star.form.component.FixedText" ) +#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( "com.sun.star.form.component.CommandButton" ) +#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( "com.sun.star.form.component.CheckBox" ) +#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( "com.sun.star.form.component.GridControl" ) +#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( "com.sun.star.form.component.ImageButton" ) +#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( "com.sun.star.form.component.FileControl" ) +#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( "com.sun.star.form.component.TimeField" ) +#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( "com.sun.star.form.component.DateField" ) +#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( "com.sun.star.form.component.NumericField" ) +#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( "com.sun.star.form.component.CurrencyField" ) +#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( "com.sun.star.form.component.PatternField" ) +#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( "com.sun.star.form.component.HiddenControl" ) +#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" ) +#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" ) +#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( "com.sun.star.form.component.ScrollBar" ) +#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( "com.sun.star.form.component.SpinButton" ) +#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( "com.sun.star.form.component.NavigationToolBar" ) +#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( "com.sun.star.form.control.GridControl" ) namespace svxform { diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 154a090ccf8f..6c0b6a2795d5 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -20,33 +20,33 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORM_POSITION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/positionForm" ) ) -#define FMURL_FORM_RECORDCOUNT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/RecordCount" ) ) -#define FMURL_RECORD_MOVEFIRST rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToFirst" ) ) -#define FMURL_RECORD_MOVEPREV rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToPrev" ) ) -#define FMURL_RECORD_MOVENEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNext" ) ) -#define FMURL_RECORD_MOVELAST rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToLast" ) ) -#define FMURL_RECORD_MOVETONEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNew" ) ) -#define FMURL_RECORD_UNDO rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/undoRecord" ) ) -#define FMURL_RECORD_SAVE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/saveRecord" ) ) -#define FMURL_RECORD_DELETE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/deleteRecord" ) ) -#define FMURL_FORM_REFRESH rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshForm" ) ) -#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshCurrentControl" ) ) -#define FMURL_FORM_SORT_UP rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortUp" ) ) -#define FMURL_FORM_SORT_DOWN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortDown" ) ) -#define FMURL_FORM_SORT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sort" ) ) -#define FMURL_FORM_AUTO_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/autoFilter" ) ) -#define FMURL_FORM_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/filter" ) ) -#define FMURL_FORM_APPLY_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/applyFilter" ) ) -#define FMURL_FORM_REMOVE_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/removeFilterOrder" ) ) -#define FMURL_CONFIRM_DELETION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ConfirmDeletion" ) ) -#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/FormGridView" ) ) -#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ClearView" ) ) -#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AddGridColumn" ) ) -#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AttachToForm" ) ) -#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MasterForm" ) ) -#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnType" ) ) -#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnPosition" ) ) +#define FMURL_FORM_POSITION rtl::OUString( ".uno:FormController/positionForm" ) +#define FMURL_FORM_RECORDCOUNT rtl::OUString( ".uno:FormController/RecordCount" ) +#define FMURL_RECORD_MOVEFIRST rtl::OUString( ".uno:FormController/moveToFirst" ) +#define FMURL_RECORD_MOVEPREV rtl::OUString( ".uno:FormController/moveToPrev" ) +#define FMURL_RECORD_MOVENEXT rtl::OUString( ".uno:FormController/moveToNext" ) +#define FMURL_RECORD_MOVELAST rtl::OUString( ".uno:FormController/moveToLast" ) +#define FMURL_RECORD_MOVETONEW rtl::OUString( ".uno:FormController/moveToNew" ) +#define FMURL_RECORD_UNDO rtl::OUString( ".uno:FormController/undoRecord" ) +#define FMURL_RECORD_SAVE rtl::OUString( ".uno:FormController/saveRecord" ) +#define FMURL_RECORD_DELETE rtl::OUString( ".uno:FormController/deleteRecord" ) +#define FMURL_FORM_REFRESH rtl::OUString( ".uno:FormController/refreshForm" ) +#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" ) +#define FMURL_FORM_SORT_UP rtl::OUString( ".uno:FormController/sortUp" ) +#define FMURL_FORM_SORT_DOWN rtl::OUString( ".uno:FormController/sortDown" ) +#define FMURL_FORM_SORT rtl::OUString( ".uno:FormController/sort" ) +#define FMURL_FORM_AUTO_FILTER rtl::OUString( ".uno:FormController/autoFilter" ) +#define FMURL_FORM_FILTER rtl::OUString( ".uno:FormController/filter" ) +#define FMURL_FORM_APPLY_FILTER rtl::OUString( ".uno:FormController/applyFilter" ) +#define FMURL_FORM_REMOVE_FILTER rtl::OUString( ".uno:FormController/removeFilterOrder" ) +#define FMURL_CONFIRM_DELETION rtl::OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( "ColumnPosition" ) #endif // _SVX_FMURL_HXX diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index fe63ea7c6913..90e039a51ef3 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -23,16 +23,16 @@ namespace rtl { class OUString; } -#define FM_COL_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) -#define FM_COL_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) ) -#define FM_COL_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) ) -#define FM_COL_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) ) -#define FM_COL_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) ) -#define FM_COL_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) ) -#define FM_COL_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) ) -#define FM_COL_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) ) -#define FM_COL_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) ) -#define FM_COL_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) ) +#define FM_COL_TEXTFIELD rtl::OUString( "TextField" ) +#define FM_COL_COMBOBOX rtl::OUString( "ComboBox" ) +#define FM_COL_CHECKBOX rtl::OUString( "CheckBox" ) +#define FM_COL_TIMEFIELD rtl::OUString( "TimeField" ) +#define FM_COL_DATEFIELD rtl::OUString( "DateField" ) +#define FM_COL_NUMERICFIELD rtl::OUString( "NumericField" ) +#define FM_COL_CURRENCYFIELD rtl::OUString( "CurrencyField" ) +#define FM_COL_PATTERNFIELD rtl::OUString( "PatternField" ) +#define FM_COL_LISTBOX rtl::OUString( "ListBox" ) +#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" ) // column type ids #define TYPE_CHECKBOX 0 diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index c288020bf695..218bb7e92afb 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup (0), bDisabled( sal_False ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" ))); + addStatusListener( rtl::OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, TIB_DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -95,10 +95,10 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedFormat" )); + aArgs[0].Name = rtl::OUString( "SelectedFormat" ); aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" )), + Dispatch( rtl::OUString( ".uno:ClipboardFormatItems" ), aArgs ); } diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index bc8fde868726..41cbcd0327d2 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -137,7 +137,7 @@ namespace sdr if(bUseReducedDisplayQualityForDrag) { uno::Sequence< beans::PropertyValue > xProperties(1); - xProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedDisplayQuality")); + xProperties[0].Name = rtl::OUString("ReducedDisplayQuality"); xProperties[0].Value <<= true; maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 10bee14db983..7c30defe8801 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -111,7 +111,7 @@ namespace drawinglayer if(!aSeq.getLength()) { aSeq.realloc(1L); - aSeq.getArray()[0L] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.PrimitiveFactory2D")); + aSeq.getArray()[0L] = rtl::OUString("com.sun.star.graphic.PrimitiveFactory2D"); } return aSeq; diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index cc003debd548..c46aa095180a 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -49,7 +49,7 @@ namespace { try { - const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number")))); + const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString("Number"))); aNumber >>= nRetval; } catch(const uno::Exception&) diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index a91f8ecfd62a..e6bd31f70556 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -82,7 +82,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InsertMode" )); + aArgs[0].Name = rtl::OUString( "InsertMode" ); aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 3f3d03f0ce90..de7fd80e8275 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -324,11 +324,11 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusBarFunc" )); + aArgs[0].Name = rtl::OUString( "StatusBarFunc" ); aItem.QueryValue( a ); aArgs[0].Value = a; - execute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" )), aArgs ); + execute( rtl::OUString( ".uno:StatusBarFunc" ), aArgs ); // GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L ); } } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index cb4abbe0c72f..25b0320292d7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider" )); + aArgs[0].Name = rtl::OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider" )); + aArgs[0].Name = rtl::OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index a8ed89f8429b..2c55ea66cfe2 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -80,8 +80,8 @@ using namespace ::com::sun::star; uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( xFactory.is() ) { - const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainer"))), uno::UNO_QUERY); - uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainerModel"))), uno::UNO_QUERY); + const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); + uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY); if (xControl.is()) xControl->setModel(xModel); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index a32cad756868..bd9be1b732a3 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); + aFilterData[ 0 ].Name = rtl::OUString( "CreateNativeLink" ); aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 941af356b444..05699f1e3cb8 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -176,7 +176,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ) ); + ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( "DateModified" ) ) ); ::com::sun::star::util::DateTime aDateTime; aAny >>= aDateTime; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 43249d90492c..3f79ca9bd030 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -296,7 +296,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell has no valid view forwarder")),static_cast<uno::XWeak*>(this)); + throw uno::RuntimeException (::rtl::OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() )); @@ -475,7 +475,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell")); + return OUString("AccessibleCell"); } // -------------------------------------------------------------------- diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 0cb973192fb6..66ff42170751 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -315,14 +315,14 @@ Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleCont //----------------------------------------------------------------------------- OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleTableShape" ) ); + return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } //----------------------------------------------------------------------------- OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) { - return OUString (RTL_CONSTASCII_USTRINGPARAM("TableShape")); + return OUString("TableShape"); } //-------------------------------------------------------------------- diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 93cf2f45eea7..e46b4865fb50 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -812,7 +812,7 @@ Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeExcept OUString SAL_CALL Cell::getImplementationName( ) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.table.Cell" ) ); + return OUString( "com.sun.star.comp.svx.table.Cell" ); } // ----------------------------------------------------------------------------- @@ -835,8 +835,8 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE Sequence< OUString > aSeq( SvxUnoTextBase::getSupportedServiceNames() ); sal_Int32 nIndex = aSeq.getLength(); aSeq.realloc( nIndex + 2 ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.cell" ) ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.cell" ) ); + aSeq[nIndex++] = OUString( "com.sun.star.table.cell" ); + aSeq[nIndex++] = OUString( "com.sun.star.drawing.cell" ); return aSeq; } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index b454b08502cc..6a68466f2dbc 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -255,32 +255,32 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ); + aProperties[0].Name = OUString( "Width" ); aProperties[0].Handle = Property_Width; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalWidth" ) ); + aProperties[1].Name = OUString( "OptimalWidth" ); aProperties[1].Handle = Property_OptimalWidth; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Width; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalWidth; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index f719d363b25e..e97b9b661ce3 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -194,16 +194,16 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() if( aMap.empty() ) { CellStyleNameMap aNewMap; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-row" ) ) ] = first_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-row" ) ) ] = last_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-column" ) ) ] = first_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-column" ) ) ] = last_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "body" ) ) ] = body_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-rows" ) ) ] = even_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-rows" ) ) ] = odd_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-columns" ) ) ] = even_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-columns" ) ) ] = odd_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "background" ) ) ] = background_style; + aNewMap[ OUString( "first-row" ) ] = first_row_style; + aNewMap[ OUString( "last-row" ) ] = last_row_style; + aNewMap[ OUString( "first-column" ) ] = first_column_style; + aNewMap[ OUString( "last-column" ) ] = last_column_style; + aNewMap[ OUString( "body" ) ] = body_style; + aNewMap[ OUString( "even-rows" ) ] = even_rows_style; + aNewMap[ OUString( "odd-rows" ) ] = odd_rows_style; + aNewMap[ OUString( "even-columns" ) ] = even_columns_style; + aNewMap[ OUString( "odd-columns" ) ] = odd_columns_style; + aNewMap[ OUString( "background" ) ] = background_style; aMap.swap( aNewMap ); } @@ -216,7 +216,7 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignStyle") ); + return OUString("TableDesignStyle"); } // ---------------------------------------------------------- @@ -494,7 +494,7 @@ void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventOb OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignFamily") ); + return OUString("TableDesignFamily"); } // ---------------------------------------------------------- @@ -519,7 +519,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() thro OUString SAL_CALL TableDesignFamily::getName() throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); + return OUString( "table" ); } // ---------------------------------------------------------- @@ -753,7 +753,7 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } else { - throw UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + PropertyName, static_cast<OWeakObject *>(this) ); + throw UnknownPropertyException( OUString("unknown property: ") + PropertyName, static_cast<OWeakObject *>(this) ); } } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 07a84c00193a..03208ab10889 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -329,32 +329,32 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ); + aProperties[0].Name = OUString( "Height" ); aProperties[0].Handle = Property_Height; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalHeight" ) ); + aProperties[1].Name = OUString( "OptimalHeight" ); aProperties[1].Handle = Property_OptimalHeight; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Height; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalHeight; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 6ce06652e036..a0e64bc3c266 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -247,7 +247,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + OUString( ".uno:ExtrusionDirectionFloater" ) ) { } @@ -265,7 +265,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDirectionController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } // -------------------------------------------------------------------- @@ -273,7 +273,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -469,9 +469,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) Any a; Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" )); + aArgs[0].Name = rtl::OUString( "Depth" ); aArgs[0].Value <<= mfDepth; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" )); + aArgs[1].Name = rtl::OUString( "Metric" ); aArgs[1].Value <<= static_cast<sal_Int32>( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -512,7 +512,7 @@ ExtrusionDepthController::ExtrusionDepthController( ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) + OUString( ".uno:ExtrusionDepthFloater" ) ) { } @@ -531,7 +531,7 @@ ExtrusionDepthController::ExtrusionDepthController( OUString SAL_CALL ExtrusionDepthController_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDepthController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } // -------------------------------------------------------------------- @@ -539,7 +539,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.PopupMenuController" ); return aSNS; } @@ -774,7 +774,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + OUString( ".uno:ExtrusionDirectionFloater" ) ) { } @@ -792,7 +792,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( OUString SAL_CALL ExtrusionLightingControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionLightingController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } // -------------------------------------------------------------------- @@ -800,7 +800,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -919,7 +919,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) + OUString( ".uno:ExtrusionSurfaceFloater" ) ) { } @@ -937,7 +937,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionSurfaceController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } // -------------------------------------------------------------------- @@ -945,7 +945,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -1004,7 +1004,7 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Extrusion3DColor" )), + rtl::OUString( ".uno:Extrusion3DColor" ), SID_EXTRUSION_3D_COLOR, m_xFrame, SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ), diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 877958250369..cfd9f5b3010e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -68,14 +68,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillBitmap" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GradientListState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HatchListState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BitmapListState" ))); + addStatusListener( rtl::OUString( ".uno:FillColor" )); + addStatusListener( rtl::OUString( ".uno:FillGradient" )); + addStatusListener( rtl::OUString( ".uno:FillHatch" )); + addStatusListener( rtl::OUString( ".uno:FillBitmap" )); + addStatusListener( rtl::OUString( ".uno:ColorTableState" )); + addStatusListener( rtl::OUString( ".uno:GradientListState" )); + addStatusListener( rtl::OUString( ".uno:HatchListState" )); + addStatusListener( rtl::OUString( ".uno:BitmapListState" )); } //======================================================================== @@ -545,7 +545,7 @@ FillControl::~FillControl() IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); - ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" ))); + ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( ".uno:FillStyle" )); // ( (SvxFillToolBoxControl*)GetData() )->GetBindings().Invalidate( SID_ATTR_FILL_STYLE ); return 0; } @@ -673,12 +673,12 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )); + aArgs[0].Name = ::rtl::OUString( "FillStyle" ); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs ); + ::rtl::OUString( ".uno:FillStyle" ), aArgs ); ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) @@ -701,10 +701,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )); + aArgs[0].Name = ::rtl::OUString( "FillColor" ); aXFillColorItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillColor" ), aArgs ); } break; @@ -722,10 +722,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )); + aArgs[0].Name = ::rtl::OUString( "FillGradient" ); aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillGradient" ), aArgs ); } } @@ -745,10 +745,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )); + aArgs[0].Name = ::rtl::OUString( "FillHatch" ); aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillHatch" ), aArgs ); } } @@ -769,10 +769,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmap" )); + aArgs[0].Name = ::rtl::OUString( "FillBitmap" ); aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillBitmap")), aArgs); + ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(".uno:FillBitmap"), aArgs); } } } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index a35262f020dd..3f94d0ddcf0e 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -420,7 +420,7 @@ public: // ----------------------------------------------------------------------- FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) ) +: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } @@ -437,7 +437,7 @@ FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMult OUString SAL_CALL FontWorkAlignmentControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController" )); + return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } // -------------------------------------------------------------------- @@ -445,7 +445,7 @@ OUString SAL_CALL FontWorkAlignmentControl_getImplementationName() Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -610,7 +610,7 @@ IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl) aArgs[0].Name = msFontworkCharacterSpacing.copy(5); aArgs[0].Value <<= (sal_Int32)nCharacterSpacing; - mrController.dispatchCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingDialog" )), aArgs ); + mrController.dispatchCommand( OUString( ".uno:FontworkCharacterSpacingDialog" ), aArgs ); } else if ( nSelection == 6 ) // KernCharacterPairs { @@ -656,7 +656,7 @@ public: FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingFloater" ) ) ) +: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) ) { } @@ -673,7 +673,7 @@ FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Referenc OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController" )); + return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } // -------------------------------------------------------------------- @@ -681,7 +681,7 @@ OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName() Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 008d89bf5ff6..6aeb599adab1 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,9 +61,9 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistentCopy" )); + aArgs[0].Name = rtl::OUString( "PersistentCopy" ); aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) ); - Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" )) + Dispatch( rtl::OUString( ".uno:FormatPaintbrush" ) , aArgs ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 86e5c5e17942..955d2847e71f 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang; #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() -#define TOOLBOX_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "colorbar" ) ) +#define TOOLBOX_NAME ::rtl::OUString( "colorbar" ) TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); @@ -355,7 +355,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GrafMode" )); + aArgs[0].Name = rtl::OUString( "GrafMode" ); aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -365,7 +365,7 @@ void ImplGrafModeControl::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GrafMode" )), + OUString( ".uno:GrafMode" ), aArgs ); } } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 7d26fdcb0a91..76f170f0d21f 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -130,11 +130,11 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )); + aArgs[0].Name = ::rtl::OUString( "LineDash" ); aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )), + ::rtl::OUString( ".uno:LineDash" ), aArgs ); } } @@ -144,11 +144,11 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XLineStyle" )); + aArgs[0].Name = ::rtl::OUString( "XLineStyle" ); aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )), + ::rtl::OUString( ".uno:XLineStyle" ), aArgs ); nCurPos = GetSelectEntryPos(); @@ -474,11 +474,11 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )); + aArgs[0].Name = ::rtl::OUString( "LineWidth" ); aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )), + ::rtl::OUString( ".uno:LineWidth" ), aArgs ); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index cbdbbfa89586..e0adc57f125e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -294,9 +294,9 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); if ( m_aCommandURL == ".uno:Undo" ) - updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetUndoStrings" ))); + updateStatus( rtl::OUString( ".uno:GetUndoStrings" )); else - updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetRedoStrings" ))); + updateStatus( rtl::OUString( ".uno:GetRedoStrings" )); ToolBox& rBox = GetToolBox(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1827f9408dd3..2f26f7b52cb2 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -65,8 +65,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, pDashItem ( NULL ), bUpdate ( sal_False ) { - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" ))); - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" ))); + addStatusListener( ::rtl::OUString( ".uno:LineDash" )); + addStatusListener( ::rtl::OUString( ".uno:DashListState" )); } //======================================================================== @@ -205,7 +205,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ))); + addStatusListener( rtl::OUString( ".uno:MetricUnit" )); } //======================================================================== @@ -272,7 +272,7 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" ))); + addStatusListener( rtl::OUString( ".uno:ColorTableState" )); } //======================================================================== @@ -412,7 +412,7 @@ void SvxLineEndWindow::implInit() // ValueSet mit Eintraegen der LineEndList fuellen FillValueSet(); - AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndListState" ))); + AddStatusListener( rtl::OUString( ".uno:LineEndListState" )); //ChangeHelpId( HID_POPUP_LINEENDSTYLE ); aLineEndSet.Show(); @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStart" )); + aArgs[0].Name = ::rtl::OUString( "LineStart" ); pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEnd" )); + aArgs[0].Name = ::rtl::OUString( "LineEnd" ); pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) aLineEndSet.SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndStyle" )), + ::rtl::OUString( ".uno:LineEndStyle" ), aArgs ); delete pLineEndItem; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index d2c7b9dea304..0968974377fe 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -119,7 +119,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontHeight.Height" )); + aArgs[0].Name = ::rtl::OUString( "FontHeight.Height" ); aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -242,10 +242,10 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::ToolboxController( rServiceManager, uno::Reference< frame::XFrame >(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" )) ), + ::rtl::OUString( ".uno:FontHeight" ) ), m_pBox( NULL ) { - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ))); + addStatusListener( ::rtl::OUString( ".uno:CharFontName" )); } FontHeightToolBoxControl::~FontHeightToolBoxControl() @@ -303,7 +303,7 @@ uno::Sequence< ::rtl::OUString > FontHeightToolBoxControl::getSupportedServiceNa throw() { uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -402,7 +402,7 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" )); + aURL.Complete = ::rtl::OUString( ".uno:FontHeight" ); xURLTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 7a020ed10ffe..4e4cf1fc925b 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -148,7 +148,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { @@ -360,7 +360,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSup css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -698,7 +698,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { @@ -778,8 +778,8 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedSe css::uno::Sequence< ::rtl::OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() { css::uno::Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FindbarDispatcher" )); - aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ProtocolHandler" )); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); + aSNS.getArray()[1] = ::rtl::OUString( "com.sun.star.frame.ProtocolHandler" ); return aSNS; } @@ -823,7 +823,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (!xLayoutManager.is()) return; diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index e877eed176ae..0d353b196d9f 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,14 +34,14 @@ SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_False); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" ))); + addStatusListener( rtl::OUString( ".uno:CTLFontState" )); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_True); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" ))); + addStatusListener( rtl::OUString( ".uno:VerticalTextState" )); } /* ---------------------------------------------------------------------------*/ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index cd6d963fd71f..ce9903c53187 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -506,14 +506,14 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") ); rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") ); lang::Locale aLocale; - aLocale.Language = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("zh") ); + aLocale.Language = rtl::OUString("zh"); if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TW") ); + aLocale.Country = rtl::OUString("TW"); xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -528,7 +528,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CN") ); + aLocale.Country = rtl::OUString("CN"); xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 150094dd4650..21cf4d5b43fb 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -193,14 +193,14 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ); + aSupportedServiceNames[0] = OUString( "com.sun.star.drawing.GraphicExportFilter" ); return aSupportedServiceNames; } SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.GraphicExporter" ) ); + return OUString( "com.sun.star.comp.Draw.GraphicExporter" ); } /** creates a bitmap that is optionaly transparent from a metafile @@ -517,12 +517,12 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnWidth; - pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) ); + pDataValues->Name = OUString( "PixelWidth" ); } else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Height" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnHeight; - pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) ); + pDataValues->Name = OUString( "PixelHeight" ); } else if ( pDataValues->Name == "ExportOnlyBackground" ) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 33c4e811ac30..3be929155bd7 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -82,14 +82,14 @@ namespace svx throw() { Sequence< ::rtl::OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.NamespaceMap" ) ); + aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.xml.NamespaceMap" ); return aSupportedServiceNames; } ::rtl::OUString SAL_CALL NamespaceMap_getImplementationName() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Svx.NamespaceMap" ) ); + return ::rtl::OUString( "com.sun.star.comp.Svx.NamespaceMap" ); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index c6b9063930b4..5258eb8fc86e 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -309,7 +309,7 @@ uno::Type SAL_CALL SvxUnoXColorTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXColorTable" ) ); + return OUString( "SvxUnoXColorTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -383,7 +383,7 @@ uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXLineEndTable" ) ); + return OUString( "SvxUnoXLineEndTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -465,7 +465,7 @@ uno::Type SAL_CALL SvxUnoXDashTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXDashTable" ) ); + return OUString( "SvxUnoXDashTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -542,7 +542,7 @@ uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXHatchTable" ) ); + return OUString( "SvxUnoXHatchTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -631,7 +631,7 @@ uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXGradientTable" ) ); + return OUString( "SvxUnoXGradientTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -699,7 +699,7 @@ uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXBitmapTable" ) ); + return OUString( "SvxUnoXBitmapTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException) diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 72cc07b9ab2f..62af47f7d31a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ) ); + SetShapeType( rtl::OUString( "com.sun.star.drawing.TableShape" ) ); } //---------------------------------------------------------------------- diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index bc8e7dff52ff..0697b7023959 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -80,14 +80,14 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoBitmapTable") ); + return OUString("SvxUnoBitmapTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.BitmapTable" ); return aSNS; } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 2bfc7db866c1..f80416a134fe 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -51,7 +51,7 @@ public: static OUString getImplementationName_Static() throw() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxUnoColorTable")); + return OUString("com.sun.star.drawing.SvxUnoColorTable"); } static uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(); @@ -98,7 +98,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoColorTable") ); + return OUString("SvxUnoColorTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() @@ -110,7 +110,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() uno::Sequence< OUString > SvxUnoColorTable::getSupportedServiceNames_Static(void) throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.ColorTable" ); return aSNS; } diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 1db5395b8281..e6e89129f06c 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -61,14 +61,14 @@ SvxUnoDashTable::~SvxUnoDashTable() throw() OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDashTable") ); + return OUString("SvxUnoDashTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.DashTable" ); return aSNS; } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index deb2e1d2d656..5cc1f9bf225c 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -60,14 +60,14 @@ SvxUnoGradientTable::~SvxUnoGradientTable() throw() OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoGradientTable") ); + return OUString("SvxUnoGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.GradientTable" ); return aSNS; } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 8f3f67778999..2e4b1ba7ec73 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -60,14 +60,14 @@ SvxUnoHatchTable::~SvxUnoHatchTable() throw() OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoHatchTable") ); + return OUString("SvxUnoHatchTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.HatchTable" ); return aSNS; } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index d3b12680ab85..bd51521aa30b 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -130,23 +130,23 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* // #115423# // case HINT_PAGECHG: // Page geaendert -// aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageModified" ) ); +// aEvent.EventName = OUString( "PageModified" ); // pPage = pSdrHint->GetPage(); // break; case HINT_PAGEORDERCHG: // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos) - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOrderModified" ) ); + aEvent.EventName = OUString( "PageOrderModified" ); pPage = pSdrHint->GetPage(); break; case HINT_OBJCHG: // Objekt geaendert - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeModified" ) ); + aEvent.EventName = OUString( "ShapeModified" ); pObj = pSdrHint->GetObject(); break; case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeInserted" ) ); + aEvent.EventName = OUString( "ShapeInserted" ); pObj = pSdrHint->GetObject(); break; case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeRemoved" ) ); + aEvent.EventName = OUString( "ShapeRemoved" ); pObj = pSdrHint->GetObject(); break; // HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert @@ -509,28 +509,28 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( sal_uInt16 i = 0; - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingRules")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject")); - - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlinerShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SubtitleShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.GraphicObjectShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.ChartShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PageShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OLE2Shape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TableShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OrgChartShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutShape")); + aSNS[i++] = OUString("com.sun.star.drawing.DashTable"); + aSNS[i++] = OUString("com.sun.star.drawing.GradientTable"); + aSNS[i++] = OUString("com.sun.star.drawing.HatchTable"); + aSNS[i++] = OUString("com.sun.star.drawing.BitmapTable"); + aSNS[i++] = OUString("com.sun.star.drawing.TransparencyGradientTable"); + aSNS[i++] = OUString("com.sun.star.drawing.MarkerTable"); + aSNS[i++] = OUString("com.sun.star.text.NumberingRules"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapRectangleObject"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapCircleObject"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapPolygonObject"); + + aSNS[i++] = OUString("com.sun.star.presentation.TitleTextShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OutlinerShape"); + aSNS[i++] = OUString("com.sun.star.presentation.SubtitleShape"); + aSNS[i++] = OUString("com.sun.star.presentation.GraphicObjectShape"); + aSNS[i++] = OUString("com.sun.star.presentation.ChartShape"); + aSNS[i++] = OUString("com.sun.star.presentation.PageShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OLE2Shape"); + aSNS[i++] = OUString("com.sun.star.presentation.TableShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OrgChartShape"); + aSNS[i++] = OUString("com.sun.star.presentation.NotesShape"); + aSNS[i++] = OUString("com.sun.star.presentation.HandoutShape"); DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" ); @@ -541,7 +541,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() throw(uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawingModel")); + return OUString("SvxUnoDrawingModel"); } sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) @@ -693,7 +693,7 @@ const char pSvxUnoDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages"; OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoDrawPagesAccess" ) ); + return OUString( "SvxUnoDrawPagesAccess" ); } sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index ce70254b0303..1e3d5a16f990 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -143,14 +143,14 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceNa OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoMarkerTable") ); + return OUString("SvxUnoMarkerTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.MarkerTable" ); return aSNS; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 0ab54524627e..cb13fb859e77 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -847,7 +847,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS //---------------------------------------------------------------------- OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxDrawPage")); + return OUString("SvxDrawPage"); } sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) @@ -859,7 +859,7 @@ sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection" )); + aSeq.getArray()[0] = OUString("com.sun.star.drawing.ShapeCollection" ); return aSeq; } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index bfa37ab3b7a2..48dd8b4a36ac 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -408,14 +408,14 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawPool") ); + return OUString("SvxUnoDrawPool"); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.Defaults" ); return aSNS; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1193242b98bf..6a945ba9a195 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1690,8 +1690,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 ) throw beans::PropertyVetoException( ( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Readonly property can't be set: " ) ) + "Readonly property can't be set: " ) + rPropertyName ), uno::Reference< drawing::XShape >( this ) ); diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 485dd16a7294..1c8102129b55 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -220,7 +220,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException ::rtl::OUString SvxShapeCollection::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxShapeCollection") ); + return ::rtl::OUString("com.sun.star.drawing.SvxShapeCollection"); } sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) @@ -237,8 +237,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServic uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq(2); - aSeq.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shapes") ); - aSeq.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection") ); + aSeq.getArray()[0] = ::rtl::OUString("com.sun.star.drawing.Shapes"); + aSeq.getArray()[1] = ::rtl::OUString("com.sun.star.drawing.ShapeCollection"); return aSeq; } diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index d76c6375ed8b..26c532f7e7e3 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -60,14 +60,14 @@ SvxUnoTransGradientTable::~SvxUnoTransGradientTable() throw() OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoTransGradientTable") ); + return OUString("SvxUnoTransGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.TransparencyGradientTable" ); return aSNS; } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index da13bf7189cc..54d25ae9cb36 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -128,7 +128,7 @@ void SAL_CALL GalleryItem::release() ::rtl::OUString GalleryItem::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryItem" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryItem" ); } // ------------------------------------------------------------------------------ @@ -138,7 +138,7 @@ uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryItem" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryItem" ); return aSeq; } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 70f465825203..8b6284797017 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -74,7 +74,7 @@ GalleryTheme::~GalleryTheme() ::rtl::OUString GalleryTheme::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryTheme" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } // ------------------------------------------------------------------------------ @@ -84,7 +84,7 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryTheme" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryTheme" ); return aSeq; } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 7ddc9fcbdefa..672ef21ba848 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -80,7 +80,7 @@ GalleryThemeProvider::~GalleryThemeProvider() SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryThemeProvider" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); } // ------------------------------------------------------------------------------ @@ -90,7 +90,7 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryThemeProvider" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryThemeProvider" ); return aSeq; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index af61eab983fe..b351b6595893 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -264,7 +264,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( while( nPos >= 0 && nPos < rURLStr.getLength() ) { ::rtl::OUString aToken = rURLStr.getToken( 0, ',', nPos ); - if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "oasis=false" ) ) ) ) + if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( "oasis=false" ) ) ) { if ( pOasisFormat ) *pOasisFormat = sal_False; @@ -416,8 +416,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // This is an ole object uno::Reference< beans::XPropertySet > xProps( xStm, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), - uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ) ) ); + ::rtl::OUString( "MediaType" ), + uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); xStm->getOutputStream()->closeOutput(); } @@ -497,7 +497,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( else { // Objects are written using ::comphelper::IEmbeddedHelper::SaveAs - sRetURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("./") ); + sRetURL = ::rtl::OUString("./"); if( !aContainerStorageName.isEmpty() ) { sRetURL += aContainerStorageName; @@ -683,7 +683,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( mxTempStorage = comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); - aEmbDescr[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StoreVisualReplacement" ) ); + aEmbDescr[0].Name = ::rtl::OUString( "StoreVisualReplacement" ); aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); if ( !bOasisFormat ) { @@ -691,7 +691,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( if ( xGrInStream.is() ) { aEmbDescr.realloc( 2 ); - aEmbDescr[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualReplacement" ) ); + aEmbDescr[1].Name = ::rtl::OUString( "VisualReplacement" ); aEmbDescr[1].Value <<= xGrInStream; } } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 8ba2981f7556..afac2c05ea1f 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -180,12 +180,12 @@ static void initializeStreamMetadata( const uno::Reference< uno::XInterface > &x try { xProps->setPropertyValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), - uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/xml" ) ) ) ); + rtl::OUString( "MediaType" ), + uno::makeAny( rtl::OUString( "text/xml" ) ) ); // use stock encryption xProps->setPropertyValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" ) ), + rtl::OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( sal_True ) ); } catch ( const uno::Exception & ) { @@ -199,7 +199,7 @@ static void createStorageStream( uno::Reference < io::XOutputStream > *xOut, { uno::Reference < io::XStream > xStream; xStream = xSubStorage->openStreamElement( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content.xml" ) ), + rtl::OUString( "Content.xml" ), embed::ElementModes::WRITE ); *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, GRAPHICHELPER_MODE_WRITE ); initializeStreamMetadata( xStream ); @@ -272,7 +272,7 @@ bool SvxXMLXTableExportComponent::save( } else { - aPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".xml" ) ); + aPath += rtl::OUString( ".xml" ); try { xStream = xStorage->openStreamElement( aPath, eCreate ); if( !xStream.is() ) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 9a607cb01884..fb7cc13b669d 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1000,9 +1000,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )); + aPropSeq[1].Name = rtl::OUString( "LineDash" ); aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -3397,9 +3397,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )); + aPropSeq[1].Name = rtl::OUString( "FillGradient" ); aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3985,9 +3985,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )); + aPropSeq[1].Name = rtl::OUString( "FillHatch" ); aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 1256f43caa3e..17827a321aea 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -543,11 +543,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = ::rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" )); + aPropSeq[1].Name = ::rtl::OUString( "FillBitmapURL" ); aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )); + aPropSeq[2].Name = ::rtl::OUString( "Bitmap" ); aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 0a705ee9713e..9bfad8414fc6 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -102,7 +102,7 @@ class SwNoteProps: public utl::ConfigItem bool bIsShowAnchor; public: SwNoteProps() - : ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Notes"))) + : ConfigItem(::rtl::OUString("Office.Writer/Notes")) , bIsShowAnchor(false) { const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames(); @@ -124,7 +124,7 @@ class SwNoteProps: public utl::ConfigItem { aNames.realloc(1); ::rtl::OUString* pNames = aNames.getArray(); - pNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAnkor")); + pNames[0] = ::rtl::OUString("ShowAnkor"); } return aNames; } diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index be89e34d3747..78b195f3855a 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -200,9 +200,9 @@ bool UCB_GetFileListOfFolder( const String& rURL, sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1; ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize ); rtl::OUString* pProps = aProps.getArray(); - pProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + pProps[ 0 ] = rtl::OUString("Title"); if( pDateTimeList ) - pProps[ 1 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")); + pProps[ 1 ] = rtl::OUString("DateModified"); try { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index ccec95703a1f..365425fcdc93 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -242,7 +242,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) UnoActionContext aCont(m_pImpl->m_pDoc); if (m_pImpl->m_sMarkName.isEmpty()) { - m_pImpl->m_sMarkName = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark")); + m_pImpl->m_sMarkName = OUString("Bookmark"); } if ((eType == IDocumentMarkAccess::BOOKMARK) && ::sw::mark::CrossRefNumItemBookmark::IsLegalName(m_pImpl->m_sMarkName)) @@ -378,7 +378,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXBookmark::getImplementationName() throw (uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmark")); + return OUString("SwXBookmark"); } static char const*const g_ServicesBookmark[] = @@ -440,8 +440,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::RuntimeException) { // nothing to set here - throw lang::IllegalArgumentException( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Property is read-only: ")) + throw lang::IllegalArgumentException( ::rtl::OUString("Property is read-only: ") + PropertyName, static_cast< cppu::OWeakObject * >(this), 0 ); } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index cdd89eed79d3..a55f2fb56753 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -113,7 +113,7 @@ public: try { uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString("BasicLibraries") ), uno::UNO_QUERY_THROW ); rtl::OUString sProjectName( "Standard"); if ( !mpDocShell->GetBasicManager()->GetName().isEmpty() ) { @@ -612,7 +612,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel(); - aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals")), aArgs ); + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString("ooo.vba.word.Globals"), aArgs ); pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs ); } aGlobs >>= xRet; @@ -1607,18 +1607,18 @@ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFmt& rFmt ) OUString SwXBookmarks::getImplementationName(void) throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmarks")); + return OUString("SwXBookmarks"); } sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks")) == rServiceName; + return OUString("com.sun.star.text.Bookmarks") == rServiceName; } Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); - aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks")); + aRet[0] = OUString("com.sun.star.text.Bookmarks"); return aRet; } diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index ef6251cfa673..28ab19a9bfac 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1182,7 +1182,7 @@ void makeRedline( SwPaM& rPaM, //todo: what about REDLINE_FMTCOLL? comphelper::SequenceAsHashMap aPropMap( rRedlineProperties ); uno::Any aAuthorValue; - aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")), aAuthorValue); + aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineAuthor"), aAuthorValue); sal_uInt16 nAuthor = 0; ::rtl::OUString sAuthor; if( aAuthorValue >>= sAuthor ) @@ -1190,7 +1190,7 @@ void makeRedline( SwPaM& rPaM, ::rtl::OUString sComment; uno::Any aCommentValue; - aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")), aCommentValue); + aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineComment"), aCommentValue); SwRedlineData aRedlineData( eType, nAuthor ); if( aCommentValue >>= sComment ) @@ -1198,7 +1198,7 @@ void makeRedline( SwPaM& rPaM, ::util::DateTime aStamp; uno::Any aDateTimeValue; - aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")), aDateTimeValue); + aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineDateTime"), aDateTimeValue); if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 907d2e21f558..b6755a58361a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1108,7 +1108,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); //mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert if(pFmt) { @@ -1541,7 +1541,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")) ); + aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); } else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID ) { @@ -1552,13 +1552,13 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")) ); + aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); } else if ( FN_SHAPE_ENDPOSITION_IN_HORI_L2R == pEntry->nWID ) { // get property <::drawing::Shape::EndPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) ); + aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); } else { @@ -1618,7 +1618,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")) ); + aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); } break; case FN_SHAPE_POSITION_LAYOUT_DIR: @@ -1631,14 +1631,14 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")) ); + aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); } break; case FN_SHAPE_ENDPOSITION_IN_HORI_L2R: { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) ); + aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); } break; } @@ -1829,7 +1829,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw uno::RuntimeException( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(pFmt) { const SfxItemSet& rSet = pFmt->GetAttrSet(); @@ -1923,7 +1923,7 @@ void SwXShape::addPropertyChangeListener( uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no shape aggregate" ) ), *this ); + throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -1938,7 +1938,7 @@ void SwXShape::removePropertyChangeListener( uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no shape aggregate" ) ), *this ); + throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -2367,9 +2367,9 @@ awt::Point SwXShape::_GetAttrPosition() { awt::Point aAttrPos; - uno::Any aHoriPos( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")) ) ); + uno::Any aHoriPos( getPropertyValue( rtl::OUString("HoriOrientPosition") ) ); aHoriPos >>= aAttrPos.X; - uno::Any aVertPos( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")) ) ); + uno::Any aVertPos( getPropertyValue( rtl::OUString("VertOrientPosition") ) ); aVertPos >>= aAttrPos.Y; // #i35798# - fallback, if attribute position is (0,0) // and no anchor position is applied to the drawing object diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 2ec74e74015a..6a4bfee16da0 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -566,7 +566,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, if( USHRT_MAX != nMId ) pType->PutValue( rValue, nMId ); else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } else if(!pType && m_pDoc && @@ -701,7 +701,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, } break; default: - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } } @@ -809,7 +809,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else { @@ -878,7 +878,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) } break; default: - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } if( pStr ) @@ -1921,9 +1921,9 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(pField) { @@ -2080,7 +2080,7 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName) pEntry = _pParaPropSet->getPropertyMap().getByName(rPropertyName); } if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); switch( pEntry->nWID ) { diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 443f37653f7f..0990c4fc9890 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -840,7 +840,7 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD // Get the style families uno::Reference < XNameAccess > xFamilies = xFamilySupplier->getStyleFamilies(); // Get the Frame family (and keep it for later) - const ::uno::Any aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "FrameStyles" ) ) ); + const ::uno::Any aAny = xFamilies->getByName ( OUString( "FrameStyles" ) ); aAny >>= mxStyleFamily; // In the derived class, we'll ask mxStyleFamily for the relevant default style // mxStyleFamily is initialised in the SwXFrame constructor @@ -848,21 +848,21 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD { case FLYCNTTYPE_FRM: { - uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Frame" ) ) ); + uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "Frame" ) ); aAny2 >>= mxStyleData; pProps = new SwFrameProperties_Impl( ); } break; case FLYCNTTYPE_GRF: { - uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Graphics" ) ) ); + uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "Graphics" ) ); aAny2 >>= mxStyleData; pProps = new SwGraphicProperties_Impl( ); } break; case FLYCNTTYPE_OLE: { - uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OLE" ) ) ); + uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "OLE" ) ); aAny2 >>= mxStyleData; pProps = new SwOLEProperties_Impl( ); } @@ -1015,13 +1015,13 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(pFmt) { bool bNextFrame = false; if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); SwDoc* pDoc = pFmt->GetDoc(); if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) || @@ -1482,7 +1482,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) SwFrmFmt* pFmt = GetFrmFmt(); const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(FN_UNO_ANCHOR_TYPES == pEntry->nWID) { @@ -1842,7 +1842,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) ); if(pEntry->nWID == FN_UNO_ANCHOR_TYPES|| pEntry->nWID == FN_PARAM_LINK_DISPLAY_NAME|| @@ -1899,9 +1899,9 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertyToDefault: property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "setPropertyToDefault: property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); bool bNextFrame; if( pEntry->nWID && @@ -2005,7 +2005,7 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else if(!IsDescriptor()) throw uno::RuntimeException(); @@ -2324,7 +2324,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan if( !aClassName.MakeId( aCLSID ) ) { lang::IllegalArgumentException aExcept; - aExcept.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID invalid")); + aExcept.Message = OUString("CLSID invalid"); throw aExcept; } diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 148062bd30d7..0e9ef54b7856 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -82,8 +82,8 @@ public: SwFmtFtn const& GetFootnoteFormatOrThrow() { SwFmtFtn const*const pFootnote( GetFootnoteFormat() ); if (!pFootnote) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXFootnote: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXFootnote: disposed or invalid"), 0); } return *pFootnote; } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index b38c7d8054f1..03a8c9216b15 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -366,8 +366,8 @@ public: : 0)); if (!pTOXSection) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXDocumentIndex: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXDocumentIndex: disposed or invalid"), 0); } return *pTOXSection; } @@ -560,14 +560,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw beans::PropertyVetoException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: " )) + OUString("Property is read-only: " ) + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -876,7 +876,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast< cppu::OWeakObject * >(this)); } @@ -2093,14 +2093,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw beans::PropertyVetoException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: ")) + OUString("Property is read-only: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -2218,7 +2218,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -3003,7 +3003,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, pArr[nCurrentElement].Name = "TokenType"; pArr[nCurrentElement++].Value <<= - OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryNumber")); + OUString("TokenEntryNumber"); pArr[nCurrentElement].Name = "CharacterStyleName"; pArr[nCurrentElement++].Value <<= aProgCharStyle; @@ -3042,7 +3042,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, beans::PropertyValue* pArr = rCurTokenSeq.getArray(); pArr[0].Name = "TokenType"; - pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryText")); + pArr[0].Value <<= OUString("TokenEntryText"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; @@ -3054,7 +3054,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, beans::PropertyValue* pArr = rCurTokenSeq.getArray(); pArr[0].Name = "TokenType"; - pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenTabStop")); + pArr[0].Value <<= OUString("TokenTabStop"); if(SVX_TAB_ADJUST_END == aToken.eTabAlign) { @@ -3085,7 +3085,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, beans::PropertyValue* pArr = rCurTokenSeq.getArray(); pArr[0].Name = "TokenType"; - pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText")); + pArr[0].Value <<= OUString("TokenText"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; @@ -3100,7 +3100,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, beans::PropertyValue* pArr = rCurTokenSeq.getArray(); pArr[0].Name = "TokenType"; - pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenPageNumber")); + pArr[0].Value <<= OUString("TokenPageNumber"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; @@ -3112,7 +3112,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, beans::PropertyValue* pArr = rCurTokenSeq.getArray(); pArr[0].Name = "TokenType"; - pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo")); + pArr[0].Value <<= OUString("TokenChapterInfo"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; @@ -3150,7 +3150,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, pArr[0].Name = "TokenType"; pArr[0].Value <<= - OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart")); + OUString("TokenHyperlinkStart"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; } @@ -3162,7 +3162,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, pArr[0].Name = "TokenType"; pArr[0].Value <<= - OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd")); + OUString("TokenHyperlinkEnd"); } break; case TOKEN_AUTHORITY: @@ -3172,7 +3172,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, pArr[0].Name = "TokenType"; pArr[0].Value <<= - OUString(RTL_CONSTASCII_USTRINGPARAM("TokenBibliographyDataField")); + OUString("TokenBibliographyDataField"); pArr[1].Name = "CharacterStyleName"; pArr[1].Value <<= aProgCharStyle; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index f7762ab13dac..75b7f0b7c206 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -746,8 +746,8 @@ public: SwUnoCrsr & GetCursorOrThrow() { SwUnoCrsr *const pUnoCursor( GetCursor() ); if (!pUnoCursor) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXTextCursor: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXTextCursor: disposed or invalid"), 0); } return *pUnoCursor; } @@ -1829,7 +1829,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(0)); } @@ -1976,7 +1976,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) else { throw beans::UnknownPropertyException( - OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pNames[i], static_cast<cppu::OWeakObject *>(0)); } @@ -2100,14 +2100,14 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(0)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "setPropertyToDefault: property is read-only: ")) + throw uno::RuntimeException(OUString( + "setPropertyToDefault: property is read-only: ") + rPropertyName, 0); } @@ -2141,7 +2141,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(0)); } @@ -2418,15 +2418,15 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) continue; } throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pNames[i], static_cast<cppu::OWeakObject *>(this)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "setPropertiesToDefault: property is read-only: ")) + OUString( + "setPropertiesToDefault: property is read-only: ") + pNames[i], static_cast<cppu::OWeakObject *>(this)); } @@ -2490,7 +2490,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, continue; } throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pNames[i], static_cast<cppu::OWeakObject *>(0)); } @@ -2977,7 +2977,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent")); + pArray[0] = OUString("com.sun.star.text.TextContent"); return aRet; } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 851ef6851ff6..d40071ef5ef5 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -907,7 +907,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXTextRange::getImplementationName() throw (uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXTextRange")); + return OUString("SwXTextRange"); } static char const*const g_ServicesTextRange[] = @@ -1366,7 +1366,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent")); + pArray[0] = OUString("com.sun.star.text.TextContent"); return aRet; } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index d0d7c8071297..550b7b7d8959 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -142,8 +142,8 @@ public: SwTxtNode & GetTxtNodeOrThrow() { SwTxtNode *const pTxtNode( GetTxtNode() ); if (!pTxtNode) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXParagraph: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXParagraph: disposed or invalid"), 0); } return *pTxtNode; } @@ -397,14 +397,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pPropertyNames[nProp], static_cast< cppu::OWeakObject * >(&m_rThis)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw beans::PropertyVetoException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: ")) + OUString("Property is read-only: ") + pPropertyNames[nProp], static_cast< cppu::OWeakObject * >(&m_rThis)); } @@ -457,7 +457,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pPropertyNames[nProp], static_cast< cppu::OWeakObject * >(&m_rThis)); } @@ -491,14 +491,14 @@ throw (uno::RuntimeException) } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "Unknown property exception caught")), + throw uno::RuntimeException(OUString( + "Unknown property exception caught"), static_cast<cppu::OWeakObject *>(this)); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "WrappedTargetException caught")), + throw uno::RuntimeException(OUString( + "WrappedTargetException caught"), static_cast<cppu::OWeakObject *>(this)); } @@ -919,7 +919,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -953,7 +953,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + *pNames, static_cast<cppu::OWeakObject *>(this)); } @@ -996,7 +996,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -1004,7 +1004,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: ")) + OUString("Property is read-only: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -1066,7 +1066,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 831ef2940b13..4d66549a8670 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -428,7 +428,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( GetPropertyValue( pValues[nProp], *pEntry, pUnoCrsr, pSet ); } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); } delete pSet; } @@ -463,9 +463,9 @@ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl( { const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); SwUnoCursorHelper::SetPropertyValue( *pUnoCrsr, *m_pPropSet, pPropertyNames[nProp], pValues[nProp]); @@ -510,11 +510,11 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } return aValues; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index e606b1c00717..52e34cd9afd0 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1586,7 +1586,7 @@ getPrefixAndSuffix( throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPrefixAndSuffix: exception")), + ::rtl::OUString("getPrefixAndSuffix: exception"), 0, uno::makeAny(e)); } } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 1467955cd0cb..88e2b3f2e896 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -140,8 +140,8 @@ public: SwSectionFmt & GetSectionFmtOrThrow() const { SwSectionFmt *const pFmt( GetSectionFmt() ); if (!pFmt) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXTextSection: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXTextSection: disposed or invalid"), 0); } return *pFmt; } @@ -585,14 +585,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pPropertyNames[nProperty], static_cast<cppu::OWeakObject *>(& m_rThis)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { throw beans::PropertyVetoException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: ")) + OUString("Property is read-only: ") + pPropertyNames[nProperty], static_cast<cppu::OWeakObject *>(& m_rThis)); } @@ -988,7 +988,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pPropertyNames[nProperty], static_cast<cppu::OWeakObject *>(& m_rThis)); } @@ -1291,14 +1291,12 @@ throw (uno::RuntimeException) } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("Unknown property exception caught")), + throw uno::RuntimeException(OUString("Unknown property exception caught"), static_cast<cppu::OWeakObject *>(this)); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("WrappedTargetException caught")), + throw uno::RuntimeException(OUString("WrappedTargetException caught"), static_cast<cppu::OWeakObject *>(this)); } @@ -1415,7 +1413,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + pNames[i], static_cast< cppu::OWeakObject* >(this)); } switch (pEntry->nWID) @@ -1491,13 +1489,13 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast< cppu::OWeakObject* >(this)); } if (pEntry->nFlags & beans::PropertyAttribute::READONLY) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "setPropertyToDefault: property is read-only: ")) + throw uno::RuntimeException(OUString( + "setPropertyToDefault: property is read-only: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } @@ -1634,7 +1632,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if (!pEntry) { throw beans::UnknownPropertyException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: ")) + OUString("Unknown property: ") + rPropertyName, static_cast<cppu::OWeakObject *>(this)); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 061fd05814df..48771155d6f5 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -331,7 +331,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons if(pEntry) { if ( pEntry->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); SwFtnInfo aFtnInfo(pDoc->GetFtnInfo()); switch(pEntry->nWID) { @@ -437,7 +437,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons pDoc->SetFtnInfo(aFtnInfo); } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else throw uno::RuntimeException(); @@ -557,7 +557,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) } } else - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else throw uno::RuntimeException(); @@ -642,7 +642,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const if(pEntry) { if ( pEntry->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); SwEndNoteInfo aEndInfo(pDoc->GetEndNoteInfo()); switch(pEntry->nWID) { @@ -705,7 +705,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const pDoc->SetEndNoteInfo(aEndInfo); } else - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } @@ -792,7 +792,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) } } else - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } return aRet; } @@ -874,7 +874,7 @@ void SwXLineNumberingProperties::setPropertyValue( if(pEntry) { if ( pEntry->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); SwLineNumberInfo aInfo(pDoc->GetLineNumberInfo()); switch(pEntry->nWID) { @@ -976,7 +976,7 @@ void SwXLineNumberingProperties::setPropertyValue( pDoc->SetLineNumberInfo(aInfo); } else - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else throw uno::RuntimeException(); @@ -1079,7 +1079,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) } } else - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } else throw uno::RuntimeException(); @@ -2510,9 +2510,9 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); switch(pEntry->nWID) { @@ -2585,7 +2585,7 @@ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) - throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); Any aRet; switch(pEntry->nWID) diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 0c929cb60f35..a57b4d5075af 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -549,7 +549,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); sal_Bool bVal = sal_False; if(aValue.getValueType() == ::getBooleanCppuType()) bVal = *(sal_Bool*)aValue.getValue(); @@ -570,7 +570,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A }; } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -606,7 +606,7 @@ SET_UINT16: }; } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); return aRet; } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 6bb99d715d93..77303cb6251d 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -996,7 +996,7 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp } else { - throw beans::UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + sPropertyName, static_cast<OWeakObject *>(this) ); + throw beans::UnknownPropertyException( OUString("unknown property: ") + sPropertyName, static_cast<OWeakObject *>(this) ); } return aRet; @@ -1262,7 +1262,7 @@ SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, sal_Bool bConditional) : case SFX_STYLE_FAMILY_CHAR: { nMapId = PROPERTY_MAP_CHAR_STYLE; - aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "CharacterStyles" ) ) ); + aAny = xFamilies->getByName ( OUString( "CharacterStyles" ) ); // Get the Frame family (and keep it for later) aAny >>= mxStyleFamily; } @@ -1270,20 +1270,20 @@ SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, sal_Bool bConditional) : case SFX_STYLE_FAMILY_PARA: { nMapId = bIsConditional ? PROPERTY_MAP_CONDITIONAL_PARA_STYLE : PROPERTY_MAP_PARA_STYLE; - aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ParagraphStyles" ) ) ); + aAny = xFamilies->getByName ( OUString( "ParagraphStyles" ) ); // Get the Frame family (and keep it for later) aAny >>= mxStyleFamily; - aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Standard" ) ) ); + aAny = mxStyleFamily->getByName ( OUString( "Standard" ) ); aAny >>= mxStyleData; } break; case SFX_STYLE_FAMILY_PAGE: { nMapId = PROPERTY_MAP_PAGE_STYLE; - aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "PageStyles" ) ) ); + aAny = xFamilies->getByName ( OUString( "PageStyles" ) ); // Get the Frame family (and keep it for later) aAny >>= mxStyleFamily; - aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Standard" ) ) ); + aAny = mxStyleFamily->getByName ( OUString( "Standard" ) ); aAny >>= mxStyleData; } break; @@ -2110,9 +2110,9 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl( if(!pEntry || (!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS)))) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if(aBaseImpl.mxNewBase.is()) { lcl_SetStyleProperty(*pEntry, *pPropSet, pValues[nProp], aBaseImpl, @@ -2198,7 +2198,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, sal_Int8 nBin = 0; aRet >>= nBin; if ( nBin == -1 ) - aRet <<= OUString ( RTL_CONSTASCII_USTRINGPARAM ( "[From printer settings]" ) ); + aRet <<= OUString( "[From printer settings]" ); else { SfxPrinter *pPrinter = pDoc->getPrinter( false ); @@ -2378,7 +2378,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp]); if(!pEntry || (!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS)))) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if(pBasePool) { if(!pBase) @@ -2431,7 +2431,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( if (bExcept ) { uno::RuntimeException aExcept; - aExcept.Message = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "No default value for: " ) ) + pNames[nProp]; + aExcept.Message = OUString( "No default value for: " ) + pNames[nProp]; throw aExcept; } } @@ -2457,11 +2457,11 @@ uno::Sequence< uno::Any > SwXStyle::getPropertyValues( } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } return aValues; @@ -2585,7 +2585,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates( const String& rPropName = pNames[i]; const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( rPropName); if(!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); if( FN_UNO_NUM_RULES == pEntry->nWID || FN_UNO_FOLLOW_STYLE == pEntry->nWID ) { @@ -2706,11 +2706,11 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >& { const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] ); if( !pEntry ) - throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException ( OUString( "Property is unknown: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nWID == FN_UNO_FOLLOW_STYLE || pEntry->nWID == FN_UNO_NUM_RULES ) - throw uno::RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Cannot reset: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException ( OUString( "Cannot reset: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY ) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertiesToDefault: property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "setPropertiesToDefault: property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if( pEntry->nWID == RES_PARATR_OUTLINELEVEL ) static_cast<SwTxtFmtColl*>(pTargetFmt)->DeleteAssignmentToListLevelOfOutlineStyle(); @@ -2869,7 +2869,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::getPropertyDefaults( const uno::Seq { const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[i] ); if ( !pEntry ) - throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException ( OUString( "Unknown property: " ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) ); if (pEntry->nWID >= RES_UNKNOWNATR_END) { @@ -3022,9 +3022,9 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( { const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] ); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if(GetBasePool()) { @@ -3258,7 +3258,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( { const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] ); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if(GetBasePool()) { @@ -3467,11 +3467,11 @@ uno::Sequence< uno::Any > SwXPageStyle::getPropertyValues( } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } return aValues; @@ -3967,7 +3967,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( const String& rPropName = pNames[i]; const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName); if(!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); else if ( RES_TXTATR_AUTOFMT == pEntry->nWID || RES_AUTO_STYLE == pEntry->nWID ) { OUString sName(StylePool::nameOf( pSet )); @@ -3993,11 +3993,11 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( } catch (beans::UnknownPropertyException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } catch (lang::WrappedTargetException &) { - throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) ); } return aValues; @@ -4080,7 +4080,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( const String& rPropName = pNames[i]; const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName); if(!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); pStates[i] = pPropSet->getPropertyState(*pEntry, rSet ); } return aRet; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index b0e8b042b171..02eaaaaefd50 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1349,9 +1349,9 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, m_pPropSet->getPropertyMap().getByName(rPropertyName); SwDoc* pDoc = pFmt->GetDoc(); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); switch(pEntry->nWID) { @@ -1408,7 +1408,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw( const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); switch(pEntry->nWID) { @@ -1724,7 +1724,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) th { SolarMutexGuard aGuard; if (Count <= 0) - throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal first argument: needs to be > 0" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "Illegal first argument: needs to be > 0" ), static_cast < cppu::OWeakObject * > ( this ) ); sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1772,7 +1772,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); pTblCrsr->MakeBoxSels(); SwDoc* pDoc = pUnoCrsr->GetDoc(); switch(pEntry->nWID ) @@ -1813,7 +1813,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } @@ -1872,7 +1872,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } return aRet; } @@ -2293,7 +2293,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex { // attachToRange must only be called once if(!bIsDescriptor) /* already attached ? */ - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "SwXTextTable: already attached to range." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "SwXTextTable: already attached to range." ), static_cast < cppu::OWeakObject * > ( this ) ); uno::Reference<XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY); SwXTextRange* pRange = 0; @@ -3037,7 +3037,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, if(pFmt) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(0xFF == pEntry->nMemberId) { @@ -3279,7 +3279,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be if(pFmt) { if (!pEntry) - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(0xFF == pEntry->nMemberId) { @@ -3860,7 +3860,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); SwDoc* pDoc = pTblCrsr->GetDoc(); { @@ -3959,7 +3959,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } } @@ -4040,7 +4040,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be } } else - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } return aRet; } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 0aafea97bd45..8d3b8c93b76a 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2527,7 +2527,7 @@ throw (uno::RuntimeException) if (::sw::XTextRangeToSwPaM(aPam, xTextPosition)) { if ( !aPam.GetNode()->GetTxtNode() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Invalid text range") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Invalid text range"), uno::Reference< uno::XInterface >() ); SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent(); @@ -2626,8 +2626,8 @@ public: SwFrmFmt & GetHeadFootFmtOrThrow() { SwFrmFmt *const pFmt( GetHeadFootFmt() ); if (!pFmt) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXHeadFootText: disposed or invalid")), 0); + throw uno::RuntimeException(OUString( + "SwXHeadFootText: disposed or invalid"), 0); } return *pFmt; } diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 8c062b656c65..0db34bb5748f 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -285,7 +285,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for paper tray bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; - aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) ); + aPaperTrayOpt.maGroupHint = rtl::OUString( "OptionsPageOptGroup" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox", "PrintPaperFromSetup", @@ -294,7 +294,7 @@ SwPrintUIOptions::SwPrintUIOptions( // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); aPrintRangeOpt.mbInternalOnly = sal_True; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aLocalizedStrings.GetString(26)), rtl::OUString(), @@ -308,15 +308,15 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< rtl::OUString > aWidgetIds( 3 ); aChoices[0] = aLocalizedStrings.GetString( 27 ); aChoicesDisabled[0] = sal_False; - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aLocalizedStrings.GetString( 28 ); aChoicesDisabled[1] = sal_False; - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printpages"; aChoices[2] = aLocalizedStrings.GetString( 29 ); aChoicesDisabled[2] = sal_Bool(! bHasSelection); - aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); + aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselection"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), aHelpIds, aPrintRangeName, @@ -331,7 +331,7 @@ SwPrintUIOptions::SwPrintUIOptions( aPageRangeOpt); // print content selection vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; - aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) ); + aContentsOpt.maGroupHint = rtl::OUString( "JobPage" ); m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", rtl::OUString(aLocalizedStrings.GetString(12)), rtl::OUString(), aContentsOpt); // create a list box for notes content @@ -342,14 +342,14 @@ SwPrintUIOptions::SwPrintUIOptions( aChoices[2] = aLocalizedStrings.GetString( 15 ); aChoices[3] = aLocalizedStrings.GetString( 16 ); aHelpIds.realloc( 2 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ) ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ) ); - vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), 0, sal_False ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); + vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( "PrintProspect" ), 0, sal_False ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", aLocalizedStrings.GetString( 17 ), aHelpIds, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintAnnotationMode" ) ), + rtl::OUString( "PrintAnnotationMode" ), aChoices, nPrintPostIts, uno::Sequence< sal_Bool >(), @@ -357,7 +357,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create subsection for Page settings vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt; - aPageSetOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aPageSetOpt.maGroupHint = rtl::OUString( "LayoutPage" ); if (!bWeb) { @@ -368,7 +368,7 @@ SwPrintUIOptions::SwPrintUIOptions( aRLChoices[1] = aLocalizedStrings.GetString( 20 ); aRLChoices[2] = aLocalizedStrings.GetString( 21 ); uno::Sequence< rtl::OUString > aRLHelp( 1 ); - aRLHelp[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ) ); + aRLHelp[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); // create a choice option for all/left/right pages // 0 : all pages (left & right) // 1 : left pages @@ -405,8 +405,8 @@ SwPrintUIOptions::SwPrintUIOptions( aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 ); - aBRTLHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ) ); - aBrochureRTLOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aBRTLHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); + aBrochureRTLOpt.maGroupHint = rtl::OUString( "LayoutPage" ); // RTL brochure choices // 0 : left-to-right // 1 : right-to-left @@ -414,7 +414,7 @@ SwPrintUIOptions::SwPrintUIOptions( m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection", rtl::OUString(), aBRTLHelpIds, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ), + rtl::OUString( "PrintProspectRTL" ), aBRTLChoices, nBRTLChoice, uno::Sequence< sal_Bool >(), @@ -501,7 +501,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea bool bChanged = processProperties( i_rNewProp ); uno::Reference< awt::XDevice > xRenderDevice; - uno::Any aVal( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) ); + uno::Any aVal( getValue( rtl::OUString( "RenderDevice" ) ) ); aVal >>= xRenderDevice; OutputDevice* pOut = 0; diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 7a477c7bd709..3058f06f45b9 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -135,7 +135,7 @@ sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < co try { sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg ); - bRet = rStg->isStreamElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")) ); + bRet = rStg->isStreamElement( ::rtl::OUString("content.xml") ); if ( bRet ) bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) ); } diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 4c4e8cccf50c..2a8ae2e5c77c 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -137,14 +137,14 @@ void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUS uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")), uno::makeAny( rCode ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")), uno::makeAny( rName ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")), uno::makeAny( sal_Bool(bMayScript) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletDocBase")), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletCode"), uno::makeAny( rCode ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletName"), uno::makeAny( rName ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletDocBase"), uno::makeAny( sDocBase ) ); if ( !rCodeBase.isEmpty() ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( rCodeBase ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) ); else - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( sDocBase ) ); } } #ifdef SOLAR_JAVA @@ -185,7 +185,7 @@ void SwApplet_Impl::FinishApplet() { uno::Sequence < beans::PropertyValue > aProps; aCommandList.FillSequence( aProps ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")), uno::makeAny( aProps ) ); + xSet->setPropertyValue( ::rtl::OUString("AppletCommands"), uno::makeAny( aProps ) ); } } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index a167fc8c670d..e68f00782f81 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -114,7 +114,7 @@ void SwHTMLParser::EndScript() if( aBasicLib.Len() ) aLibName = aBasicLib; else - aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); + aLibName = ::rtl::OUString("Standard"); // get module library container Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 2973f6144cf4..42e925a754e6 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -476,7 +476,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY ); uno::Any aTmp = xFormPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); + OUString("Name") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -488,7 +488,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ); + OUString("TargetURL") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -501,7 +501,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitMethod")) ); + OUString("SubmitMethod") ); if( aTmp.getValueType() == ::getCppuType((const form::FormSubmitMethod*)0) ) { form::FormSubmitMethod eMethod = @@ -514,7 +514,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } } aTmp = xFormPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitEncoding")) ); + OUString("SubmitEncoding") ); if( aTmp.getValueType()==::getCppuType((const form::FormSubmitEncoding*)0) ) { form::FormSubmitEncoding eEncType = @@ -540,7 +540,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")) ); + OUString("TargetFrame") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -596,7 +596,7 @@ void SwHTMLWriter::OutHiddenControls( *(uno::Reference< form::XFormComponent > *)aTmp.getValue(); uno::Reference< beans::XPropertySet > xPropSet( xFC, uno::UNO_QUERY ); - OUString sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")); + OUString sPropName = OUString("ClassId"); if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) continue; @@ -615,7 +615,7 @@ void SwHTMLWriter::OutHiddenControls( .append(OOO_STRING_SVTOOLS_HTML_IT_hidden); aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); + OUString("Name") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -627,7 +627,7 @@ void SwHTMLWriter::OutHiddenControls( sOut.append('\"'); } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")) ); + OUString("HiddenValue") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -753,7 +753,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rtl::OStringBuffer sOptions; sal_Bool bEmptyValue = sal_False; uno::Any aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")) ); + OUString("ClassId") ); sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue(); sal_uInt32 nFrmOpts = HTML_FRMOPTS_CONTROL; switch( nClassId ) @@ -763,7 +763,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, eType = (form::FormComponentType::CHECKBOX == nClassId ? TYPE_CHECKBOX : TYPE_RADIO); aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")) ); + OUString("DefaultState") ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && STATE_NOCHECK != *(sal_Int16*) aTmp.getValue() ) { @@ -771,7 +771,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")) ); + OUString("RefValue") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) ) { @@ -787,7 +787,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { form::FormButtonType eButtonType = form::FormButtonType_PUSH; aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonType")) ); + OUString("ButtonType") ); if( aTmp.getValueType() == ::getCppuType((const form::FormButtonType*)0) ) eButtonType = *( form::FormButtonType*)aTmp.getValue(); @@ -806,7 +806,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ); + OUString("Label") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -820,7 +820,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rHTMLWrt.OutNewLine( sal_True ); eTag = TAG_SELECT; aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Dropdown")) ); + OUString("Dropdown") ); if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { @@ -835,7 +835,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("MultiSelection")) ); + OUString("MultiSelection") ); if( aTmp.getValueType() == ::getBooleanCppuType() && *(sal_Bool*)aTmp.getValue() ) { @@ -878,14 +878,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HScroll")) ); + OUString("HScroll") ); if( aTmp.getValueType() == ::getVoidCppuType() || (aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue()) ) { const sal_Char *pWrapStr = 0; aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HardLineBreaks")) ); + OUString("HardLineBreaks") ); pWrapStr = (aTmp.getValueType() == ::getBooleanCppuType() && *(sal_Bool*)aTmp.getValue()) ? OOO_STRING_SVTOOLS_HTML_WW_hard @@ -913,7 +913,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")) ); + OUString("MaxTextLen") ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && *(sal_Int16*) aTmp.getValue() != 0 ) { @@ -975,7 +975,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, append('=').append(TypeNames[eType]); } - aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); + aTmp = xPropSet->getPropertyValue( OUString("Name") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -987,7 +987,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut.append('\"'); } - aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")) ); + aTmp = xPropSet->getPropertyValue( OUString("Enabled") ); if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { @@ -1008,7 +1008,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( TYPE_IMAGE == eType ) { aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")) ); + OUString("ImageURL") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -1050,7 +1050,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) ); + OUString("TabIndex") ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) ) { sal_Int16 nTabIndex = *(sal_Int16*) aTmp.getValue(); @@ -1097,7 +1097,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor")); + sPropName = OUString("TextColor"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1107,7 +1107,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")); + sPropName = OUString("FontHeight"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1119,7 +1119,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxFontHeightItem( sal_Int16(nHeight * 20.), 100, RES_CHRATR_FONTSIZE ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")); + sPropName = OUString("FontName"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1133,7 +1133,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( !bEdit || aFName != aFixedFont.GetName() ) { FontFamily eFamily = FAMILY_DONTKNOW; - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily")); + sPropName = OUString("FontFamily"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1145,7 +1145,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontWeight")); + sPropName = OUString("FontWeight"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1157,7 +1157,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxWeightItem( eWeight, RES_CHRATR_WEIGHT ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontSlant")); + sPropName = OUString("FontSlant"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1168,7 +1168,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxPostureItem( eItalic, RES_CHRATR_POSTURE ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontUnderline")); + sPropName = OUString("FontUnderline"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1181,7 +1181,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxUnderlineItem( eUnderline, RES_CHRATR_UNDERLINE ) ); } } - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontStrikeout")); + sPropName = OUString("FontStrikeout"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1208,7 +1208,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( TAG_SELECT == eTag ) { aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("StringItemList")) ); + OUString("StringItemList") ); if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) { rHTMLWrt.IncIndentLevel(); // der Inhalt von Select darf @@ -1220,7 +1220,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const OUString *pValues = 0; sal_Int32 nValCnt = 0; aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")) ); + OUString("ListSource") ); uno::Sequence<OUString> aValList; if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) { @@ -1230,7 +1230,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } uno::Any aSelTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSelection")) ); + OUString("DefaultSelection") ); const sal_Int16 *pSels = 0; sal_Int32 nSel = 0; sal_Int32 nSelCnt = 0; @@ -1292,7 +1292,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, // werden! String sVal; aTmp = xPropSet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")) ); + OUString("DefaultText") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -1315,7 +1315,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { - aTmp = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))); + aTmp = xPropSet->getPropertyValue(OUString("Label")); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 91a48450dc46..319a12c1b41f 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -417,15 +417,15 @@ void SwHTMLParser::InsertEmbed() if ( xSet.is() ) { if( bHasURL ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), uno::makeAny( ::rtl::OUString( aURL ) ) ); if( bHasType ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")), + xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"), uno::makeAny( ::rtl::OUString( aType ) ) ); uno::Sequence < beans::PropertyValue > aProps; aCmdLst.FillSequence( aProps ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")), uno::makeAny( aProps ) ); + xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aProps ) ); } } @@ -887,23 +887,23 @@ void SwHTMLParser::InsertFloatingFrame() sal_Bool bHasBorder = aFrameDesc.HasFrameBorder(); Size aMargin = aFrameDesc.GetMargin(); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")), uno::makeAny( ::rtl::OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")), uno::makeAny( aName ) ); + xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), uno::makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), uno::makeAny( bHasBorder ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), uno::makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), uno::makeAny( sal_Int32( aMargin.Height() ) ) ); } } @@ -1023,7 +1023,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, ::rtl::OUString aStr; String aURL; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("PluginURL") ); if( (aAny >>= aStr) && !aStr.isEmpty() ) { aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), @@ -1040,7 +1040,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } ::rtl::OUString aType; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") ); if( (aAny >>= aType) && !aType.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type) @@ -1072,7 +1072,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // CODEBASE ::rtl::OUString aCd; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") ); if( (aAny >>= aCd) && !aCd.isEmpty() ) { String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) ); @@ -1088,7 +1088,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // CODE ::rtl::OUString aClass; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCode") ); aAny >>= aClass; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code) .append("=\""); @@ -1098,7 +1098,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // NAME ::rtl::OUString aAppletName; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletName") ); aAny >>= aAppletName; if( !aAppletName.isEmpty() ) { @@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } sal_Bool bScript = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") ); aAny >>= bScript; if( bScript ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript); @@ -1149,7 +1149,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // und ein </APPLET> schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); aAny >>= aProps; SvCommandList aCommands; @@ -1208,7 +1208,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // fuer Plugins die Parameter als Optionen schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") ); aAny >>= aProps; SvCommandList aCommands; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 83b4acabd85b..d5d46ac144f6 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -361,7 +361,7 @@ sal_Int32 ReadThroughComponent( uno::Reference <beans::XPropertySet > xProps( xStream, uno::UNO_QUERY ); Any aAny = xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); + OUString("Encrypted") ); bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && *(sal_Bool *)aAny.getValue(); @@ -699,7 +699,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW ); beans::NamedValue aLateInitSettings( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LateInitSettings" ) ), + ::rtl::OUString( "LateInitSettings" ), makeAny( xLateInitSettings ) ); @@ -732,19 +732,19 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con OUString *pSeq = aFamiliesSeq.getArray(); if( aOpt.IsFrmFmts() ) // SFX_STYLE_FAMILY_FRAME; - *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")); + *pSeq++ = OUString("FrameStyles"); if( aOpt.IsPageDescs() ) // SFX_STYLE_FAMILY_PAGE; - *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")); + *pSeq++ = OUString("PageStyles"); if( aOpt.IsTxtFmts() ) { // (SFX_STYLE_FAMILY_CHAR|SFX_STYLE_FAMILY_PARA); - *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles")); - *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles")); + *pSeq++ = OUString("CharacterStyles"); + *pSeq++ = OUString("ParagraphStyles"); } if( aOpt.IsNumRules() ) // SFX_STYLE_FAMILY_PSEUDO; - *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles")); + *pSeq++ = OUString("NumberingStyles"); OUString sStyleInsertModeFamilies( RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeFamilies")); @@ -815,12 +815,12 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con } else { - StreamPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName")); + StreamPath = ::rtl::OUString("dummyObjectName"); } if( !StreamPath.isEmpty() ) { - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, makeAny( StreamPath ) ); } } @@ -852,13 +852,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con { const sal_Bool bShapePositionInHoriL2R = !bOASIS; xInfoSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R")), + OUString("ShapePositionInHoriL2R"), makeAny( bShapePositionInHoriL2R ) ); } { const sal_Bool bTextDocInOOoFileFormat = !bOASIS; xInfoSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("TextDocInOOoFileFormat")), + OUString("TextDocInOOoFileFormat"), makeAny( bTextDocInOOoFileFormat ) ); } diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 6f8b0cd3679f..adb314ea82ed 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -221,9 +221,9 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if ( !aDocHierarchicalName.isEmpty() ) aName = aDocHierarchicalName; else - aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ) ); + aName = ::rtl::OUString( "dummyObjectName" ); - sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); } @@ -292,7 +292,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( pOrigFileName ) { PropertyValue *pProps = aProps.getArray(); - pProps->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FileName") ); + pProps->Name = OUString("FileName"); (pProps++)->Value <<= OUString( *pOrigFileName ); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 1d508071057c..3cb4fb7e0a80 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -362,7 +362,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) sal_Int32 nIndex = 0; Reference < XIndexContainer > xBox = IndexedPropertyValues::create( comphelper::getProcessComponentContext() ); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "Views") ); + pValue[nIndex].Name = OUString( "Views"); pValue[nIndex++].Value <<= Reference < XIndexAccess > ( xBox, UNO_QUERY ); SwDoc *pDoc = getDoc(); @@ -372,16 +372,16 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" ); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaTop") ); + pValue[nIndex].Name = OUString( "ViewAreaTop"); pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Top() ) : rRect.Top(); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaLeft") ); + pValue[nIndex].Name = OUString( "ViewAreaLeft"); pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Left() ) : rRect.Left(); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaWidth") ); + pValue[nIndex].Name = OUString( "ViewAreaWidth"); pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetWidth() ) : rRect.GetWidth(); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaHeight") ); + pValue[nIndex].Name = OUString( "ViewAreaHeight"); pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetHeight() ) : rRect.GetHeight(); // "show redline mode" cannot simply be read from the document @@ -399,11 +399,11 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) } } - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ShowRedlineChanges") ); + pValue[nIndex].Name = OUString( "ShowRedlineChanges"); pValue[nIndex++].Value.setValue( &bShowRedlineChanges, ::getBooleanCppuType() ); sal_Bool bInBrowse = pDoc->get(IDocumentSettingAccess::BROWSE_MODE); - pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "InBrowseMode") ); + pValue[nIndex].Name = OUString( "InBrowseMode"); pValue[nIndex++].Value.setValue( &bInBrowse, ::getBooleanCppuType() ); if ( nIndex < NUM_EXPORTED_VIEW_SETTINGS ) @@ -416,7 +416,7 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps) Reference< XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); if( xFac.is() ) { - Reference< XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY ); + Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); if( xProps.is() ) SvXMLUnitConverter::convertPropertySet( rProps, xProps ); } @@ -521,8 +521,8 @@ void SwXMLExport::_ExportContent() // OOo OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames() @@ -542,8 +542,8 @@ Reference< XInterface > SAL_CALL SwXMLExportOOO_createInstance( OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLStylesExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLStylesExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames() @@ -565,8 +565,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance( OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLContentExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLContentExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames() @@ -588,8 +588,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContentOOO_createInstance( OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLMetaExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLMetaExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames() @@ -609,8 +609,8 @@ Reference< XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance( OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLSettingsExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLSettingsExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames() @@ -631,8 +631,8 @@ Reference< XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance( // OASIS OUString SAL_CALL SwXMLExport_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisExporter" ); } Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames() @@ -652,8 +652,8 @@ Reference< XInterface > SAL_CALL SwXMLExport_createInstance( OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisStylesExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisStylesExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames() @@ -675,8 +675,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance( OUString SAL_CALL SwXMLExportContent_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisContentExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisContentExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames() @@ -699,8 +699,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance( OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisMetaExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisMetaExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames() @@ -720,8 +720,8 @@ Reference< XInterface > SAL_CALL SwXMLExportMeta_createInstance( OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisSettingsExporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisSettingsExporter" ); } Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames() @@ -781,8 +781,8 @@ OUString SAL_CALL SwXMLExport::getImplementationName() return SwXMLExportSettings_getImplementationName(); default: // generic name for 'unknown' cases - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.SwXMLExport" ) ); + return OUString( + "com.sun.star.comp.Writer.SwXMLExport" ); } } diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 205b04600c22..07d81cf9b336 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -919,7 +919,7 @@ OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const { String sServiceName; if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily ) - sServiceName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle") ); + sServiceName = OUString("com.sun.star.style.FrameStyle"); else sServiceName = SvXMLStylesContext::GetServiceName( nFamily ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 558fbb70ab2f..3adac9ab2faa 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1094,7 +1094,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xFac.is() ) return; - Reference< XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY ); + Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); if( !xProps.is() ) return; @@ -1294,26 +1294,26 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC sal_Int16 nTmp = document::PrinterIndependentLayout::DISABLED; aAny <<= nTmp; xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("PrinterIndependentLayout") ), + OUString("PrinterIndependentLayout"), aAny ); } if( ! bAddExternalLeading ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("AddExternalLeading")), makeAny( false ) ); + OUString("AddExternalLeading"), makeAny( false ) ); } if( ! bUseFormerLineSpacing ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerLineSpacing")), makeAny( true ) ); + OUString("UseFormerLineSpacing"), makeAny( true ) ); } if( !bUseFormerObjectPositioning ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerObjectPositioning")), makeAny( true ) ); + OUString("UseFormerObjectPositioning"), makeAny( true ) ); } if( !bUseOldNumbering ) @@ -1322,7 +1322,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC sal_Bool bOldNum = true; aAny.setValue(&bOldNum, ::getBooleanCppuType()); xProps->setPropertyValue - (OUString( RTL_CONSTASCII_USTRINGPARAM("UseOldNumbering")), + (OUString("UseOldNumbering"), aAny ); } @@ -1332,27 +1332,26 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC sal_Bool bTmp = true; aAny.setValue(&bTmp, ::getBooleanCppuType()); xProps->setPropertyValue - (OUString( RTL_CONSTASCII_USTRINGPARAM - ("OutlineLevelYieldsNumbering")), + (OUString("OutlineLevelYieldsNumbering"), aAny ); } if( !bAddParaSpacingToTableCells ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("AddParaSpacingToTableCells")), makeAny( false ) ); + OUString("AddParaSpacingToTableCells"), makeAny( false ) ); } if( !bUseFormerTextWrapping ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerTextWrapping")), makeAny( true ) ); + OUString("UseFormerTextWrapping"), makeAny( true ) ); } if( !bConsiderWrapOnObjPos ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("ConsiderTextWrapOnObjPos")), makeAny( false ) ); + OUString("ConsiderTextWrapOnObjPos"), makeAny( false ) ); } // #i47448# @@ -1369,53 +1368,53 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !bIgnoreFirstLineIndentInNumbering && bDocumentPriorSO8 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("IgnoreFirstLineIndentInNumbering")), makeAny( true ) ); + OUString("IgnoreFirstLineIndentInNumbering"), makeAny( true ) ); } // This flag has to be set for all documents < SO8 if ( !bDoNotJustifyLinesWithManualBreak && bDocumentPriorSO8 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotJustifyLinesWithManualBreak")), makeAny( true ) ); + OUString("DoNotJustifyLinesWithManualBreak"), makeAny( true ) ); } // This flag has to be set for all documents < SO8 if ( !bDoNotResetParaAttrsForNumFont && bDocumentPriorSO8 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotResetParaAttrsForNumFont")), makeAny( true ) ); + OUString("DoNotResetParaAttrsForNumFont"), makeAny( true ) ); } if ( !bLoadReadonly ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("LoadReadonly") ), makeAny( false ) ); + OUString("LoadReadonly"), makeAny( false ) ); } // This flag has to be set for all documents < SO8 if ( !bDoNotCaptureDrawObjsOnPage && bDocumentPriorSO8 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotCaptureDrawObjsOnPage") ), makeAny( true ) ); + OUString("DoNotCaptureDrawObjsOnPage"), makeAny( true ) ); } // This flag has to be set for all documents < SO8 if ( !bClipAsCharacterAnchoredWriterFlyFrames && bDocumentPriorSO8 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("ClipAsCharacterAnchoredWriterFlyFrames") ), makeAny( true ) ); + OUString("ClipAsCharacterAnchoredWriterFlyFrames"), makeAny( true ) ); } if ( !bUnixForceZeroExtLeading ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UnxForceZeroExtLeading") ), makeAny( true ) ); + OUString("UnxForceZeroExtLeading"), makeAny( true ) ); } if ( !bUseOldPrinterMetrics ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UseOldPrinterMetrics") ), makeAny( true ) ); + OUString("UseOldPrinterMetrics"), makeAny( true ) ); } // Old LO versions had 66 as the value for small caps percentage, later changed to 80. @@ -1425,25 +1424,25 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if ( !bSmallCapsPercentage66 ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("SmallCapsPercentage66") ), makeAny( true ) ); + OUString("SmallCapsPercentage66"), makeAny( true ) ); } if ( !bTabOverflow ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("TabOverflow") ), makeAny( false ) ); + OUString("TabOverflow"), makeAny( false ) ); } if ( !bUnbreakableNumberings ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("UnbreakableNumberings") ), makeAny( false ) ); + OUString("UnbreakableNumberings"), makeAny( false ) ); } if ( !bClippedPictures ) { xProps->setPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("ClippedPictures") ), makeAny( false ) ); + OUString("ClippedPictures"), makeAny( false ) ); } if ( !bBackgroundParaOverDrawings ) @@ -1545,8 +1544,8 @@ void SwXMLImport::initialize( OUString SAL_CALL SwXMLImport_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisImporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisImporter" ); } uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames() @@ -1566,8 +1565,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance( OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisStylesImporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisStylesImporter" ); } uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames() @@ -1590,8 +1589,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance( OUString SAL_CALL SwXMLImportContent_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisContentImporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisContentImporter" ); } uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames() @@ -1614,8 +1613,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance( OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisMetaImporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisMetaImporter" ); } uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames() @@ -1635,8 +1634,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance( OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisSettingsImporter" ) ); + return OUString( + "com.sun.star.comp.Writer.XMLOasisSettingsImporter" ); } uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames() @@ -1674,8 +1673,8 @@ OUString SAL_CALL SwXMLImport::getImplementationName() return SwXMLImportSettings_getImplementationName(); default: // generic name for 'unknown' cases - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.SwXMLImport" ) ); + return OUString( + "com.sun.star.comp.Writer.SwXMLImport" ); } } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 70df7066ef84..36b6efebffe7 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -301,35 +301,35 @@ static void lcl_addFrameProperties( return; ::rtl::OUString aURL; - Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) ); + Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); aAny >>= aURL; ::rtl::OUString aName; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName"))); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName")); aAny >>= aName; sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll"))); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll")); aAny >>= bIsAutoScroll; if ( !bIsAutoScroll ) { - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") ); aAny >>= bIsScrollingMode; } sal_Bool bIsBorderSet, bIsAutoBorder = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") ); aAny >>= bIsAutoBorder; if ( !bIsAutoBorder ) { - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") ); aAny >>= bIsBorderSet; } sal_Int32 nWidth, nHeight; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") ); aAny >>= nWidth; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") ); aAny >>= nHeight; if( !bIsAutoScroll ) @@ -551,27 +551,27 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) ); + Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") ); aAny2 >>= aStr; if (!aStr.isEmpty() ) lcl_addURL(rXMLExport, aStr); - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletName") ); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCode") ); aAny2 >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); sal_Bool bScript = sal_False; - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") ); aAny2 >>= bScript; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE ); uno::Sequence < beans::PropertyValue > aProps; - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); aAny2 >>= aProps; sal_Int32 i = aProps.getLength(); @@ -598,11 +598,11 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")) ); + Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginURL") ); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") ); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); @@ -617,12 +617,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) ); + Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) ); + aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameName") ); aAny2 >>= aStr; if (!aStr.isEmpty()) @@ -656,7 +656,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( sURL += rOLEObj.GetCurrentPersistName(); if ( ( rXMLExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?oasis=false" ) ); + sURL += ::rtl::OUString( "?oasis=false" ); rXMLExport.AddEmbeddedObjectAsBase64( sURL ); } @@ -667,7 +667,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); aAny >>= aProps; sal_Int32 i = aProps.getLength(); @@ -693,7 +693,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")) ); + aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") ); aAny >>= aProps; sal_Int32 i = aProps.getLength(); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 7f59deb0a96a..e2f5b0d0e74c 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -572,7 +572,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext()); uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 ); - aMediaDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aMediaDescriptor[0].Name = ::rtl::OUString("URL"); aMediaDescriptor[0].Value <<= ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() ) { @@ -581,7 +581,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( if ( xInteraction.is() ) { aMediaDescriptor.realloc( 2 ); - aMediaDescriptor[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ); + aMediaDescriptor[1].Name = ::rtl::OUString( "InteractionHandler" ); aMediaDescriptor[1].Value <<= xInteraction; } } @@ -718,10 +718,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( if ( xSet.is() ) { if( bValidURL ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), makeAny( ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); if( bValidMimeType ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")), + xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"), makeAny( ::rtl::OUString( rMimeType ) ) ); } @@ -848,31 +848,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")), + xSet->setPropertyValue( ::rtl::OUString("FrameURL"), makeAny( ::rtl::OUString( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")), + xSet->setPropertyValue( ::rtl::OUString("FrameName"), makeAny( ::rtl::OUString( rName ) ) ); if ( eScrollMode == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) ); if ( bIsBorderSet ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), makeAny( bHasBorder ) ); else - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoBorder"), makeAny( sal_True ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), makeAny( sal_Int32( aMargin.Height() ) ) ); } @@ -942,7 +942,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin( } catch ( uno::Exception& ) { - aParaName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")); + aParaName = ::rtl::OUString("PluginCommands"); try { xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) ); diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index d16452fa5f77..d6dbd72af0ce 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -152,17 +152,17 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) using namespace ::com::sun::star::i18n::ScriptType; - Any aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))); + Any aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), LATIN); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE)); - aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK"))); + aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CJK")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), ASIAN); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE)); - aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL"))); + aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CTL")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), COMPLEX); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE)); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index b454fb304553..9ea1aa725171 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1003,7 +1003,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RtfOutline")); + aArgs[0].Name = ::rtl::OUString("RtfOutline"); aArgs[0].Value <<= aSeq; xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs ); } @@ -1070,7 +1070,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RtfOutline")); + aArgs[0].Name = ::rtl::OUString("RtfOutline"); aArgs[0].Value <<= aSeq; xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs ); } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index a769e3a4d52f..d7ceaf4798e7 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -309,7 +309,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) uno::Reference< beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; ::rtl::OUString aUIName; - xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName; + xInfo->getPropertyValue( ::rtl::OUString("DisplayName") ) >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 074d23cab9f2..6919cf17fc0a 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -216,8 +216,8 @@ SwModule::GetScannerManager() m_xScannerManager = uno::Reference< scanner::XScannerManager2 >( xMgr->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.scanner.ScannerManager")) ), + rtl::OUString( + "com.sun.star.scanner.ScannerManager") ), uno::UNO_QUERY ); } } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 66a48ff9108f..d5a1f59dbb81 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -576,7 +576,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet) // get Productname and -version rtl::OUString sWithoutVersion( utl::ConfigManager::getProductName() ); rtl::OUString sComplete( - sWithoutVersion + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + + sWithoutVersion + rtl::OUString(" ") + utl::ConfigManager::getProductVersion() ); SvObjectServerList aObjS; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 4364a6d49277..d10e27773c90 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -840,7 +840,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, xMailDispatcher.set( new MailDispatcher(rMergeDescriptor.xSmtpServer)); if(!rMergeDescriptor.bSendAsAttachment && rMergeDescriptor.bSendAsHTML) { - sBodyMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/html; charset=")); + sBodyMimeType = ::rtl::OUString("text/html; charset="); sBodyMimeType += ::rtl::OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); @@ -848,7 +848,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, } else sBodyMimeType = - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain; charset=UTF-8; format=flowed")); + ::rtl::OUString("text/plain; charset=UTF-8; format=flowed"); } uno::Reference< XPropertySet > xColumnProp; @@ -1290,7 +1290,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions ); const sal_Int32 nOpts = aOptions.getLength(); aOptions.realloc( nOpts + 1 ); - aOptions[ nOpts ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait")); + aOptions[ nOpts ].Name = rtl::OUString("Wait"); aOptions[ nOpts ].Value <<= sal_True ; // move print options const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 31772621f6ad..71f243269228 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -230,7 +230,7 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa if( xTransferableProperties.is() ) { ::rtl::OUString sURL; - xTransferableProperties->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= sURL; + xTransferableProperties->getPropertyValue( ::rtl::OUString("URL") ) >>= sURL; if(!sURL.isEmpty()) SWUnoHelper::UCB_DeleteFile( sURL ); } diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index ca209521ae49..297e550a5b4f 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -907,7 +907,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1); rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget )); - sPages += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")); + sPages += rtl::OUString(" - "); sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget ); SwWrtShell& rSh = pTargetView->GetWrtShell(); @@ -928,9 +928,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) m_pWizard->enableButtons(WZB_CANCEL, sal_False); uno::Sequence < beans::PropertyValue > aProps( 2 ); - aProps[0]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible")); + aProps[0]. Name = rtl::OUString("MonitorVisible"); aProps[0].Value <<= sal_True; - aProps[1]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages")); + aProps[1]. Name = rtl::OUString("Pages"); aProps[1]. Value <<= sPages; pTargetView->ExecPrint( aProps, false, true ); @@ -1053,7 +1053,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) case MM_DOCTYPE_PDF: { pSfxFlt = pFilterContainer->GetFilter4FilterName( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer_pdf_Export")), + ::rtl::OUString("writer_pdf_Export"), SFX_FILTER_EXPORT); } break; @@ -1304,13 +1304,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) aDesc.sBodyContent = sBody; if(MM_DOCTYPE_HTML == nDocType) { - aDesc.sBodyMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/html; charset=")); + aDesc.sBodyMimeType = ::rtl::OUString("text/html; charset="); aDesc.sBodyMimeType += ::rtl::OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); } else aDesc.sBodyMimeType = - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain; charset=UTF-8; format=flowed")); + ::rtl::OUString("text/plain; charset=UTF-8; format=flowed"); aDesc.sSubject = m_aSubjectED.GetText(); aDesc.sCC = m_sCC; diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index 1a1993a7c4a9..a52850c9e132 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -45,7 +45,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory"))); + aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory")); if ( fp ) return fp(); return 0; diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 58698e8e2d12..80c300e09650 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -708,8 +708,8 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, xWrt->SetShowProgress( sal_False ); #if defined(DEBUGPASTE) - SvFileStream aPasteDebug(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PASTEBUFFER.debug")), STREAM_WRITE|STREAM_TRUNC); + SvFileStream aPasteDebug(rtl::OUString( + "PASTEBUFFER.debug"), STREAM_WRITE|STREAM_TRUNC); SwWriter aDbgWrt( aPasteDebug, *pDoc ); aDbgWrt.Write( xWrt ); #endif @@ -1735,13 +1735,12 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, { xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator")) ), + ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DummyName" ) ), + ::rtl::OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx index 04a3f29b98cc..74180748345a 100644 --- a/sw/source/ui/docvw/AnnotationMenuButton.cxx +++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx @@ -157,7 +157,7 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ ) aFont.SetWeight(WEIGHT_MEDIUM); SetFont( aFont ); DrawText( aRect , - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit Note")), + rtl::OUString("Edit Note"), TEXT_DRAW_CENTER ); SetFont( aOldFont ); } diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 2ed024dd224b..cf1872970ab6 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -263,8 +263,8 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : notifier_ = n; } css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")); - s[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")); + s[0] = rtl::OUString("FontHeight"); + s[1] = rtl::OUString("FontName"); n->addPropertiesChangeListener(s, listener_.get()); } diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index d09a7451a563..810adf4599f7 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -60,7 +60,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : SvtCommandOptions aCmdOpts; if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Print" ) ) ) ) + rtl::OUString( "Print" ) ) ) { aPrinterInfo.Hide(); aPrtSetup.Hide(); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index f7d651154527..9b841752f12d 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -90,14 +90,13 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = utl::OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.Office.DataAccess/Policies/Features/Writer" ) ), + "/org.openoffice.Office.DataAccess/Policies/Features/Writer" ), -1, utl::OConfigurationTreeRoot::CM_READONLY); sal_Bool bDatabaseFields = sal_True; aCfgRoot.getNodeValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseFields"))) >>= bDatabaseFields; + rtl::OUString("DatabaseFields")) >>= bDatabaseFields; if (bDatabaseFields) AddTabPage(TP_FLD_DB, SwFldDBPage::Create, 0); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 7f41f84bb618..018182f80159 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -500,11 +500,11 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) SfxBoolItem aNext(FN_SCROLL_NEXT_PREV, NID_NEXT == nSet); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollNextPrev" )); + aArgs[0].Name = rtl::OUString( "ScrollNextPrev" ); aNext.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ScrollNextPrev" )), + rtl::OUString( ".uno:ScrollNextPrev" ), aArgs ); } return 0; @@ -681,12 +681,12 @@ void SwZoomBox_Impl::Select() { Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PreviewZoom" )); + aArgs[0].Name = rtl::OUString( "PreviewZoom" ); aItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PreviewZoom" )), + rtl::OUString( ".uno:PreviewZoom" ), aArgs ); } diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index b9114e9a2663..a05b9eff04d7 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -387,7 +387,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { try { - uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), uno::UNO_QUERY); + uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); @@ -1129,7 +1129,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog")) + rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -1139,7 +1139,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam.Name = rtl::OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 300938f9dbee..7f76454fe223 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -206,7 +206,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) { try { - uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), uno::UNO_QUERY); + uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 1c2ad1bc5566..59b34c638b20 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -326,7 +326,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) { try { - uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), uno::UNO_QUERY); + uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 367464e38f9e..c836383feeee 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -328,7 +328,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog")) + rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -338,7 +338,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam.Name = rtl::OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 5b1c949b4205..8f7f34f88585 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -252,7 +252,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) { try { - uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), uno::UNO_QUERY); + uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index f2e6fe86c311..231765b699b9 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -109,7 +109,7 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con { // #105638# OJ aTmp <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aTmp ); } } diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index ecd090a0ecc5..26f6e02963bf 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -244,7 +244,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), uno::makeAny( ::rtl::OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } @@ -295,7 +295,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) try { if ( sClassLocation.Len() ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), uno::makeAny( ::rtl::OUString( URIHelper::SmartRel2Abs( @@ -305,7 +305,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( aCommandList.size() ) { aCommandList.FillSequence( aSeq ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")), uno::makeAny( aSeq ) ); + xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aSeq ) ); } } catch (const uno::Exception&) @@ -355,27 +355,27 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aMargin = pMarginItem->GetSize(); if ( pURLItem ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")), uno::makeAny( ::rtl::OUString( pURLItem->GetValue() ) ) ); + xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( pURLItem->GetValue() ) ) ); if ( pNameItem ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")), uno::makeAny( ::rtl::OUString( pNameItem->GetValue() ) ) ); + xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( ::rtl::OUString( pNameItem->GetValue() ) ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), uno::makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); if ( pBorderItem ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")), + xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) ); if ( pMarginItem ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), uno::makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")), + xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), uno::makeAny( sal_Int32( aMargin.Height() ) ) ); } } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 830d5101697a..cb2f82e66a5d 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1244,7 +1244,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { try { - uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), uno::UNO_QUERY); + uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 34a947e463c4..81b553853e3d 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -183,7 +183,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog")) + ::rtl::OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xInit.is() ) @@ -193,10 +193,10 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam1.Name = ::rtl::OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel")); + aParam2.Name = ::rtl::OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -210,7 +210,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) + if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -222,7 +222,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) aSwRect = pFlyFrmFmt->GetAnchoredObj()->GetObjRectWithSpaces(); Rectangle aRect( aSwRect.SVRect() ); Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")), + xDialogProps->setPropertyValue( ::rtl::OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index 4f9be2656206..bde1c3b4dcd5 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -303,16 +303,16 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( rCellRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + ::rtl::OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + ::rtl::OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xDataReceiver->setArguments( aArgs ); } diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 1795eca83e01..89faacbc6f75 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1020,7 +1020,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) uno::Reference< frame::XFrame > xFrame = pVFrame->GetFrame().GetFrameInterface(); uno::Reference< frame::XFrame > xBeamerFrame = xFrame->findFrame( - OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), frame::FrameSearchFlag::CHILDREN); + OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if(xBeamerFrame.is()) { SwDBData aData = pWrtShell->GetDBData(); @@ -1498,56 +1498,56 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe beans::PropertyValue *pValue = rSequence.getArray(); sal_uInt16 nViewID( GetViewFrame()->GetCurViewId()); - pValue->Name = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "ViewId" ) ); - OUStringBuffer sBuffer ( OUString(RTL_CONSTASCII_USTRINGPARAM( "view" ) ) ); + pValue->Name = rtl::OUString( "ViewId" ); + OUStringBuffer sBuffer ( OUString( "view" ) ); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pValue->Value <<= sBuffer.makeStringAndClear(); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ViewLeft" ) ); + pValue->Name = OUString( "ViewLeft" ); pValue->Value <<= TWIP_TO_MM100 ( rRect.Left() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ViewTop" ) ); + pValue->Name = OUString( "ViewTop" ); pValue->Value <<= TWIP_TO_MM100 ( rRect.Top() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "VisibleLeft" ) ); + pValue->Name = OUString( "VisibleLeft" ); pValue->Value <<= TWIP_TO_MM100 ( rVis.Left() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "VisibleTop" ) ); + pValue->Name = OUString( "VisibleTop" ); pValue->Value <<= TWIP_TO_MM100 ( rVis.Top() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "VisibleRight" ) ); + pValue->Name = OUString( "VisibleRight" ); pValue->Value <<= TWIP_TO_MM100 ( bBrowse ? LONG_MIN : rVis.Right() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "VisibleBottom" ) ); + pValue->Name = OUString( "VisibleBottom" ); pValue->Value <<= TWIP_TO_MM100 ( bBrowse ? LONG_MIN : rVis.Bottom() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ZoomType" ) ); + pValue->Name = OUString( "ZoomType" ); const sal_Int16 nZoomType = static_cast< sal_Int16 >(pWrtShell->GetViewOptions()->GetZoomType()); pValue->Value <<= nZoomType; pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ViewLayoutColumns" ) ); + pValue->Name = OUString( "ViewLayoutColumns" ); const sal_Int16 nViewLayoutColumns = static_cast< sal_Int16 >(pWrtShell->GetViewOptions()->GetViewLayoutColumns()); pValue->Value <<= nViewLayoutColumns; pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ViewLayoutBookMode" ) ); + pValue->Name = OUString( "ViewLayoutBookMode" ); const sal_Bool bIsViewLayoutBookMode = pWrtShell->GetViewOptions()->IsViewLayoutBookMode(); pValue->Value.setValue( &bIsViewLayoutBookMode, ::getBooleanCppuType() ); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ZoomFactor" ) ); + pValue->Name = OUString( "ZoomFactor" ); pValue->Value <<= static_cast < sal_Int16 > (pWrtShell->GetViewOptions()->GetZoom()); pValue++;nIndex++; - pValue->Name = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "IsSelectedFrame" ) ); + pValue->Name = OUString( "IsSelectedFrame" ); const sal_Bool bIsSelected = FRMTYPE_NONE == pWrtShell->GetSelFrmType() ? sal_False : sal_True; pValue->Value.setValue ( &bIsSelected, ::getBooleanCppuType() ); nIndex++; diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index b42e90710022..211b55ffdc4e 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -309,7 +309,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { if (rInfo.mnAttributes & PropertyAttribute::READONLY) - throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rtl::OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) ); + throw PropertyVetoException ( OUString( "Property is read-only: " ) + rtl::OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) ); switch( rInfo.mnHandle ) { @@ -706,13 +706,13 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf uno::Sequence< beans::PropertyValue > aInfo; if ( !( rValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ), + ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !mpDocSh->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ), + ::rtl::OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } break; @@ -1223,7 +1223,7 @@ void SwXDocumentSettings::_postGetValues () OUString SAL_CALL SwXDocumentSettings::getImplementationName( ) throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.DocumentSettings")); + return OUString("com.sun.star.comp.Writer.DocumentSettings"); } sal_Bool SAL_CALL SwXDocumentSettings::supportsService( const OUString& ServiceName ) @@ -1244,9 +1244,9 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< OUString > aSeq( 3 ); - aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings") ); - aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.DocumentSettings") ); - aSeq[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.PrintSettings") ); + aSeq[0] = OUString("com.sun.star.document.Settings"); + aSeq[1] = OUString("com.sun.star.text.DocumentSettings"); + aSeq[2] = OUString("com.sun.star.text.PrintSettings"); return aSeq; } diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index a5a598a645cd..ae971d0692c6 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -73,7 +73,7 @@ uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames OUString SAL_CALL SwXAutoTextContainer_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SwXAutoTextContainer" ) ); + return OUString("SwXAutoTextContainer" ); } SwXAutoTextContainer::SwXAutoTextContainer() diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index edf20070499f..7e33fe6a7999 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -37,14 +37,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwTextDocument_getSupportedServiceName // resolved by rtti! uno::Sequence< ::rtl::OUString > aRet ( 1 ); ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.TextDocument" ) ); + pArray[0] = ::rtl::OUString( "com.sun.star.text.TextDocument" ); return aRet; } ::rtl::OUString SAL_CALL SwTextDocument_getImplementationName() throw() { - return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( @@ -66,14 +66,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwWebDocument_getSupportedServiceNames // resolved by rtti! uno::Sequence< ::rtl::OUString > aRet ( 1 ); ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.WebDocument" ) ); + pArray[0] = ::rtl::OUString( "com.sun.star.text.WebDocument" ); return aRet; } ::rtl::OUString SAL_CALL SwWebDocument_getImplementationName() throw() { - return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WebDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Writer.WebDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( @@ -93,14 +93,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNa { uno::Sequence< ::rtl::OUString > aRet ( 1 ); ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.GlobalDocument" ) ); + pArray[0] = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); return aRet; } ::rtl::OUString SAL_CALL SwGlobalDocument_getImplementationName() throw() { - return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.GlobalDocument" ) ); + return ::rtl::OUString( "com.sun.star.comp.Writer.GlobalDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index a089e9064f3f..7e6c4140e590 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -483,7 +483,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( else if (rName.equalsAscii( GetPropName( UNO_NAME_CONNECTION ) )) bOK = rValue >>= xCurConnection; else if (rName.equalsAscii( GetPropName( UNO_NAME_MODEL ) )) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException( OUString( "Property is read-only: " ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_SOURCE_NAME ) )) bOK = rValue >>= aCurDataSourceName; else if (rName.equalsAscii( GetPropName( UNO_NAME_DAD_COMMAND ) )) @@ -495,7 +495,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( bOK = rValue >>= aCurDocumentURL; if (!aCurDocumentURL.isEmpty() && !LoadFromURL_impl( xCurModel, xCurDocSh, aCurDocumentURL, false )) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aCurDocumentURL, static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "Failed to create document from URL: " ) + aCurDocumentURL, static_cast < cppu::OWeakObject * > ( this ) ); } else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_URL ) )) { @@ -503,9 +503,9 @@ uno::Any SAL_CALL SwXMailMerge::execute( if (!aCurOutputURL.isEmpty()) { if (!UCB_IsDirectory(aCurOutputURL)) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "URL does not point to a directory: " ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); if (UCB_IsReadOnlyFileName(aCurOutputURL)) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "URL is read-only: " ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); } } else if (rName.equalsAscii( GetPropName( UNO_NAME_FILE_NAME_PREFIX ) )) @@ -553,10 +553,10 @@ uno::Any SAL_CALL SwXMailMerge::execute( else if (rName.equalsAscii( GetPropName( UNO_NAME_OUT_SERVER_PASSWORD ) )) bOK = rValue >>= sOutServerPassword; else - throw UnknownPropertyException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + throw UnknownPropertyException( OUString( "Property is unknown: " ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); if (!bOK) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "Property type mismatch or property not set: " ) + rName, static_cast < cppu::OWeakObject * > ( this ), 0 ); } // need to translate the selection: the API here requires a sequence of bookmarks, but the MergeNew @@ -596,7 +596,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( if ( !bValid ) { throw IllegalArgumentException( - OUString ( RTL_CONSTASCII_USTRINGPARAM ( "The current 'Selection' does not describe a valid array of bookmarks, relative to the current 'ResultSet'." ) ), + OUString( "The current 'Selection' does not describe a valid array of bookmarks, relative to the current 'ResultSet'." ), static_cast < cppu::OWeakObject * > ( this ), 0 ); @@ -624,7 +624,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( if (aCurDataSourceName.isEmpty() || aCurDataCommand.isEmpty() ) { OSL_FAIL("PropertyValues missing or unset"); - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Either the ResultSet or DataSourceName and DataCommand must be set." ) ), static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "Either the ResultSet or DataSourceName and DataCommand must be set." ), static_cast < cppu::OWeakObject * > ( this ), 0 ); } // @@ -677,7 +677,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( case MailMergeType::FILE : nMergeType = DBMGR_MERGE_MAILFILES; break; case MailMergeType::MAIL : nMergeType = DBMGR_MERGE_MAILING; break; default: - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Invalid value of property:" ) ) + "OutputType", static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "Invalid value of property:" ) + "OutputType", static_cast < cppu::OWeakObject * > ( this ), 0 ); } SwNewDBMgr* pMgr = rSh.GetNewDBMgr(); @@ -722,7 +722,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( else // default empty document without URL { if (aCurOutputURL.isEmpty()) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "OutputURL is not set and can not be obtained." ), static_cast < cppu::OWeakObject * > ( this ) ); } aURLObj.SetSmartURL( aCurOutputURL ); @@ -751,7 +751,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( { pMgr->SetEMailColumn( sAddressFromColumn ); if(sAddressFromColumn.isEmpty()) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Mail address column not set." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "Mail address column not set." ), static_cast < cppu::OWeakObject * > ( this ) ); aMergeDesc.sSaveToFilter = sAttachmentFilter; aMergeDesc.sSubject = sSubject; aMergeDesc.sMailBody = sMailBody; @@ -769,7 +769,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( xInService, sInServerPassword, sOutServerPassword ); if( !aMergeDesc.xSmtpServer.is() || !aMergeDesc.xSmtpServer->isConnected()) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to connect to mail server." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "Failed to connect to mail server." ), static_cast < cppu::OWeakObject * > ( this ) ); } } @@ -796,7 +796,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( } } if ( !bStoredAsTemporary ) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to save temporary file." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "Failed to save temporary file." ), static_cast < cppu::OWeakObject * > ( this ) ); pMgr->SetMergeSilent( sal_True ); // suppress dialogs, message boxes, etc. const SwXMailMerge *pOldSrc = pMgr->GetMailMergeEvtSrc(); @@ -817,7 +817,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( // (in case it wasn't a temporary model, it will be closed in the dtor, at the latest) if (!bSucc) - throw Exception( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Mail merge failed. Sorry, no further information available." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw Exception( OUString( "Mail merge failed. Sorry, no further information available." ), static_cast < cppu::OWeakObject * > ( this ) ); //de-initialize services if(xInService.is() && xInService->isConnected()) @@ -941,7 +941,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( bOK = rValue >>= aText; if (!aText.isEmpty() && !LoadFromURL_impl( xModel, xDocSh, aText, true )) - throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ) ); + throw RuntimeException( OUString( "Failed to create document from URL: " ) + aText, static_cast < cppu::OWeakObject * > ( this ) ); aDocumentURL = aText; } else if (pData == &aOutputURL) @@ -951,9 +951,9 @@ void SAL_CALL SwXMailMerge::setPropertyValue( if (!aText.isEmpty()) { if (!UCB_IsDirectory(aText)) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "URL does not point to a directory: " ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); if (UCB_IsReadOnlyFileName(aText)) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "URL is read-only: " ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); } aOutputURL = aText; } @@ -1008,7 +1008,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( bChanged = true; } if (!bOK) - throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + throw IllegalArgumentException( OUString( "Property type mismatch or property not set: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ), 0 ); if (bChanged) { diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index d02c595d3acf..895cc5b115f5 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -33,13 +33,13 @@ using namespace ::com::sun::star; ::rtl::OUString SAL_CALL SwUnoModule_getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.WriterModule" ) ); + return rtl::OUString( "com.sun.star.comp.Writer.WriterModule" ); } uno::Sequence< rtl::OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.ModuleDispatcher")); + aSeq[0] = ::rtl::OUString("com.sun.star.text.ModuleDispatcher"); return aSeq; } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index a26ab161b5b2..5c3aaf9e1b91 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1713,7 +1713,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic if ( bShape && rServiceName.compareToAscii( "com.sun.star.drawing.temporaryForXMLImportOLE2Shape" ) == 0 ) { - aTmpServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")); + aTmpServiceName = OUString("com.sun.star.drawing.OLE2Shape"); } //here search for the draw service Reference< XInterface > xTmp = SvxFmMSFactory::createInstance(aTmpServiceName); @@ -2128,7 +2128,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) case WID_DOC_VBA_DOCOBJ: { beans::PropertyValue aProp; - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc") ); + aProp.Name = rtl::OUString("ThisWordDoc"); aProp.Value <<= pDocShell->GetModel(); aAny <<= aProp; } @@ -2801,22 +2801,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( sal_Int32 nLen = 2; aRenderer.realloc(2); - aRenderer[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ); + aRenderer[0].Name = OUString( "PageSize" ); aRenderer[0].Value <<= aPageSize; - aRenderer[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageIncludesNonprintableArea" ) ); + aRenderer[1].Name = OUString( "PageIncludesNonprintableArea" ); aRenderer[1].Value <<= sal_True; if (aPreferredPageSize.Width && aPreferredPageSize.Height) { ++nLen; aRenderer.realloc( nLen ); - aRenderer[ nLen - 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreferredPageSize" ) ); + aRenderer[ nLen - 1 ].Name = OUString( "PreferredPageSize" ); aRenderer[ nLen - 1 ].Value <<= aPreferredPageSize; } if (nPrinterPaperTray >= 0) { ++nLen; aRenderer.realloc( nLen ); - aRenderer[ nLen - 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PrinterPaperTray" ) ); + aRenderer[ nLen - 1 ].Name = OUString( "PrinterPaperTray" ); aRenderer[ nLen - 1 ].Value <<= nPrinterPaperTray; } } @@ -2837,22 +2837,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( aRenderer.realloc( nLen ); // put page print settings attribute into render data const sal_Int32 nRow = pPagePrintSettings->GetRow(); - aRenderer[ nRenderDataIdxStart + 0 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpRows" ) ); + aRenderer[ nRenderDataIdxStart + 0 ].Name = OUString( "NUpRows" ); aRenderer[ nRenderDataIdxStart + 0 ].Value <<= ( nRow > 1 ? nRow : 1 ); const sal_Int32 nCol = pPagePrintSettings->GetCol(); - aRenderer[ nRenderDataIdxStart + 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpColumns" ) ); + aRenderer[ nRenderDataIdxStart + 1 ].Name = OUString( "NUpColumns" ); aRenderer[ nRenderDataIdxStart + 1 ].Value <<= ( nCol > 1 ? nCol : 1 ); - aRenderer[ nRenderDataIdxStart + 2 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginLeft" ) ); + aRenderer[ nRenderDataIdxStart + 2 ].Name = OUString( "NUpPageMarginLeft" ); aRenderer[ nRenderDataIdxStart + 2 ].Value <<= pPagePrintSettings->GetLeftSpace(); - aRenderer[ nRenderDataIdxStart + 3 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginRight" ) ); + aRenderer[ nRenderDataIdxStart + 3 ].Name = OUString( "NUpPageMarginRight" ); aRenderer[ nRenderDataIdxStart + 3 ].Value <<= pPagePrintSettings->GetRightSpace(); - aRenderer[ nRenderDataIdxStart + 4 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginTop" ) ); + aRenderer[ nRenderDataIdxStart + 4 ].Name = OUString( "NUpPageMarginTop" ); aRenderer[ nRenderDataIdxStart + 4 ].Value <<= pPagePrintSettings->GetTopSpace(); - aRenderer[ nRenderDataIdxStart + 5 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPageMarginBottom" ) ); + aRenderer[ nRenderDataIdxStart + 5 ].Name = OUString( "NUpPageMarginBottom" ); aRenderer[ nRenderDataIdxStart + 5 ].Value <<= pPagePrintSettings->GetBottomSpace(); - aRenderer[ nRenderDataIdxStart + 6 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpHorizontalSpacing" ) ); + aRenderer[ nRenderDataIdxStart + 6 ].Name = OUString( "NUpHorizontalSpacing" ); aRenderer[ nRenderDataIdxStart + 6 ].Value <<= pPagePrintSettings->GetHorzSpace(); - aRenderer[ nRenderDataIdxStart + 7 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpVerticalSpacing" ) ); + aRenderer[ nRenderDataIdxStart + 7 ].Name = OUString( "NUpVerticalSpacing" ); aRenderer[ nRenderDataIdxStart + 7 ].Value <<= pPagePrintSettings->GetVertSpace(); { Printer* pPrinter = pDocShell->GetDoc()->getPrinter( false ); @@ -2868,7 +2868,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( { aNewPageSize = awt::Size( aPageSize.Height(), aPageSize.Width() ); } - aRenderer[ nRenderDataIdxStart + 8 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "NUpPaperSize" ) ); + aRenderer[ nRenderDataIdxStart + 8 ].Name = OUString( "NUpPaperSize" ); aRenderer[ nRenderDataIdxStart + 8 ].Value <<= aNewPageSize; } } @@ -3158,7 +3158,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( const bool bComplex = 0 != (nScriptTypes & nComplex); if (nScriptTypes < nLatin || nScriptTypes > (nLatin | nAsian | nComplex)) - throw IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nScriptTypes ranges from 1 to 7!")), Reference< XInterface >(), 1); + throw IllegalArgumentException(::rtl::OUString("nScriptTypes ranges from 1 to 7!"), Reference< XInterface >(), 1); if (!pDocShell) throw DisposedException(); SwDoc* pDoc = pDocShell->GetDoc(); diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 00c06be64d87..81061b5a7428 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -946,7 +946,7 @@ void SwXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwWrtShell& rSh = m_pView->GetWrtShell(); if(rSh.HasSelection()) @@ -969,7 +969,7 @@ void SwXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwWrtShell& rSh = m_pView->GetWrtShell(); if(rSh.HasSelection()) @@ -993,7 +993,7 @@ sal_Bool SwXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); const SwWrtShell& rSh = m_pView->GetWrtShell(); bRet = !rSh.HasSelection(); @@ -1011,7 +1011,7 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) throw( un if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) bRet = m_pView->GetWrtShell().Left( CRSR_SKIP_CHARS, bExpand, 1, sal_True ); @@ -1028,7 +1028,7 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand) throw( u if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) bRet = m_pView->GetWrtShell().Right( CRSR_SKIP_CHARS, bExpand, 1, sal_True ); @@ -1048,7 +1048,7 @@ void SwXTextViewCursor::gotoRange( if(m_pView && xRange.is()) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwUnoInternalPaM rDestPam(*m_pView->GetDocShell()->GetDoc()); if (!::sw::XTextRangeToSwPaM(rDestPam, xRange)) @@ -1187,7 +1187,7 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); m_pView->GetWrtShell().SttDoc( bExpand ); } @@ -1201,7 +1201,7 @@ void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); m_pView->GetWrtShell().EndDoc( bExpand ); } @@ -1359,7 +1359,7 @@ uno::Reference< text::XText > SwXTextViewCursor::getText(void) throw( uno::Runt if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwWrtShell& rSh = m_pView->GetWrtShell(); SwPaM* pShellCrsr = rSh.GetCrsr(); @@ -1378,7 +1378,7 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getStart(void) throw( uno if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwWrtShell& rSh = m_pView->GetWrtShell(); SwPaM* pShellCrsr = rSh.GetCrsr(); @@ -1397,7 +1397,7 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd(void) throw( uno:: if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); SwWrtShell& rSh = m_pView->GetWrtShell(); SwPaM* pShellCrsr = rSh.GetCrsr(); @@ -1416,7 +1416,7 @@ OUString SwXTextViewCursor::getString(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); ShellModes eSelMode = m_pView->GetShellMode(); switch(eSelMode) @@ -1446,7 +1446,7 @@ void SwXTextViewCursor::setString(const OUString& aString) throw( uno::RuntimeEx if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); ShellModes eSelMode = m_pView->GetShellMode(); switch(eSelMode) @@ -1604,7 +1604,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw( un if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) bRet = m_pView->GetWrtShell().Down( bExpand, 1, sal_True ); @@ -1621,7 +1621,7 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw( uno: if(m_pView) { if (!IsTextSelection()) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) bRet = m_pView->GetWrtShell().Up( bExpand, 1, sal_True ); @@ -1638,7 +1638,7 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); bRet = m_pView->GetWrtShell().IsAtLeftMargin(); } @@ -1654,7 +1654,7 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine(void) throw( uno::RuntimeException ) if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); bRet = m_pView->GetWrtShell().IsAtRightMargin(sal_True); } @@ -1669,7 +1669,7 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) throw( uno::RuntimeExcep if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); m_pView->GetWrtShell().RightMargin(bExpand, sal_True); } @@ -1683,7 +1683,7 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) throw( uno::RuntimeExc if(m_pView) { if (!IsTextSelection( sal_False )) - throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "no text selection" ), static_cast < cppu::OWeakObject * > ( this ) ); m_pView->GetWrtShell().LeftMargin(bExpand, sal_True); } diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index b4341dca5eb7..3074f0eab5de 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -159,7 +159,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) aViewLayout.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ViewLayout" )); + aArgs[0].Name = rtl::OUString( "ViewLayout" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index 0ec4c783127a..dbe5f9c05409 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -45,8 +45,7 @@ SwVbaAddin::~SwVbaAddin() void SAL_CALL SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } ::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException) @@ -78,7 +77,7 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt rtl::OUString SwVbaAddin::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin")); + return rtl::OUString("SwVbaAddin"); } uno::Sequence< rtl::OUString > @@ -88,7 +87,7 @@ SwVbaAddin::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addin" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Addin" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 1b476d55213d..b72e98837e50 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -82,7 +82,7 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaAddins::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins")); + return rtl::OUString("SwVbaAddins"); } css::uno::Sequence<rtl::OUString> @@ -92,7 +92,7 @@ SwVbaAddins::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addins") ); + sNames[0] = rtl::OUString("ooo.vba.word.Addins"); } return sNames; } diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index a9f9f8df7cfa..018c9214a11e 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -185,7 +185,7 @@ SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) rtl::OUString SwVbaApplication::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication")); + return rtl::OUString("SwVbaApplication"); } uno::Sequence< rtl::OUString > @@ -195,7 +195,7 @@ SwVbaApplication::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Application" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Application" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 38a133b3472f..0d3f165b4985 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -41,14 +41,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R if( pWhere ) { uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange(); - xTextRange->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker + xTextRange->setString( rtl::OUString("x") ); // set marker uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd(); - xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker + xEndMarker->setString( rtl::OUString("x") ); // set marker uno::Reference< text::XText > xText = pWhere->getXText(); mxEntry->applyTo( xEndMarker->getStart() ); uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() ); xTC->goRight( 1, sal_True ); - xTC->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker + xTC->setString( rtl::OUString("") ); // remove marker // remove the blank paragraph if it is a rich text sal_Bool bRich = sal_False; _richtext >>= bRich; @@ -63,12 +63,12 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< text::XTextViewCursor > xTVCursor = word::getXTextViewCursor( xModel ); uno::Reference< text::XTextRange > xCurrentRange( xTC->getEnd(), uno::UNO_QUERY_THROW ); xTVCursor->gotoRange( xCurrentRange, sal_False ); - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete")); + rtl::OUString url = rtl::OUString( ".uno:Delete"); dispatchRequests( xModel,url ); xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False ); } } - xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker + xEndMarker->setString( rtl::OUString("") ); // remove marker xTC = xText->createTextCursorByRange( xEndMarker->getEnd() ); pWhere->setXTextCursor( xTC ); } @@ -78,7 +78,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R rtl::OUString SwVbaAutoTextEntry::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry")); + return rtl::OUString("SwVbaAutoTextEntry"); } uno::Sequence< rtl::OUString > @@ -88,7 +88,7 @@ SwVbaAutoTextEntry::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntry" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.AutoTextEntry" ); } return aServiceNames; } @@ -107,7 +107,7 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any @@ -120,7 +120,7 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaAutoTextEntries::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries")); + return rtl::OUString("SwVbaAutoTextEntries"); } css::uno::Sequence<rtl::OUString> @@ -130,7 +130,7 @@ SwVbaAutoTextEntries::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntries") ); + sNames[0] = rtl::OUString("ooo.vba.word.AutoTextEntries"); } return sNames; } diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 776f583c9edd..0120130fb669 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -46,7 +46,7 @@ SwVbaBookmark::~SwVbaBookmark() void SwVbaBookmark::checkVality() throw ( uno::RuntimeException ) { if( !mbValid ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The bookmark is not valid" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException ) @@ -86,7 +86,7 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException ) rtl::OUString SwVbaBookmark::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark")); + return rtl::OUString("SwVbaBookmark"); } uno::Sequence< rtl::OUString > @@ -96,7 +96,7 @@ SwVbaBookmark::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmark" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Bookmark" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 885da4020e69..aae43bfb1eb5 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -140,7 +140,7 @@ void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (u void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark")) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW ); uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( rName ); rTextRange->getText()->insertTextContent( rTextRange, xBookmark, sal_False ); @@ -207,7 +207,7 @@ SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeExc rtl::OUString SwVbaBookmarks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks")); + return rtl::OUString("SwVbaBookmarks"); } css::uno::Sequence<rtl::OUString> @@ -217,7 +217,7 @@ SwVbaBookmarks::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmarks") ); + sNames[0] = rtl::OUString("ooo.vba.word.Bookmarks"); } return sNames; } diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index f3a38f7b15c1..c6b89b38fa4d 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -142,7 +142,7 @@ private: protected: virtual rtl::OUString getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder")); + return rtl::OUString("SwVbaBorder"); } virtual css::uno::Sequence<rtl::OUString> getServiceNames() @@ -151,7 +151,7 @@ protected: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Border" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Border" ); } return aServiceNames; } @@ -226,12 +226,12 @@ public: break; } default: - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -354,7 +354,7 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim rtl::OUString SwVbaBorders::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders")); + return rtl::OUString("SwVbaBorders"); } uno::Sequence< rtl::OUString > @@ -364,7 +364,7 @@ SwVbaBorders::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Borders" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Borders" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 62d274aff320..4ffbf5d4d232 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -91,7 +91,7 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw ( rtl::OUString SwVbaCell::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCell")); + return rtl::OUString("SwVbaCell"); } uno::Sequence< rtl::OUString > @@ -101,7 +101,7 @@ SwVbaCell::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Cell" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Cell" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 563bf53456da..d70b9cd9b4d5 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -195,7 +195,7 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaCells::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCells")); + return rtl::OUString("SwVbaCells"); } uno::Sequence<rtl::OUString> @@ -205,7 +205,7 @@ SwVbaCells::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Cells") ); + sNames[0] = rtl::OUString("ooo.vba.word.Cells"); } return sNames; } diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index 847a99f0150d..a4a20c3bd597 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -80,7 +80,7 @@ void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, c rtl::OUString SwVbaColumn::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaColumn")); + return rtl::OUString("SwVbaColumn"); } uno::Sequence< rtl::OUString > @@ -90,7 +90,7 @@ SwVbaColumn::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Column" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Column" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index de5d06c1f947..b9a9afb2c195 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -104,11 +104,11 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /* { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -132,7 +132,7 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaColumns::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaColumns")); + return rtl::OUString("SwVbaColumns"); } uno::Sequence<rtl::OUString> @@ -142,7 +142,7 @@ SwVbaColumns::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Columns") ); + sNames[0] = rtl::OUString("ooo.vba.word.Columns"); } return sNames; } diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 846f1777b2d1..547ba47f8f49 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -53,7 +53,7 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) rtl::OUString SwVbaDialog::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog")); + return rtl::OUString("SwVbaDialog"); } uno::Sequence< rtl::OUString > @@ -63,7 +63,7 @@ SwVbaDialog::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialog" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialog" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index 3c834a940557..ac1e5bc5cd87 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -35,7 +35,7 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) rtl::OUString SwVbaDialogs::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs")); + return rtl::OUString("SwVbaDialogs"); } uno::Sequence< rtl::OUString > @@ -45,7 +45,7 @@ SwVbaDialogs::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialogs" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialogs" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index 1ab0203ed6be..fa2402e0adbe 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -243,7 +243,7 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) rtl::OUString SwVbaDocument::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument")); + return rtl::OUString("SwVbaDocument"); } uno::Any SAL_CALL @@ -326,7 +326,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( ::sal_Bool /*_updatestyleson // check this property only in default paragraph style sal_Bool IsAutoHyphenation = sal_False; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation")) ) >>= IsAutoHyphenation; + xParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation; return IsAutoHyphenation; } @@ -334,7 +334,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( ::sal_Bool _autohyphenation ) t { //TODO uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation")), uno::makeAny( _autohyphenation ) ); + xParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) ); } ::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException) @@ -353,7 +353,7 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone* //TODO sal_Int16 nHyphensLimit = 0; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaHyphenationMaxHyphens")) ) >>= nHyphensLimit; + xParaProps->getPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit; return nHyphensLimit; } @@ -361,7 +361,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv { sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit ); uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaHyphenationMaxHyphens")), uno::makeAny( nHyphensLimit ) ); + xParaProps->setPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) ); } void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException) @@ -377,13 +377,13 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintPreview")); + rtl::OUString url = rtl::OUString( ".uno:PrintPreview"); dispatchRequests( mxModel,url ); } void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClosePreview")); + rtl::OUString url = rtl::OUString( ".uno:ClosePreview"); dispatchRequests( mxModel,url ); } @@ -459,7 +459,7 @@ SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } @@ -506,7 +506,7 @@ SwVbaDocument::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Document" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Document" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 7ecd02ecfe87..7640bd1d6558 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -464,7 +464,7 @@ public: virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } + virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString("Value"); } // XHelperInterface virtual rtl::OUString getServiceImplName(); virtual uno::Sequence<rtl::OUString> getServiceNames(); @@ -622,7 +622,7 @@ SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ rtl::OUString SwVbaBuiltInDocumentProperty::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty")); + return rtl::OUString("SwVbaBuiltinDocumentProperty"); } uno::Sequence<rtl::OUString> @@ -632,7 +632,7 @@ SwVbaBuiltInDocumentProperty::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperty" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperty" ); } return aServiceNames; } @@ -747,7 +747,7 @@ uno::Reference< XDocumentProperty > SAL_CALL SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("not supported for Builtin properties") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -776,7 +776,7 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource rtl::OUString SwVbaBuiltinDocumentProperties::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties")); + return rtl::OUString("SwVbaBuiltinDocumentProperties"); } uno::Sequence<rtl::OUString> @@ -786,7 +786,7 @@ SwVbaBuiltinDocumentProperties::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperties" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperties" ); } return aServiceNames; } @@ -914,7 +914,7 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link rtl::OUString SwVbaCustomDocumentProperties::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties")); + return rtl::OUString("SwVbaCustomDocumentProperties"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index d4647404fd63..5e55df3a67c9 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -153,7 +153,7 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm rtl::OUString SwVbaDocuments::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments")); + return rtl::OUString("SwVbaDocuments"); } uno::Sequence<rtl::OUString> @@ -163,7 +163,7 @@ SwVbaDocuments::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Documents") ); + sNames[0] = rtl::OUString("ooo.vba.word.Documents"); } return sNames; } diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index f462360033b0..4e5150fa7dd4 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -54,7 +54,7 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException) rtl::OUString SwVbaField::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaField")); + return rtl::OUString("SwVbaField"); } uno::Sequence<rtl::OUString> @@ -64,7 +64,7 @@ SwVbaField::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Field" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Field" ); } return aServiceNames; } @@ -345,7 +345,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, } else { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() ); @@ -357,7 +357,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException) { - uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.FileName")) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW ); sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT; if( !_text.isEmpty() ) { @@ -382,7 +382,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl } uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FileFormat") ), uno::makeAny( nFileFormat ) ); + xProps->setPropertyValue( rtl::OUString("FileFormat"), uno::makeAny( nFileFormat ) ); return xTextField; } @@ -466,11 +466,11 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { - sFieldService = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.textfield.docinfo.Custom" ) ); + sFieldService = rtl::OUString( "com.sun.star.text.textfield.docinfo.Custom" ); } else if( sFieldService.isEmpty() ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( sFieldService ), uno::UNO_QUERY_THROW ); @@ -479,7 +479,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const { uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); rtl::OUString sDocPropertyName( aDocProperty ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ), uno::makeAny( sDocPropertyName ) ); + xProps->setPropertyValue( rtl::OUString("Name"), uno::makeAny( sDocPropertyName ) ); } return xTextField; @@ -520,7 +520,7 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) rtl::OUString SwVbaFields::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFields")); + return rtl::OUString("SwVbaFields"); } // XEnumerationAccess @@ -537,7 +537,7 @@ SwVbaFields::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Fields" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Fields" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index f4b34f02f668..0dce30854922 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -192,20 +192,20 @@ uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException) void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException) { sal_Bool bBackward = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) ) >>= bBackward; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchBackwards") ) >>= bBackward; return !bBackward; } void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException) { sal_Bool bBackward = !_forward; - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), uno::makeAny( bBackward ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchBackwards"), uno::makeAny( bBackward ) ); } ::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException) @@ -233,76 +233,76 @@ void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeExce ::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchCaseSensitive") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), uno::makeAny( _matchcase ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchWords") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), uno::makeAny( _matchwholeword ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchWords"), uno::makeAny( _matchwholeword ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchRegularExpression") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), uno::makeAny( _matchwildcards ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchsoundslike ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; if( value ) - mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) ) >>= value; + mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarityRelax") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchallwordforms ) ); - mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) ); } uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } sal_Bool SAL_CALL @@ -395,7 +395,7 @@ SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException) rtl::OUString SwVbaFind::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFind")); + return rtl::OUString("SwVbaFind"); } uno::Sequence< rtl::OUString > @@ -405,7 +405,7 @@ SwVbaFind::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Find" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Find" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 6e8f1b3de7c5..5839100993a8 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -129,7 +129,7 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeExcepti rtl::OUString SwVbaFont::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFont")); + return rtl::OUString("SwVbaFont"); } void SAL_CALL @@ -227,7 +227,7 @@ SwVbaFont::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Font" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Font" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index d00b3ce89b6e..2fdc03fbbb7d 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -67,7 +67,7 @@ rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException } else { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return sResult; } @@ -87,7 +87,7 @@ void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( u } else { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } @@ -110,7 +110,7 @@ uno::Any SAL_CALL SwVbaFormField::CheckBox() throw ( uno::RuntimeException ) rtl::OUString SwVbaFormField::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFormField")); + return rtl::OUString("SwVbaFormField"); } uno::Sequence< rtl::OUString > @@ -120,7 +120,7 @@ SwVbaFormField::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.FormField" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.FormField" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index d208b388b87c..a421088d96ea 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -177,7 +177,7 @@ SwVbaFormFields::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaFormFields::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFormFields")); + return rtl::OUString("SwVbaFormFields"); } css::uno::Sequence<rtl::OUString> @@ -187,7 +187,7 @@ SwVbaFormFields::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.FormFields") ); + sNames[0] = rtl::OUString("ooo.vba.word.FormFields"); } return sNames; } diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 8d22b235957e..3dc5bad28821 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -46,7 +46,7 @@ void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException ) rtl::OUString SwVbaFrame::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFrame")); + return rtl::OUString("SwVbaFrame"); } uno::Sequence< rtl::OUString > @@ -56,7 +56,7 @@ SwVbaFrame::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Frame" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Frame" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 80bfacaec345..259584f003d7 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -81,7 +81,7 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaFrames::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFrames")); + return rtl::OUString("SwVbaFrames"); } css::uno::Sequence<rtl::OUString> @@ -91,7 +91,7 @@ SwVbaFrames::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Frames") ); + sNames[0] = rtl::OUString("ooo.vba.word.Frames"); } return sNames; } diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 08aea0473db6..b9387680469f 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -41,7 +41,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Application")); + aInitArgs[ 0 ].Name = rtl::OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -141,7 +141,7 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (un rtl::OUString SwVbaGlobals::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals")); + return rtl::OUString("SwVbaGlobals"); } uno::Sequence< rtl::OUString > @@ -151,7 +151,7 @@ SwVbaGlobals::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Globals" ); } return aServiceNames; } @@ -164,9 +164,9 @@ SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) if ( !bInit ) { rtl::OUString names[] = { - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ), + ::rtl::OUString( "ooo.vba.word.Document" ), // #FIXME #TODO make Application a proper service -// ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ), +// ::rtl::OUString( "ooo.vba.word.Application" ), }; sal_Int32 nWordServices = SAL_N_ELEMENTS( names ); sal_Int32 startIndex = serviceNames.getLength(); diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 89261c1775d5..e13eafda4ce3 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -54,15 +54,15 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno rtl::OUString sPropsNameText; if( mbHeader ) { - sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") ); + sPropsNameText = rtl::OUString("HeaderText"); } else { - sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") ); + sPropsNameText = rtl::OUString("FooterText"); } if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages ) { - sPropsNameText = sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) ); + sPropsNameText = sPropsNameText.concat( rtl::OUString("Left") ); } uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW ); @@ -86,7 +86,7 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) rtl::OUString SwVbaHeaderFooter::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter")); + return rtl::OUString("SwVbaHeaderFooter"); } uno::Sequence< rtl::OUString > @@ -96,7 +96,7 @@ SwVbaHeaderFooter::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 65291bee7a18..15d5e9263c32 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -54,8 +54,8 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared") ); - rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") ); + rtl::OUString aPropIsShared = rtl::OUString("HeaderIsShared"); + rtl::OUString aPropText = rtl::OUString("HeaderText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -64,9 +64,9 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") ); + aPropText = rtl::OUString("HeaderTextLeft"); else - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") ); + aPropText = rtl::OUString("HeaderTextRight"); } uno::Reference< text::XText > xHeaderText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared; + xStyleProps->getPropertyValue( rtl::OUString("HeaderIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); @@ -120,8 +120,8 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared") ); - rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") ); + rtl::OUString aPropIsShared = rtl::OUString("FooterIsShared"); + rtl::OUString aPropText = rtl::OUString("FooterText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -130,9 +130,9 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") ); + aPropText = rtl::OUString("FooterTextLeft"); else - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") ); + aPropText = rtl::OUString("FooterTextRight"); } uno::Reference< text::XText > xFooterText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -169,7 +169,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared; + xStyleProps->getPropertyValue( rtl::OUString("FooterIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index d750bce81503..ec41e33d025f 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -122,7 +122,7 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaHeadersFooters::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaHeadersFooters")); + return rtl::OUString("SwVbaHeadersFooters"); } uno::Sequence<rtl::OUString> @@ -132,7 +132,7 @@ SwVbaHeadersFooters::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.HeadersFooters") ); + sNames[0] = rtl::OUString("ooo.vba.word.HeadersFooters"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 373713cbf2b0..ea7cf40fd5e2 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -68,17 +68,17 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor if( isFirstElement ) { sal_Bool isNumberingRestart = !bContinuePreviousList; - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart") ), uno::makeAny( isNumberingRestart ) ); + xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) ); if( isNumberingRestart ) { sal_Int16 nStartValue = 1; - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStartValue") ), uno::makeAny( nStartValue ) ); + xProps->setPropertyValue( rtl::OUString("NumberingStartValue"), uno::makeAny( nStartValue ) ); } isFirstElement = sal_False; } else { - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart") ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) ); } pListTemplate->applyListTemplate( xProps ); } @@ -86,13 +86,13 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } rtl::OUString SwVbaListFormat::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListFormat")); + return rtl::OUString("SwVbaListFormat"); } uno::Sequence< rtl::OUString > @@ -102,7 +102,7 @@ SwVbaListFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListFormat" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index d80114307ddd..d25cbf0c415f 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -62,7 +62,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A || nIndex == word::WdListGalleryType::wdOutlineNumberGallery ) return uno::makeAny( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) ); } - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -87,7 +87,7 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaListGalleries::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListGalleries")); + return rtl::OUString("SwVbaListGalleries"); } css::uno::Sequence<rtl::OUString> @@ -97,7 +97,7 @@ SwVbaListGalleries::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListGalleries") ); + sNames[0] = rtl::OUString("ooo.vba.word.ListGalleries"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index e8b3967d1bac..b7127f994b6d 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -44,7 +44,7 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeExce rtl::OUString SwVbaListGallery::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListGallery")); + return rtl::OUString("SwVbaListGallery"); } uno::Sequence< rtl::OUString > @@ -54,7 +54,7 @@ SwVbaListGallery::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListGallery" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListGallery" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 3b93b1cd42c8..b18754c0e590 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -39,7 +39,7 @@ SwVbaListLevel::~SwVbaListLevel() ::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException) { sal_Int16 nAlignment = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Adjust") ) ) >>= nAlignment; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust") ) >>= nAlignment; switch( nAlignment ) { case text::HoriOrientation::LEFT: @@ -90,17 +90,17 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno: throw uno::RuntimeException(); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Adjust") ), uno::makeAny( nAlignment ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust"), uno::makeAny( nAlignment ) ); } uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException) @@ -135,8 +135,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException) // indentAt + firstlineindent sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IndentAt") ) ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent") ) ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nResult = nIndentAt + nFirstLineIndent; @@ -148,16 +148,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition ); sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IndentAt") ) ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent") ), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException) { sal_Int16 nNumberingType = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingType") ) ) >>= nNumberingType; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType") ) >>= nNumberingType; switch( nNumberingType ) { case style::NumberingType::CHAR_SPECIAL: @@ -212,7 +212,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } return nNumberingType; @@ -285,11 +285,11 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingType") ), uno::makeAny( nNumberingType ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType"), uno::makeAny( nNumberingType ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException) @@ -306,20 +306,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) ::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException) { sal_Int16 nStartWith = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StartWith") ) ) >>= nStartWith; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith") ) >>= nStartWith; return nStartWith; } void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException) { sal_Int16 nStartWith = (sal_Int16)_startat; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StartWith") ), uno::makeAny( nStartWith ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith"), uno::makeAny( nStartWith ) ); } float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) { sal_Int32 nTabPosition = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ListtabStopPosition") ) ) >>= nTabPosition; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition") ) >>= nTabPosition; return static_cast< float >( Millimeter::getInPoints( nTabPosition ) ); } @@ -327,14 +327,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException) { sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ListtabStopPosition") ), uno::makeAny( nTabPosition ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) ); } float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException) { // indentAt sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IndentAt") ) ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; return static_cast< float >( Millimeter::getInPoints( nIndentAt ) ); } @@ -343,21 +343,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: { sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IndentAt") ) ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent") ) ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent; nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition ); nFirstLineIndent = nAlignedAt - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IndentAt") ), uno::makeAny( nIndentAt ) ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FirstLineIndent") ), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt"), uno::makeAny( nIndentAt ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy= 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LabelFollowedBy") ) ) >>= nLabelFollowedBy; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy") ) >>= nLabelFollowedBy; return nLabelFollowedBy; } @@ -365,13 +365,13 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LabelFollowedBy") ), uno::makeAny( nLabelFollowedBy ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) ); } rtl::OUString SwVbaListLevel::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevel")); + return rtl::OUString("SwVbaListLevel"); } uno::Sequence< rtl::OUString > @@ -381,7 +381,7 @@ SwVbaListLevel::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListLevel" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListLevel" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index 8201c7eb91ff..470e5763cdb9 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) ); } @@ -90,7 +90,7 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaListLevels::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevels")); + return rtl::OUString("SwVbaListLevels"); } css::uno::Sequence<rtl::OUString> @@ -100,7 +100,7 @@ SwVbaListLevels::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListLevels") ); + sNames[0] = rtl::OUString("ooo.vba.word.ListLevels"); } return sNames; } diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index b714196c17fc..485a5278398b 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -45,13 +45,13 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules(); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingRules") ) , uno::makeAny( xNumberingRules ) ); + xProps->setPropertyValue( rtl::OUString("NumberingRules") , uno::makeAny( xNumberingRules ) ); } rtl::OUString SwVbaListTemplate::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplate")); + return rtl::OUString("SwVbaListTemplate"); } uno::Sequence< rtl::OUString > @@ -61,7 +61,7 @@ SwVbaListTemplate::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListTemplate" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListTemplate" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index aad1e8270192..01b56c27a33d 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -57,7 +57,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) ); } @@ -84,7 +84,7 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaListTemplates::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplates")); + return rtl::OUString("SwVbaListTemplates"); } css::uno::Sequence<rtl::OUString> @@ -94,7 +94,7 @@ SwVbaListTemplates::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ListTemplates") ); + sNames[0] = rtl::OUString("ooo.vba.word.ListTemplates"); } return sNames; } diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index f8c5dd998760..898c7939e740 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -45,39 +45,39 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) { case word::WdDefaultFilePath::wdDocumentsPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work") ); + msDefaultFilePath = rtl::OUString("Work"); break; } case word::WdDefaultFilePath::wdPicturesPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gallery") ); + msDefaultFilePath = rtl::OUString("Gallery"); break; } case word::WdDefaultFilePath::wdUserTemplatesPath: case word::WdDefaultFilePath::wdWorkgroupTemplatesPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template") ); + msDefaultFilePath = rtl::OUString("Template"); break; } case word::WdDefaultFilePath::wdStartupPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Addin") ); + msDefaultFilePath = rtl::OUString("Addin"); break; } case word::WdDefaultFilePath::wdUserOptionsPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserConfig") ); + msDefaultFilePath = rtl::OUString("UserConfig"); break; } case word::WdDefaultFilePath::wdToolsPath: case word::WdDefaultFilePath::wdProgramPath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Module") ); + msDefaultFilePath = rtl::OUString("Module"); break; } case word::WdDefaultFilePath::wdTempFilePath: { - msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Temp") ); + msDefaultFilePath = rtl::OUString("Temp"); break; } default: @@ -95,7 +95,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) value >>= sNewPath; rtl::OUString sNewPathUrl; ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl ); - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")) ), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); rtl::OUString sOldPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently @@ -110,7 +110,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) uno::Any SwVbaOptions::getValueEvent() { - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")) ), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); rtl::OUString sPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently @@ -258,7 +258,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof rtl::OUString SwVbaOptions::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions")); + return rtl::OUString("SwVbaOptions"); } uno::Sequence< rtl::OUString > @@ -268,7 +268,7 @@ SwVbaOptions::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Options" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Options" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index 9c747b041200..ffa2c69cf1bb 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -59,9 +59,9 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException) { sal_Bool isHeaderOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn; + mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getHeaderMargin(); } @@ -82,29 +82,29 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktHeaderHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn; + mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= aktTopMargin; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance"))) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= aktHeaderHeight; + mxPageProps->getPropertyValue( rtl::OUString("TopMargin")) >>= aktTopMargin; + mxPageProps->getPropertyValue( rtl::OUString("HeaderBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= aktHeaderHeight; sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin ); sal_Int32 height = aktHeaderHeight - aktSpacing; sal_Int32 newHeaderHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), uno::makeAny( newHeaderDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")), uno::makeAny( newHeaderHeight ) ); + mxPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( newHeaderDistance ) ); + mxPageProps->setPropertyValue( rtl::OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( rtl::OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) ); } double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException) { sal_Bool isFooterOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn; + mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getFooterMargin(); } @@ -116,21 +116,21 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktFooterHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn; + mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= aktBottomMargin; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance"))) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= aktFooterHeight; + mxPageProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= aktBottomMargin; + mxPageProps->getPropertyValue( rtl::OUString("FooterBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= aktFooterHeight; sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin ); sal_Int32 height = aktFooterHeight - aktSpacing; sal_Int32 newFooterHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), uno::makeAny( newFooterDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")), uno::makeAny( newFooterHeight ) ); + mxPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( newFooterDistance ) ); + mxPageProps->setPropertyValue( rtl::OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( rtl::OUString("FooterHeight"), uno::makeAny( newFooterHeight ) ); } sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException) @@ -149,32 +149,32 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status rtl::OUString newStyle; if( status ) - newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("First Page") ); + newStyle = rtl::OUString("First Page"); else - newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ); + newStyle = rtl::OUString("Standard"); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); sal_Int32 nTopMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= nTopMargin; + xStyleProps->getPropertyValue( rtl::OUString("TopMargin")) >>= nTopMargin; sal_Int32 nBottomMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= nBottomMargin; + xStyleProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= nBottomMargin; sal_Int32 nLeftMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin"))) >>= nLeftMargin; + xStyleProps->getPropertyValue( rtl::OUString("LeftMargin")) >>= nLeftMargin; sal_Int32 nRightMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin"))) >>= nRightMargin; + xStyleProps->getPropertyValue( rtl::OUString("RightMargin")) >>= nRightMargin; sal_Int32 nHeaderHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= nHeaderHeight; + xStyleProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= nHeaderHeight; sal_Int32 nFooterHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= nFooterHeight; + xStyleProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= nFooterHeight; sal_Bool isHeaderOn = sal_False; - xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn; + xStyleProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; if( isHeaderOn ) { nTopMargin += nHeaderHeight; nBottomMargin += nFooterHeight; - xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_False ) ); - xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_False ) ); } uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) @@ -183,21 +183,21 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) ); + xTableProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); } else { - xCursorProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) ); + xCursorProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); } uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); - xFirstPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), uno::makeAny( nTopMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), uno::makeAny( nBottomMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), uno::makeAny( nLeftMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), uno::makeAny( nRightMargin ) ); + xFirstPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( nTopMargin ) ); + xFirstPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( nBottomMargin ) ); + xFirstPageProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nLeftMargin ) ); + xFirstPageProps->setPropertyValue( rtl::OUString("RightMargin"), uno::makeAny( nRightMargin ) ); } rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) @@ -210,14 +210,14 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage; + xTableProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; } else { - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage; + xCursorProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; } return styleFirstPage; } @@ -246,7 +246,7 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t rtl::OUString SwVbaPageSetup::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup")); + return rtl::OUString("SwVbaPageSetup"); } uno::Sequence< rtl::OUString > @@ -256,7 +256,7 @@ SwVbaPageSetup::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.PageSetup" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.PageSetup" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index 198d6706d541..f0e8e35bc3b7 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -43,14 +43,14 @@ SwVbaPane::View() throw ( css::uno::RuntimeException ) void SAL_CALL SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseWin")); + rtl::OUString url = rtl::OUString( ".uno:CloseWin"); dispatchRequests( mxModel,url ); } rtl::OUString SwVbaPane::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPane")); + return rtl::OUString("SwVbaPane"); } uno::Sequence< rtl::OUString > @@ -60,7 +60,7 @@ SwVbaPane::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index beb3543713a1..d3a62629a915 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -99,7 +99,7 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaPanes::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes")); + return rtl::OUString("SwVbaPanes"); } css::uno::Sequence<rtl::OUString> @@ -109,7 +109,7 @@ SwVbaPanes::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Panes") ); + sNames[0] = rtl::OUString("ooo.vba.word.Panes"); } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 0c8dd49d8d74..1618a1167555 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -57,7 +57,7 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException rtl::OUString SwVbaParagraph::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph")); + return rtl::OUString("SwVbaParagraph"); } uno::Sequence< rtl::OUString > @@ -67,7 +67,7 @@ SwVbaParagraph::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraph" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Paragraph" ); } return aServiceNames; } @@ -100,7 +100,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) { nCount++; } @@ -116,7 +116,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) { if( Index == nCount ) return uno::makeAny( xServiceInfo ); @@ -160,7 +160,7 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaParagraphs::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs")); + return rtl::OUString("SwVbaParagraphs"); } css::uno::Sequence<rtl::OUString> @@ -170,7 +170,7 @@ SwVbaParagraphs::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraphs") ); + sNames[0] = rtl::OUString("ooo.vba.word.Paragraphs"); } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 34e60ff317fa..2caa2e64001c 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -48,33 +48,33 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat() sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ) ) >>= aParaAdjust; + mxParaProps->getPropertyValue( rtl::OUString("ParaAdjust") ) >>= aParaAdjust; return getMSWordAlignment( aParaAdjust ); } void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ), uno::makeAny( aParaAdjust ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) ); } float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException) { sal_Int32 indent = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ) ) >>= indent; + mxParaProps->getPropertyValue( rtl::OUString("ParaFirstLineIndent") ) >>= indent; return (float)( Millimeter::getInPoints( indent ) ); } void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException) { sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ), uno::makeAny( indent ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaFirstLineIndent"), uno::makeAny( indent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ) ) >>= bKeep; + mxParaProps->getPropertyValue( rtl::OUString("ParaKeepTogether") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -83,7 +83,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth sal_Bool bKeep = sal_False; if( _keeptogether >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaKeepTogether"), uno::makeAny( bKeep ) ); } else { @@ -94,7 +94,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ) ) >>= bKeep; + mxParaProps->getPropertyValue( rtl::OUString("ParaSplit") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -103,7 +103,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne sal_Bool bKeep = sal_False; if( _keepwithnext >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaSplit"), uno::makeAny( bKeep ) ); } else { @@ -114,7 +114,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException) { sal_Bool bHypn = sal_False; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ) ) >>= bHypn; + mxParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= bHypn; return uno::makeAny ( bHypn ); } @@ -123,7 +123,7 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation sal_Bool bHypn = sal_False; if( _hyphenation >>= bHypn ) { - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ), uno::makeAny( bHypn ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) ); } else { @@ -134,35 +134,35 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing; + mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacing( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing; + mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing; + mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacingRule( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException) { sal_Bool noLineNum = sal_False; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ) ) >>= noLineNum; + mxParaProps->getPropertyValue( rtl::OUString("ParaLineNumberCount") ) >>= noLineNum; return uno::makeAny ( noLineNum ); } @@ -171,7 +171,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb sal_Bool noLineNum = sal_False; if( _nolinenumber >>= noLineNum ) { - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ), uno::makeAny( noLineNum ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) ); } else { @@ -183,8 +183,8 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx { sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText; rtl::OUString aHeading; - const rtl::OUString HEADING = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Heading") ); - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aHeading; + const rtl::OUString HEADING = rtl::OUString("Heading"); + mxParaProps->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aHeading; if( aHeading.indexOf( HEADING ) == 0 ) { // get the sub string after "Heading" @@ -204,7 +204,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType; + mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH ); return uno::makeAny( bBreakBefore ); } @@ -215,7 +215,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe if( _breakbefore >>= bBreakBefore ) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType; + mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; if( bBreakBefore ) { if( aBreakType == style::BreakType_NONE ) @@ -230,7 +230,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe else if ( aBreakType == style::BreakType_PAGE_BEFORE ) aBreakType = style::BreakType_PAGE_AFTER; } - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( aBreakType ) ); + mxParaProps->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( aBreakType ) ); } else { @@ -241,53 +241,53 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace; + mxParaProps->getPropertyValue( rtl::OUString("ParaTopMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaTopMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ) ) >>= nSpace; + mxParaProps->getPropertyValue( rtl::OUString("ParaBottomMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaBottomMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ) ) >>= nIndent; + mxParaProps->getPropertyValue( rtl::OUString("ParaLeftMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaLeftMargin"), uno::makeAny( nIndent ) ); } float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ) ) >>= nIndent; + mxParaProps->getPropertyValue( rtl::OUString("ParaRightMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaRightMargin"), uno::makeAny( nIndent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException) @@ -297,16 +297,16 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeExcepti void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException) { sal_Bool bWidow = sal_False; sal_Int8 nWidow = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ) ) >>= nWidow; + mxParaProps->getPropertyValue( rtl::OUString("ParaWidows") ) >>= nWidow; sal_Int8 nOrphan = 0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ) ) >>= nOrphan; + mxParaProps->getPropertyValue( rtl::OUString("ParaOrphans") ) >>= nOrphan; // if the amount of single lines on one page > 1 and the same of start and end of the paragraph, // true is retured. bWidow = ( nWidow > 1 && nOrphan == nWidow ); @@ -321,8 +321,8 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr if( _widowcontrol >>= bWidow ) { sal_Int8 nControl = bWidow? 2:1; - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ), uno::makeAny( nControl ) ); - mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaWidows"), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( rtl::OUString("ParaOrphans"), uno::makeAny( nControl ) ); } else { @@ -478,7 +478,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException) { float fCharHeight = 0.0; - mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight; + mxParaProps->getPropertyValue( rtl::OUString("CharHeight") ) >>= fCharHeight; return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) ); } @@ -551,7 +551,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment ) rtl::OUString SwVbaParagraphFormat::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat")); + return rtl::OUString("SwVbaParagraphFormat"); } uno::Sequence< rtl::OUString > @@ -561,7 +561,7 @@ SwVbaParagraphFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ParagraphFormat" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ParagraphFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index aeb8cce9a75e..9553b343aa36 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -72,7 +72,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText ); if( !mxTextCursor.is() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fails to create text cursor") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() ); mxTextCursor->collapseToStart(); if( rEnd.is() ) @@ -207,7 +207,7 @@ void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno:: } uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( eBreakType ) ); + xProp->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( eBreakType ) ); } } @@ -223,7 +223,7 @@ SwVbaRange::Select() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::InsertParagraph() throw ( uno::RuntimeException ) { - mxTextCursor->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); + mxTextCursor->setString( rtl::OUString("") ); InsertParagraphBefore(); } @@ -252,19 +252,19 @@ SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SwVbaRange::GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") ) ) >>= aStyleName ) && !aStyleName.isEmpty() ) + if( ( xProp->getPropertyValue( rtl::OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") ); + aStyleType = rtl::OUString("CharacterStyles"); } - else if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aStyleName ) && !aStyleName.isEmpty() ) + else if( ( xProp->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ); + aStyleType = rtl::OUString("ParagraphStyles"); } if( aStyleType.isEmpty() ) { @@ -323,10 +323,10 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); rtl::OUString aPageStyleName; - xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName; + xParaProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); } @@ -410,7 +410,7 @@ SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException) rtl::OUString SwVbaRange::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRange")); + return rtl::OUString("SwVbaRange"); } uno::Sequence< rtl::OUString > @@ -420,7 +420,7 @@ SwVbaRange::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Range" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Range" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index 570404e985fd..b983613b1bf7 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -51,7 +51,7 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException) rtl::OUString SwVbaReplacement::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement")); + return rtl::OUString("SwVbaReplacement"); } uno::Sequence< rtl::OUString > @@ -61,7 +61,7 @@ SwVbaReplacement::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Replacement" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Replacement" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index 4d10b7017d89..05fb97c765f9 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -76,7 +76,7 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException ) rtl::OUString SwVbaRevision::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRevision")); + return rtl::OUString("SwVbaRevision"); } uno::Sequence< rtl::OUString > @@ -86,7 +86,7 @@ SwVbaRevision::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Revision" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Revision" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 94e3051da2ac..5f240b5bb129 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -160,7 +160,7 @@ void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException) rtl::OUString SwVbaRevisions::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRevisions")); + return rtl::OUString("SwVbaRevisions"); } css::uno::Sequence<rtl::OUString> @@ -170,7 +170,7 @@ SwVbaRevisions::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Revisions") ); + sNames[0] = rtl::OUString("ooo.vba.word.Revisions"); } return sNames; } diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index fc633777d7b0..333611dc84de 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -47,7 +47,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException) return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) ); sal_Int32 nHeight = 0; - mxRowProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ) ) >>= nHeight; + mxRowProps->getPropertyValue( rtl::OUString("Height") ) >>= nHeight; return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) ); } @@ -57,20 +57,20 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru _height >>= height; sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( height ); - mxRowProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ), uno::makeAny( nHeight ) ); + mxRowProps->setPropertyValue( rtl::OUString("Height"), uno::makeAny( nHeight ) ); } ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = sal_False; - mxRowProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight") ) ) >>= isAutoHeight; + mxRowProps->getPropertyValue( rtl::OUString("IsAutoHeight") ) >>= isAutoHeight; return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly; } void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto ); - mxRowProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsAutoHeight") ), uno::makeAny( isAutoHeight ) ); + mxRowProps->setPropertyValue( rtl::OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) ); } void SAL_CALL @@ -107,7 +107,7 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (c rtl::OUString SwVbaRow::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRow")); + return rtl::OUString("SwVbaRow"); } uno::Sequence< rtl::OUString > @@ -117,7 +117,7 @@ SwVbaRow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Row" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Row" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index a17be11101af..d479834c9ae4 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -79,7 +79,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u { sal_Int16 nAlignment = text::HoriOrientation::LEFT; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HoriOrient") ) ) >>= nAlignment; + xTableProps->getPropertyValue( rtl::OUString("HoriOrient") ) >>= nAlignment; sal_Int32 nRet = 0; switch( nAlignment ) { @@ -122,7 +122,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt } } uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HoriOrient") ), uno::makeAny( nAlignment ) ); + xTableProps->setPropertyValue( rtl::OUString("HoriOrient"), uno::makeAny( nAlignment ) ); } uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException) @@ -133,7 +133,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); sal_Bool bSplit = sal_False; - xRowProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed") ) ) >>= bSplit; + xRowProps->getPropertyValue( rtl::OUString("IsSplitAllowed") ) >>= bSplit; if( index == 0 ) { bAllowBreak = bSplit; @@ -155,7 +155,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index ) { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); - xRowProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed") ), uno::makeAny( bAllowBreak ) ); + xRowProps->setPropertyValue( rtl::OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) ); } } @@ -166,8 +166,8 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( 0, mnStartRowIndex ), uno::UNO_QUERY_THROW ); sal_Int32 nLeftBorderDistance = 0; sal_Int32 nRightBorderDistance = 0; - xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftBorderDistance") ) ) >>= nLeftBorderDistance; - xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightBorderDistance") ) ) >>= nRightBorderDistance; + xCellProps->getPropertyValue( rtl::OUString("LeftBorderDistance") ) >>= nLeftBorderDistance; + xCellProps->getPropertyValue( rtl::OUString("RightBorderDistance") ) >>= nRightBorderDistance; return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) ); } @@ -183,8 +183,8 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th for( sal_Int32 column = 0; column < nColumns; ++column ) { uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( column, row ), uno::UNO_QUERY_THROW ); - xCellProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftBorderDistance") ), uno::makeAny( nSpace ) ); - xCellProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightBorderDistance") ), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( rtl::OUString("LeftBorderDistance"), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( rtl::OUString("RightBorderDistance"), uno::makeAny( nSpace ) ); } } } @@ -231,9 +231,9 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE { uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nMargin = 0; - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ) ) >>= nMargin; + xTableProps->getPropertyValue( rtl::OUString("LeftMargin") ) >>= nMargin; nMargin += indent; - xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), uno::makeAny( nMargin ) ); + xTableProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nMargin ) ); } void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -255,7 +255,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the proportion between old and new uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nWidth; + xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; if ((nNewWidth <= 0) || (nWidth <= 0)) { @@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); } void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -291,7 +291,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the width of all columns uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nWidth; + xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; // get all columns, calculate and set the new width of the columns @@ -306,7 +306,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); } void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException) @@ -326,11 +326,11 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Index out of bounds") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -354,7 +354,7 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaRows::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRows")); + return rtl::OUString("SwVbaRows"); } uno::Sequence<rtl::OUString> @@ -364,7 +364,7 @@ SwVbaRows::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Rows") ); + sNames[0] = rtl::OUString("ooo.vba.word.Rows"); } return sNames; } diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 662e2212740f..925472b9d496 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -68,7 +68,7 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException) rtl::OUString SwVbaSection::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSection")); + return rtl::OUString("SwVbaSection"); } uno::Sequence< rtl::OUString > @@ -78,7 +78,7 @@ SwVbaSection::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Section" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Section" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index a119f4230e4b..f996815dc543 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -65,7 +65,7 @@ public: { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); sal_Int32 nCount = xPageStyles->getCount(); for( sal_Int32 index = 0; index < nCount; ++index ) { @@ -148,7 +148,7 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException) uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW ); return xSection->PageSetup(); } - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("There is no section") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("There is no section"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -174,7 +174,7 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaSections::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSections")); + return rtl::OUString("SwVbaSections"); } css::uno::Sequence<rtl::OUString> @@ -184,7 +184,7 @@ SwVbaSections::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Sections") ); + sNames[0] = rtl::OUString("ooo.vba.word.Sections"); } return sNames; } diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 9e81400347f0..62ad26645a83 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -81,7 +81,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un { uno::Reference< text::XTextRange > xTextRange; uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextRanges") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextRanges") ) ) { uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW ); if( xTextRanges->getCount() > 0 ) @@ -92,7 +92,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un } else { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return xTextRange; } @@ -154,7 +154,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -189,7 +189,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -215,11 +215,11 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete")); + rtl::OUString url = rtl::OUString( ".uno:Delete"); dispatchRequests( mxModel,url ); } @@ -258,7 +258,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW ); if( eDirection == word::MOVE_UP ) @@ -271,7 +271,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } if( word::gotoSelectedObjectAnchor( mxModel ) ) { @@ -287,7 +287,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< text::XTextRange > xRange( xTextTable->getCellByName( xTextTableCursor->getRangeName()), uno::UNO_QUERY_THROW ); @@ -311,7 +311,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XParagraphCursor > xParagraphCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i<nCount; i++ ) @@ -326,7 +326,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XWordCursor > xWordCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i<nCount; i++ ) @@ -343,7 +343,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: } default: { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -353,8 +353,8 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cell") ) ) >>= xCell; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; if( !xTextTable.is() || !xCell.is() ) { DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); @@ -362,7 +362,7 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); rtl::OUString aCellName; - xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellName") ) ) >>= aCellName; + xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= aCellName; uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName ); // move the table cursor switch( eDirection ) @@ -548,7 +548,7 @@ SwVbaSelection::getFont() throw ( uno::RuntimeException ) void SAL_CALL SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwBackspace")); + rtl::OUString url = rtl::OUString( ".uno:SwBackspace"); dispatchRequests( mxModel,url ); } @@ -648,11 +648,11 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w if( nPage != 0 ) xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) ); else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); break; } default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return getRange(); } @@ -691,7 +691,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) result = uno::makeAny( sal_True ); else @@ -735,7 +735,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName; + xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; bool bFirstPage = false; if ( aPageStyleName == "First Page" ) bFirstPage = true; @@ -764,7 +764,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run break; } default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return result; } @@ -792,7 +792,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -955,7 +955,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; return xTextTable; } @@ -981,7 +981,7 @@ void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable; + xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; if( !xTextTable.is() ) throw uno::RuntimeException( ); @@ -998,13 +998,13 @@ void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString if( sTLName.isEmpty() ) { uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cell") ) ) >>= xCell; + xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; if( !xCell.is() ) { throw uno::RuntimeException( ); } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); - xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellName") ) ) >>= sTLName; + xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= sTLName; } } @@ -1041,7 +1041,7 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run void SAL_CALL SwVbaSelection::Copy( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Copy")); + rtl::OUString url = rtl::OUString( ".uno:Copy"); dispatchRequests( mxModel,url ); } @@ -1053,7 +1053,7 @@ void SAL_CALL SwVbaSelection::CopyAsPicture( ) throw (uno::RuntimeException) void SAL_CALL SwVbaSelection::Paste( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Paste")); + rtl::OUString url = rtl::OUString( ".uno:Paste"); dispatchRequests( mxModel,url ); } @@ -1101,7 +1101,7 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException) // insert an empty line uno::Reference< text::XTextRange > xFirstCellRange = word::getFirstObjectPosition( xText ); mxTextViewCursor->gotoRange( xFirstCellRange, sal_False ); - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara")); + rtl::OUString url = rtl::OUString( ".uno:InsertPara"); dispatchRequests( mxModel,url ); } } @@ -1165,7 +1165,7 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio rtl::OUString SwVbaSelection::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection")); + return rtl::OUString("SwVbaSelection"); } uno::Sequence< rtl::OUString > @@ -1175,7 +1175,7 @@ SwVbaSelection::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Selection" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Selection" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 2890700495d0..28f09cc38ea7 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -51,14 +51,14 @@ SwVbaStyle::getName() throw (uno::RuntimeException) sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException) { lang::Locale aLocale; - xTCProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ) ) >>= aLocale; + xTCProps->getPropertyValue( rtl::OUString("CharLocale") ) >>= aLocale; return LanguageTag( aLocale ).getLanguageType( false); } void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException) { lang::Locale aLocale = LanguageTag( static_cast<LanguageType>(_languageid) ).getLocale(); - xTCProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ), uno::makeAny( aLocale ) ) ; + xTCProps->setPropertyValue( rtl::OUString("CharLocale"), uno::makeAny( aLocale ) ) ; } ::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException) @@ -75,9 +75,9 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R { sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph; uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.ParagraphStyle") ) ) nType = word::WdStyleType::wdStyleTypeParagraph; - else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) ) + else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.CharacterStyle") ) ) nType = word::WdStyleType::wdStyleTypeCharacter; else nType = word::WdStyleType::wdStyleTypeList; @@ -106,7 +106,7 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro if( !sStyle.isEmpty() ) { - xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ), uno::makeAny( sStyle ) ); + xParaProps->setPropertyValue( rtl::OUString("ParaStyleName"), uno::makeAny( sStyle ) ); return; } @@ -116,13 +116,13 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro ::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException) { rtl::OUString sNameLocal; - mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DisplayName") ) ) >>= sNameLocal; + mxStyleProps->getPropertyValue( rtl::OUString("DisplayName") ) >>= sNameLocal; return sNameLocal; } void SAL_CALL SwVbaStyle::setNameLocal( const ::rtl::OUString& _namelocal ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DisplayName") ), uno::makeAny( _namelocal ) ); + mxStyleProps->setPropertyValue( rtl::OUString("DisplayName"), uno::makeAny( _namelocal ) ); } uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException) @@ -141,20 +141,20 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat ::sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException) { sal_Bool isAutoUpdate = sal_False; - mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsAutoUpdate") ) ) >>= isAutoUpdate; + mxStyleProps->getPropertyValue( rtl::OUString("IsAutoUpdate") ) >>= isAutoUpdate; return isAutoUpdate; } void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsAutoUpdate") ), uno::makeAny( _automaticallyupdate ) ); + mxStyleProps->setPropertyValue( rtl::OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) ); } uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException) { // ParentStyle rtl::OUString sBaseStyle; - mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParentStyle") ) ) >>= sBaseStyle; + mxStyleProps->getPropertyValue( rtl::OUString("ParentStyle") ) >>= sBaseStyle; if( !sBaseStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -173,7 +173,7 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: if( xStyle.is() ) { rtl::OUString sBaseStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParentStyle") ), uno::makeAny( sBaseStyle ) ); + mxStyleProps->setPropertyValue( rtl::OUString("ParentStyle"), uno::makeAny( sBaseStyle ) ); } else { @@ -185,7 +185,7 @@ uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeExcepti { //FollowStyle rtl::OUString sFollowStyle; - mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FollowStyle") ) ) >>= sFollowStyle; + mxStyleProps->getPropertyValue( rtl::OUString("FollowStyle") ) >>= sFollowStyle; if( !sFollowStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -204,7 +204,7 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs if( xStyle.is() ) { rtl::OUString sFollowStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FollowStyle") ), uno::makeAny( sFollowStyle ) ); + mxStyleProps->setPropertyValue( rtl::OUString("FollowStyle"), uno::makeAny( sFollowStyle ) ); } else { @@ -215,14 +215,14 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs ::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException) { sal_Int16 nNumberingLevel = 0; - mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingLevel") ) ) >>= nNumberingLevel; + mxStyleProps->getPropertyValue( rtl::OUString("NumberingLevel") ) >>= nNumberingLevel; return nNumberingLevel; } rtl::OUString SwVbaStyle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaStyle")); + return rtl::OUString("SwVbaStyle"); } uno::Sequence< rtl::OUString > @@ -232,7 +232,7 @@ SwVbaStyle::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyle" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 63b1e89b6153..a71e0aa09ff1 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -63,7 +63,7 @@ public: virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); } + virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString("Name"); } // XHelperInterface virtual rtl::OUString getServiceImplName(); diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 75fae93c2d9b..66d055359635 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -171,7 +171,7 @@ public: // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleSupplier->getStyleFamilies(); - mxParaStyles.set( xStyleFamilies->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ) ), uno::UNO_QUERY_THROW ); + mxParaStyles.set( xStyleFamilies->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); } @@ -243,7 +243,7 @@ public: // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } }; @@ -310,18 +310,18 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: case word::WdStyleType::wdStyleTypeParagraph: case word::WdStyleType::wdStyleTypeTable: { - aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ); + aStyleType = rtl::OUString("ParagraphStyles"); break; } case word::WdStyleType::wdStyleTypeCharacter: { - aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") ); + aStyleType = rtl::OUString("CharacterStyles"); break; } case word::WdStyleType::wdStyleTypeList: { // should use Paragraph style and set the property "NumberingStyleName" - aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ); + aStyleType = rtl::OUString("ParagraphStyles"); break; } default: @@ -333,14 +333,14 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: // set the property "NumberingStyleName" if it is a listbullet if( pTable->wdStyleType == word::WdStyleType::wdStyleTypeList ) { - xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName") ), uno::makeAny( aStyleName ) ); + xStyleProps->setPropertyValue( rtl::OUString("NumberingStyleName"), uno::makeAny( aStyleName ) ); } return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) ); } else { OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented"); - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -351,7 +351,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: rtl::OUString SwVbaStyles::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaStyles")); + return rtl::OUString("SwVbaStyles"); } uno::Sequence< rtl::OUString > @@ -361,7 +361,7 @@ SwVbaStyles::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyles" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyles" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 5528a8e15974..dc690fd77d25 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -118,8 +118,7 @@ uno::Any PrivateProfileStringListener::getValueEvent() return uno::makeAny( sValue ); #else - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Only support on Windows")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Only support on Windows"), uno::Reference< uno::XInterface >() ); #endif } @@ -162,8 +161,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) } return; #else - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Not implemented")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); #endif } @@ -231,8 +229,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -270,7 +267,7 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU rtl::OUString SwVbaSystem::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem")); + return rtl::OUString("SwVbaSystem"); } uno::Sequence< rtl::OUString > @@ -280,7 +277,7 @@ SwVbaSystem::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.System" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.System" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index ff7b9522eea9..f421ffdbbb9b 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -120,7 +120,7 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException) rtl::OUString SwVbaTable::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTable")); + return rtl::OUString("SwVbaTable"); } uno::Sequence<rtl::OUString> @@ -130,7 +130,7 @@ SwVbaTable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Table" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Table" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 5dd92266405a..7d7029333fe8 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -125,14 +125,14 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException) sal_Int32 nWidth = 0; sal_Bool isWidthRelatvie = sal_False; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsWidthRelative") ) ) >>= isWidthRelatvie; + xTableProps->getPropertyValue( rtl::OUString("IsWidthRelative") ) >>= isWidthRelatvie; if( isWidthRelatvie ) { - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RelativeWidth") ) ) >>= nWidth; + xTableProps->getPropertyValue( rtl::OUString("RelativeWidth") ) >>= nWidth; } else { - xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nWidth; + xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; } return nWidth; } diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index dd02d6f30623..2eb70b88b254 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -38,13 +38,13 @@ SwVbaTableOfContents::~SwVbaTableOfContents() ::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException) { sal_Int16 nLevel = 0; - mxTocProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Level") ) ) >>= nLevel; + mxTocProps->getPropertyValue(rtl::OUString("Level") ) >>= nLevel; return nLevel; } void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Level") ), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); + mxTocProps->setPropertyValue( rtl::OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); } ::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException) @@ -61,25 +61,25 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException) { sal_Bool bUseFields = sal_False; - mxTocProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks") ) ) >>= bUseFields; + mxTocProps->getPropertyValue(rtl::OUString("CreateFromMarks") ) >>= bUseFields; return bUseFields; } void SAL_CALL SwVbaTableOfContents::setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks") ), uno::makeAny( _useFields ) ); + mxTocProps->setPropertyValue( rtl::OUString("CreateFromMarks"), uno::makeAny( _useFields ) ); } ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException) { sal_Bool bUseOutlineLevels = sal_False; - mxTocProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline") ) ) >>= bUseOutlineLevels; + mxTocProps->getPropertyValue(rtl::OUString("CreateFromOutline") ) >>= bUseOutlineLevels; return bUseOutlineLevels; } void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline") ), uno::makeAny( _useOutlineLevels ) ); + mxTocProps->setPropertyValue( rtl::OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) ); } void SAL_CALL SwVbaTableOfContents::Delete( ) throw (uno::RuntimeException) @@ -96,7 +96,7 @@ void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException) rtl::OUString SwVbaTableOfContents::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTableOfContents")); + return rtl::OUString("SwVbaTableOfContents"); } uno::Sequence< rtl::OUString > @@ -106,7 +106,7 @@ SwVbaTableOfContents::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.TableOfContents" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TableOfContents" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 83b868d1afb7..1448b4bd28e7 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -178,7 +178,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange(); uno::Reference< text::XTextTable > xTable; - xTable.set( xMsf->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable")) ), uno::UNO_QUERY_THROW ); + xTable.set( xMsf->createInstance( rtl::OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW ); xTable->initialize( nRows, nCols ); uno::Reference< text::XText > xText = xTextRange->getText(); @@ -212,7 +212,7 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaTables::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTables")); + return rtl::OUString("SwVbaTables"); } // XEnumerationAccess @@ -229,7 +229,7 @@ SwVbaTables::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Tables" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Tables" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index e37d8fce5b3e..8be4212c2fdb 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -112,11 +112,11 @@ uno::Reference< word::XTableOfContents > SAL_CALL SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); - uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.ContentIndex")) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW ); sal_Bool isProtected = sal_False; - xTocProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsProtected") ), uno::makeAny( isProtected ) ); + xTocProps->setPropertyValue( rtl::OUString("IsProtected"), uno::makeAny( isProtected ) ); uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) ); @@ -167,7 +167,7 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource ) rtl::OUString SwVbaTablesOfContents::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTablesOfContents")); + return rtl::OUString("SwVbaTablesOfContents"); } uno::Sequence<rtl::OUString> @@ -177,7 +177,7 @@ SwVbaTablesOfContents::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.TablesOfContents") ); + sNames[0] = rtl::OUString("ooo.vba.word.TablesOfContents"); } return sNames; } diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 150149b2e8df..7ff80c3987e8 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -34,7 +34,7 @@ SwVbaTabStop::~SwVbaTabStop() rtl::OUString SwVbaTabStop::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStop")); + return rtl::OUString("SwVbaTabStop"); } uno::Sequence< rtl::OUString > @@ -44,7 +44,7 @@ SwVbaTabStop::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.TabStop" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TabStop" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 1a3c2db460ee..c6520cf903e2 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -28,13 +28,13 @@ using namespace ::com::sun::star; static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) { uno::Sequence< style::TabStop > aSeq; - xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTabStops") ) ) >>= aSeq; + xParaProps->getPropertyValue( rtl::OUString("ParaTabStops") ) >>= aSeq; return aSeq; } static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) { - xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTabStops") ), uno::makeAny( aSeq ) ); + xParaProps->setPropertyValue( rtl::OUString("ParaTabStops"), uno::makeAny( aSeq ) ); } typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base; @@ -252,7 +252,7 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString SwVbaTabStops::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStops")); + return rtl::OUString("SwVbaTabStops"); } css::uno::Sequence<rtl::OUString> @@ -262,7 +262,7 @@ SwVbaTabStops::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.TabStops") ); + sNames[0] = rtl::OUString("ooo.vba.word.TabStops"); } return sNames; } diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index a1700a58d6bd..8f9b24fa86cf 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -86,7 +86,7 @@ uno::Any SAL_CALL SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); - uno::Reference< text::XAutoTextContainer > xAutoTextContainer( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AutoTextContainer") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XAutoTextContainer > xAutoTextContainer( xMgr->createInstance( rtl::OUString("com.sun.star.text.AutoTextContainer") ), uno::UNO_QUERY_THROW ); // the default template is "Normal.dot" in Word. rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") ); @@ -105,7 +105,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep } else { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Auto Text Entry doesn't exist") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() ); } uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) ); @@ -117,7 +117,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep rtl::OUString SwVbaTemplate::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTemplate")); + return rtl::OUString("SwVbaTemplate"); } uno::Sequence< rtl::OUString > @@ -127,7 +127,7 @@ SwVbaTemplate::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Template" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Template" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 5acfef27083f..3cbed2123c7c 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -44,8 +44,7 @@ SwVbaVariable::getName() throw ( css::uno::RuntimeException ) void SAL_CALL SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL @@ -79,7 +78,7 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException ) rtl::OUString SwVbaVariable::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable")); + return rtl::OUString("SwVbaVariable"); } uno::Sequence< rtl::OUString > @@ -89,7 +88,7 @@ SwVbaVariable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variable" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Variable" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 3ab7e95a355b..b74401a882b1 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -77,7 +77,7 @@ SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw rtl::OUString SwVbaVariables::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables")); + return rtl::OUString("SwVbaVariables"); } css::uno::Sequence<rtl::OUString> @@ -87,7 +87,7 @@ SwVbaVariables::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variables") ); + sNames[0] = rtl::OUString("ooo.vba.word.Variables"); } return sNames; } diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 2935506c8c4c..5591eaaee297 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -71,7 +71,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) uno::Reference< text::XText > xCurrentText = mxViewCursor->getText(); uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextContent > xTextContent; - while( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextContent ) + while( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) { xCurrentText = xTextContent->getAnchor()->getText(); xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW ); @@ -105,7 +105,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) } else if ( aImplName == "SwXFootnote" ) { - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Endnote") ) ) return word::WdSeekView::wdSeekEndnotes; else return word::WdSeekView::wdSeekFootnotes; @@ -193,14 +193,14 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run SwVbaView::getTableGridLines() throw (css::uno::RuntimeException) { sal_Bool bShowTableGridLine = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries"))) >>= bShowTableGridLine; + mxViewSettings->getPropertyValue( rtl::OUString("ShowTableBoundaries")) >>= bShowTableGridLine; return bShowTableGridLine; } void SAL_CALL SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException) { - mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) ); + mxViewSettings->setPropertyValue( rtl::OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) ); } ::sal_Int32 SAL_CALL @@ -208,7 +208,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException) { // FIXME: handle wdPrintPreview type sal_Bool bOnlineLayout = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout"))) >>= bOnlineLayout; + mxViewSettings->getPropertyValue( rtl::OUString("ShowOnlineLayout")) >>= bOnlineLayout; return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView; } @@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) case word::WdViewType::wdPrintView: case word::WdViewType::wdNormalView: { - mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_False ) ); + mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) ); break; } case word::WdViewType::wdWebView: { - mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_True ) ); + mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) ); break; } case word::WdViewType::wdPrintPreview: @@ -256,10 +256,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryFooter: case word::WdSeekView::wdSeekEvenPagesFooter: { - aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn") ); - aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared") ); - aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance") ); - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") ); + aPropIsOn = rtl::OUString("FooterIsOn"); + aPropIsShared = rtl::OUString("FooterIsShared"); + aPropBodyDistance = rtl::OUString("FooterBodyDistance"); + aPropText = rtl::OUString("FooterText"); break; } case word::WdSeekView::wdSeekCurrentPageHeader: @@ -267,10 +267,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryHeader: case word::WdSeekView::wdSeekEvenPagesHeader: { - aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn") ); - aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared") ); - aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance") ); - aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") ); + aPropIsOn = rtl::OUString("HeaderIsOn"); + aPropIsShared = rtl::OUString("HeaderIsShared"); + aPropBodyDistance = rtl::OUString("HeaderBodyDistance"); + aPropText = rtl::OUString("HeaderText"); break; } } @@ -303,7 +303,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) // an even page number uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName; + xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; if ( aPageStyleName == "First Page" ) { // go to the beginning of where the next style is used @@ -343,11 +343,11 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) if( nType == word::WdSeekView::wdSeekEvenPagesFooter || nType == word::WdSeekView::wdSeekEvenPagesHeader ) { - aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ); + aTempPropText += rtl::OUString("Left"); } else { - aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Right") ); + aTempPropText += rtl::OUString("Right"); } xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW ); } @@ -373,7 +373,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) rtl::OUString SwVbaView::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaView")); + return rtl::OUString("SwVbaView"); } uno::Sequence< rtl::OUString > @@ -383,7 +383,7 @@ SwVbaView::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.View" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.View" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index 2195dd515f3a..b8a22620c08e 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -108,7 +108,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == word::WdWindowState::wdWindowStateNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Parameter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -131,7 +131,7 @@ SwVbaWindow::ActivePane() throw (uno::RuntimeException) rtl::OUString SwVbaWindow::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow")); + return rtl::OUString("SwVbaWindow"); } uno::Sequence< rtl::OUString > @@ -141,7 +141,7 @@ SwVbaWindow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Window" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Window" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 13d1339c89b6..e8573fefca91 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -62,13 +62,13 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case word::WdWrapType::wdWrapSquare: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_False ) ); + m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_False ) ); break; } case word::WdWrapType::wdWrapTight: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_True ) ); + m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_True ) ); break; } default: @@ -77,14 +77,14 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) } } } - m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") ), uno::makeAny( eTextMode ) ); + m_xPropertySet->setPropertyValue( rtl::OUString("TextWrap"), uno::makeAny( eTextMode ) ); } ::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException) { sal_Int32 nType = word::WdWrapType::wdWrapSquare; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode; + m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_NONE: @@ -100,7 +100,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case text::WrapTextMode_PARALLEL: { sal_Bool bContour = sal_False; - m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") )) >>= bContour; + m_xPropertySet->getPropertyValue( rtl::OUString("SurroundContour")) >>= bContour; if( bContour ) nType = word::WdWrapType::wdWrapTight; else @@ -132,7 +132,7 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE { sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode; + m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_LEFT: @@ -174,48 +174,48 @@ void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException) { - return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ) ); + return getDistance( rtl::OUString("TopMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException) { - setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), _distancetop ); + setDistance( rtl::OUString("TopMargin"), _distancetop ); } float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException) { - return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ) ); + return getDistance( rtl::OUString("BottomMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException) { - setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), _distancebottom ); + setDistance( rtl::OUString("BottomMargin"), _distancebottom ); } float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException) { - return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ) ); + return getDistance( rtl::OUString("LeftMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException) { - setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), _distanceleft ); + setDistance( rtl::OUString("LeftMargin"), _distanceleft ); } float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException) { - return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ) ); + return getDistance( rtl::OUString("RightMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException) { - setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright ); + setDistance( rtl::OUString("RightMargin"), _distanceright ); } rtl::OUString SwVbaWrapFormat::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat")); + return rtl::OUString("SwVbaWrapFormat"); } uno::Sequence< rtl::OUString > @@ -225,7 +225,7 @@ SwVbaWrapFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.WrapFormat" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.WrapFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 55feb3ff43f1..fa5cdf7ec75f 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -73,10 +73,10 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { rtl::OUString aPageStyleName; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName; + xProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return xStyle; @@ -93,8 +93,8 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ) ), uno::UNO_QUERY_THROW ); - uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( rtl::OUString("Standard") ), uno::UNO_QUERY_THROW ); return xStyle; } @@ -108,7 +108,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< if( xParaEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ) ) ) + if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextTable") ) ) { uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW ); uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); @@ -149,14 +149,14 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod //catch exception "no text selection" } uno::Reference< beans::XPropertySet > xVCProps( xTextRange, uno::UNO_QUERY_THROW ); - while( xVCProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextContent ) + while( xVCProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) { xText = xTextContent->getAnchor()->getText(); xVCProps.set( xText->createTextCursor(), uno::UNO_QUERY_THROW ); } if( !xText.is() ) - throw uno::RuntimeException( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "no text selection" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "no text selection" ), uno::Reference< uno::XInterface >() ); return xText; } diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx index 8cc63ad0c1d1..5f30c11f7fbe 100644 --- a/sw/source/ui/wrtsh/navmgr.cxx +++ b/sw/source/ui/wrtsh/navmgr.cxx @@ -227,7 +227,7 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) { if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 2336a6d2f9cd..3457c1918776 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -498,7 +498,7 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF { try { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Formula")), uno::makeAny( ::rtl::OUString( aMathData ) ) ); + xSet->setPropertyValue( ::rtl::OUString("Formula"), uno::makeAny( ::rtl::OUString( aMathData ) ) ); bActivate = sal_False; } catch (const uno::Exception&) @@ -551,12 +551,12 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj ); uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { - xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), + xProps->setPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ); - xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), + xProps->setPropertyValue( ::rtl::OUString( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ); uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 5f3ccdc6867b..c922b9899280 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -54,7 +54,7 @@ void DataPilotField::testSortInfo() uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldSortInfo aSortInfoValue; rtl::OUString aSortInfo(RTL_CONSTASCII_USTRINGPARAM("SortInfo")); - aSortInfoValue.Field = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Col1")); + aSortInfoValue.Field = rtl::OUString("Col1"); aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; uno::Any xValue; @@ -120,7 +120,7 @@ void DataPilotField::testAutoShowInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue; - aAutoShowInfoValue.DataField = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Col1")); + aAutoShowInfoValue.DataField = rtl::OUString("Col1"); aAutoShowInfoValue.IsEnabled = true; rtl::OUString aAutoShowInfo(RTL_CONSTASCII_USTRINGPARAM("AutoShowInfo")); uno::Any xValue; @@ -153,7 +153,7 @@ void DataPilotField::testReference() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldReference aReferenceValue; - aReferenceValue.ReferenceField = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Col1")); + aReferenceValue.ReferenceField = rtl::OUString("Col1"); aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; rtl::OUString aReference(RTL_CONSTASCII_USTRINGPARAM("Reference")); uno::Any xValue; diff --git a/test/source/sheet/tableautoformatfield.cxx b/test/source/sheet/tableautoformatfield.cxx index c846b6a22503..540dcd7a1d6a 100644 --- a/test/source/sheet/tableautoformatfield.cxx +++ b/test/source/sheet/tableautoformatfield.cxx @@ -37,7 +37,7 @@ namespace apitest { uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() { - uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormats"))), UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(rtl::OUString("com.sun.star.sheet.TableAutoFormats")), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xAutoFormatFields.is()); uno::Reference< container::XIndexAccess > xIndex( xAutoFormatFields->getByIndex(0), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xIndex.is()); diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index f57e3d37fcdd..68634b1ff4a7 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -55,7 +55,7 @@ namespace apitest { */ void XDatabaseRange::testDataArea() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataArea"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("DataArea")), UNO_QUERY_THROW); table::CellRangeAddress aCellAddress; aCellAddress.Sheet = 0; @@ -75,67 +75,67 @@ void XDatabaseRange::testDataArea() void XDatabaseRange::testGetSubtotalDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SubtotalDescriptor"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SubtotalDescriptor")), UNO_QUERY_THROW); uno::Reference< sheet::XSubTotalDescriptor> xSubtotalDescr = xDBRange->getSubTotalDescriptor(); CPPUNIT_ASSERT(xSubtotalDescr.is()); } void XDatabaseRange::testGetSortDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SortDescriptor"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SortDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xSortDescr = xDBRange->getSortDescriptor(); for (sal_Int32 i = 0; i < xSortDescr.getLength(); ++i) { beans::PropertyValue xProp = xSortDescr[i]; //std::cout << "Prop " << i << " Name: " << rtl::OUString(xProp.Name) << std::endl; - if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns"))) + if (xProp.Name == rtl::OUString("IsSortColumns")) { sal_Bool bIsSortColumns = sal_True; xProp.Value >>= bIsSortColumns; CPPUNIT_ASSERT(bIsSortColumns == sal_True); } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainsHeader"))) + else if (xProp.Name == rtl::OUString("ContainsHeader")) { sal_Bool bContainsHeader = sal_True; xProp.Value >>= bContainsHeader; CPPUNIT_ASSERT(bContainsHeader == sal_True); } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxFieldCount"))) + else if (xProp.Name == rtl::OUString("MaxFieldCount")) { sal_Int32 nMaxFieldCount = 0; xProp.Value >>= nMaxFieldCount; std::cout << "Value: " << nMaxFieldCount << std::endl; } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SortFields"))) + else if (xProp.Name == rtl::OUString("SortFields")) { } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BindFormatsToContent"))) + else if (xProp.Name == rtl::OUString("BindFormatsToContent")) { sal_Bool bBindFormatsToContent = sal_False; xProp.Value >>= bBindFormatsToContent; CPPUNIT_ASSERT(bBindFormatsToContent == sal_True); } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyOutputData"))) + else if (xProp.Name == rtl::OUString("CopyOutputData")) { sal_Bool bCopyOutputData = sal_True; xProp.Value >>= bCopyOutputData; CPPUNIT_ASSERT(bCopyOutputData == sal_False); } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputPosition"))) + else if (xProp.Name == rtl::OUString("OutputPosition")) { } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUserListEnabled"))) + else if (xProp.Name == rtl::OUString("IsUserListEnabled")) { sal_Bool bIsUserListEnabled = sal_True; xProp.Value >>= bIsUserListEnabled; CPPUNIT_ASSERT(bIsUserListEnabled == sal_False); } - else if (xProp.Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserListIndex"))) + else if (xProp.Name == rtl::OUString("UserListIndex")) { sal_Int32 nUserListIndex = 1; xProp.Value >>= nUserListIndex; @@ -146,20 +146,20 @@ void XDatabaseRange::testGetSortDescriptor() void XDatabaseRange::testGetFilterDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterDescriptor"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("FilterDescriptor")), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xFilterDescr( xDBRange->getFilterDescriptor(), UNO_QUERY_THROW); CPPUNIT_ASSERT(xFilterDescr.is()); } void XDatabaseRange::testGetImportDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImportDescriptor"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("ImportDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xImportDescr = xDBRange->getImportDescriptor(); } void XDatabaseRange::testRefresh() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Refresh"))), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("Refresh")), UNO_QUERY_THROW); const sal_Int32 nCol = 0; rtl::OUString aHidden(RTL_CONSTASCII_USTRINGPARAM("IsVisible")); diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx index dd29aa3064c8..7d9e8ac97335 100644 --- a/test/source/sheet/xdatapilottable2.cxx +++ b/test/source/sheet/xdatapilottable2.cxx @@ -242,7 +242,7 @@ void XDataPilotTable2::buildDataFields( uno::Reference< sheet::XDataPilotTable2 for( sal_Int32 i = 0; i < nFieldCount; ++i) { uno::Reference< beans::XPropertySet > xPropSet(xIndex->getByIndex(i), UNO_QUERY_THROW); - Any aAny = xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation"))); + Any aAny = xPropSet->getPropertyValue(rtl::OUString("Orientation")); sheet::DataPilotFieldOrientation aOrientation; CPPUNIT_ASSERT( aAny >>= aOrientation ); diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index 8330c1e7ef9d..bd4615018494 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -68,19 +68,19 @@ void XNamedRange::testSetContent() rtl::OUString aExpectedContent; // test a cell - aExpectedContent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D1")); + aExpectedContent = rtl::OUString("D1"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent().equals(aExpectedContent)); // test a cellrange - aExpectedContent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D1:D10")); + aExpectedContent = rtl::OUString("D1:D10"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent().equals(aExpectedContent)); // test a formula - aExpectedContent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=D10")); + aExpectedContent = rtl::OUString("=D10"); xNamedRange->setContent(aExpectedContent); - aExpectedContent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D10")); + aExpectedContent = rtl::OUString("D10"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent().equals(aExpectedContent)); } diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index 922ef2acc69f..702cc1f8122c 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -44,8 +44,7 @@ void UnoApiTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index f14a641f1af7..4f268434d321 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -570,7 +570,7 @@ static sal_Bool performTest( bRet &= check(tps1.member == 12345, "transportPolyHyper"); Sequence< Any > seq(2); seq[0] <<= static_cast< sal_uInt32 >(33); - seq[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABC")); + seq[1] <<= rtl::OUString("ABC"); TestPolyStruct< Sequence< Any > > tps2(seq); TestPolyStruct< Sequence< Any > > tps3; xLBT->transportPolySequence(tps2, tps3); @@ -595,8 +595,7 @@ static sal_Bool performTest( bRet &= check( (((nullAny.getValueTypeName() == rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XInterface"))) && + "com.sun.star.uno.XInterface")) && !static_cast< Reference< XInterface > const * >( nullAny.getValue())->is()) || nullAny == Any()), @@ -658,9 +657,9 @@ static sal_Bool performTest( float _arFloat[] = { 1.1f, 2.2f, 3.3f }; double _arDouble[] = { 1.11, 2.22, 3.33 }; OUString _arString[] = { - OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")), - OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")), - OUString(RTL_CONSTASCII_USTRINGPARAM("String 3")) }; + OUString("String 1"), + OUString("String 2"), + OUString("String 3") }; sal_Bool _aBool = true; sal_Int32 _aInt = 0xBABEBABE; float _aFloat = 3.14f; @@ -1200,15 +1199,15 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) if (! xOriginal.is()) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "cannot get test object!") ), + OUString( + "cannot get test object!"), Reference< XInterface >() ); } Reference< XBridgeTest > xTest( xOriginal, UNO_QUERY ); if (! xTest.is()) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("test object does not implement XBridgeTest!") ), + OUString("test object does not implement XBridgeTest!"), Reference< XInterface >() ); } @@ -1223,7 +1222,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) if (! bRet) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("error: test failed!") ), + OUString("error: test failed!"), Reference< XInterface >() ); } } diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 400b44bdaac1..a4cf91077601 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -434,7 +434,7 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio ::rtl::OUString Impl2::fn12( const ::rtl::OUString& arg ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg; + return ::rtl::OUString("12") + arg; } css::uno::Reference< css::uno::XInterface > SAL_CALL create( @@ -447,14 +447,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( ::rtl::OUString SAL_CALL getImplementationName() { return ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "comp.test.testtools.bridgetest.Constructors")); + "comp.test.testtools.bridgetest.Constructors"); } css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors")); + s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors"); return s; } @@ -468,14 +466,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create2( ::rtl::OUString SAL_CALL getImplementationName2() { return ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "comp.test.testtools.bridgetest.Constructors2")); + "comp.test.testtools.bridgetest.Constructors2"); } css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames2() { css::uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors2")); + s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors2"); return s; } diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 58eae103cb91..9a0c0d7a6bfc 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -937,7 +937,7 @@ void Test_Impl::testConstructorsService( Sequence< double > arg23(1); arg23[0] = 0.456; Sequence< sal_Unicode > arg24(1); arg24[0] = 'X'; Sequence< OUString > arg25(1); - arg25[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("test")); + arg25[0] = OUString("test"); Sequence< Type > arg26(1); arg26[0] = UnoType< Any >::get(); Sequence< Any > arg27(1); arg27[0] <<= true; Sequence< Sequence< sal_Bool > > arg28(1); @@ -961,7 +961,7 @@ void Test_Impl::testConstructorsService( 0.123f, 0.456, 'X', - OUString(RTL_CONSTASCII_USTRINGPARAM("test")), + OUString("test"), UnoType< Any >::get(), makeAny(true), arg14, @@ -1003,7 +1003,7 @@ void Test_Impl::testConstructorsService( args[9] <<= 0.456; sal_Unicode arg10c = 'X'; args[10].setValue(&arg10c, UnoType< UnoCharType >::get()); - args[11] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("test")); + args[11] <<= OUString("test"); args[12] <<= UnoType< Any >::get(); args[13] <<= true; args[14] <<= arg14; @@ -1053,10 +1053,10 @@ void Test_Impl::testConstructorsService( Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > > argSeq8(1); argSeq8[0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > ( TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>( - TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test")))); + TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test"))); Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > argSeq9(1); argSeq9[0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >( - OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >( + OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >( 'X', TestPolyStruct<Any>(Any(true)))); Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> > > argSeq10(1); argSeq10[0] = TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >( @@ -1072,11 +1072,11 @@ void Test_Impl::testConstructorsService( argSeq13[0] = Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> > >(1); argSeq13[0][0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> >( TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString>( - TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test")))); + TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString("test"))); Sequence<Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > > argSeq14(1); argSeq14[0] = Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > >(1); argSeq14[0][0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >( - OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >( + OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >( 'X', TestPolyStruct<Any>(Any(true)))); Sequence<Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > > > argSeq15(1); argSeq15[0] = Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > >(1); @@ -1093,7 +1093,7 @@ void Test_Impl::testConstructorsService( TestPolyStruct<sal_Int32>(SAL_MIN_INT32), TestPolyStruct<sal_Int64>(SAL_MIN_INT64), TestPolyStruct<sal_Unicode>('X'), - TestPolyStruct<OUString>(OUString(RTL_CONSTASCII_USTRINGPARAM("test"))), + TestPolyStruct<OUString>(OUString("test")), TestPolyStruct<float>(0.123f), TestPolyStruct<double>(0.456), TestPolyStruct<Reference<XInterface> >(static_cast<XBridgeTest2*>(this)), @@ -1103,9 +1103,9 @@ void Test_Impl::testConstructorsService( TestPolyStruct2<sal_Unicode, Any>('X', Any(true))), TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > ( TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>( - TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test")))), + TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test"))), TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode,TestPolyStruct<Any> > >( - OUString(RTL_CONSTASCII_USTRINGPARAM("test")), + OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >('X', TestPolyStruct<Any>(Any(true)))), TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >( TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx index 0b306ed5fb7f..81f82af25fd5 100644 --- a/testtools/source/bridgetest/multi.hxx +++ b/testtools/source/bridgetest/multi.hxx @@ -50,7 +50,7 @@ public: virtual rtl::OUString SAL_CALL fn12(rtl::OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg; } + { return rtl::OUString("12") + arg; } virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg) throw (com::sun::star::uno::RuntimeException) @@ -58,7 +58,7 @@ public: virtual rtl::OUString SAL_CALL fn22(rtl::OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22")) + arg; } + { return rtl::OUString("22") + arg; } virtual double SAL_CALL getatt3() throw (com::sun::star::uno::RuntimeException) @@ -74,7 +74,7 @@ public: virtual rtl::OUString SAL_CALL fn32(rtl::OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32")) + arg; } + { return rtl::OUString("32") + arg; } virtual sal_Int32 SAL_CALL fn33() throw (com::sun::star::uno::RuntimeException) @@ -90,7 +90,7 @@ public: virtual rtl::OUString SAL_CALL fn62(rtl::OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62")) + arg; } + { return rtl::OUString("62") + arg; } virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg) throw (com::sun::star::uno::RuntimeException) @@ -98,7 +98,7 @@ public: virtual rtl::OUString SAL_CALL fn72(rtl::OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72")) + arg; } + { return rtl::OUString("72") + arg; } virtual sal_Int32 SAL_CALL fn73() throw (com::sun::star::uno::RuntimeException) diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 838f252e2498..5550547e52b2 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -336,33 +336,33 @@ static void createInstance( Reference< T > & rxOut, { // acceptor xSet->insert( makeAny( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.Acceptor") ), + OUString("acceptor"), + OUString("com.sun.star.comp.stoc.Acceptor"), xMgr, Reference< XRegistryKey >() ) ) ); // connector xSet->insert( makeAny( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("connectr") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.Connector") ), + OUString("connectr"), + OUString("com.sun.star.comp.stoc.Connector"), xMgr, Reference< XRegistryKey >() ) ) ); // iiop bridge xSet->insert( makeAny( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.various") ), + OUString("remotebridge"), + OUString("com.sun.star.bridge.Bridge.various"), xMgr, Reference< XRegistryKey >() ) ) ); // bridge factory xSet->insert( makeAny( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("brdgfctr") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.BridgeFactory") ), + OUString("brdgfctr"), + OUString("com.sun.star.comp.stoc.BridgeFactory"), xMgr, Reference< XRegistryKey >() ) ) ); // uno url resolver xSet->insert( makeAny( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("uuresolver") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bridge.UnoUrlResolver") ), + OUString("uuresolver"), + OUString("com.sun.star.comp.bridge.UnoUrlResolver"), xMgr, Reference< XRegistryKey >() ) ) ); // java loader // xSet->insert( makeAny( loadLibComponentFactory( -// OUString( RTL_CONSTASCII_USTRINGPARAM("javaloader") ), -// OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader") ), +// OUString("javaloader"), +// OUString("com.sun.star.comp.stoc.JavaComponentLoader"), // xMgr, Reference< XRegistryKey >() ) ) ); } s_bSet = sal_True; @@ -478,11 +478,11 @@ Reference< XInterface > TestImpl::getDirect() if (! _xDirect.is()) { Reference< XSingleServiceFactory > xFac( loadLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("perfobj") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.performance.PerformanceTestObject") ), + OUString("perfobj"), + OUString("com.sun.star.comp.performance.PerformanceTestObject"), _xSMgr, Reference< XRegistryKey >() ) ); if (! xFac.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no test object available!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("no test object available!"), Reference< XInterface >() ); _xDirect = xFac->createInstance(); } } @@ -495,7 +495,7 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl ) Reference< XUnoUrlResolver > xResolver; createInstance( xResolver, _xSMgr, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver") ) ); + OUString("com.sun.star.bridge.UnoUrlResolver") ); Reference< XInterface > xResolvedObject( xResolver->resolve( rUnoUrl ) ); @@ -569,7 +569,7 @@ static void benchmark( { Reference< XPerformanceTest > xBench( xInstance, UNO_QUERY ); if (! xBench.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal test object!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("illegal test object!"), Reference< XInterface >() ); sal_Int64 i; sal_uInt32 tStart, tEnd; @@ -969,7 +969,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) try { - OUString aLoopStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("loop") ) ) ); + OUString aLoopStr( extractParam( rArgs, OUString("loop") ) ); if (aLoopStr.getLength()) { sal_Int64 n = aLoopStr.toInt64(); @@ -977,7 +977,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) nLoop = n; } - OUString aDurationStr( extractParam( rArgs , OUString( RTL_CONSTASCII_USTRINGPARAM("duration" ) ) ) ); + OUString aDurationStr( extractParam( rArgs , OUString("duration" ) ) ); if( aDurationStr.getLength() ) { sal_Int64 n = aDurationStr.toInt64(); @@ -985,7 +985,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) nLoop = nMagicNumberDirect * n; } - OUString aLogStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("log") ) ) ); + OUString aLogStr( extractParam( rArgs, OUString("log") ) ); if (aLogStr.getLength()) { if (aLogStr.compareToAscii( "stderr" ) == 0) @@ -1011,7 +1011,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } } - OUString aArgStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("opt") ) ) ); + OUString aArgStr( extractParam( rArgs, OUString("opt") ) ); if (aArgStr.getLength()) { aArg = aArgStr; @@ -1061,16 +1061,16 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) aCurrentLanguageBindingName.pData, 0 ); // pseudo mapping uno<->uno: does nothing! - Mapping aMapping( aCppEnv.get(), aAnoCppEnv.get(), OUString( RTL_CONSTASCII_USTRINGPARAM("pseudo") ) ); + Mapping aMapping( aCppEnv.get(), aAnoCppEnv.get(), OUString("pseudo") ); if (! aMapping.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no pseudo mapping available!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("no pseudo mapping available!"), Reference< XInterface >() ); Reference< XInterface > xMapped; Reference< XInterface > xDirect( getDirect() ); aMapping.mapInterface( reinterpret_cast< void ** >( &xMapped ), xDirect.get(), ::getCppuType( &xDirect ) ); if (! xMapped.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("mapping object failed!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("mapping object failed!"), Reference< XInterface >() ); sal_uInt32 nStart = getSystemTicks(); benchmark( aSheets[ "mapped in process" ], xMapped, nLoop / 100 ); @@ -1085,22 +1085,22 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) // start server process oslSecurity hSecurity = osl_getCurrentSecurity(); if (! hSecurity) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get current security handle!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("cannot get current security handle!"), Reference< XInterface >() ); OUString aArgs[] = { - OUString( RTL_CONSTASCII_USTRINGPARAM("-c") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.performance.PerformanceTestObject") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("-l") ), + OUString("-c"), + OUString("com.sun.star.comp.performance.PerformanceTestObject"), + OUString("-l"), #ifdef SAL_UNX - OUString( RTL_CONSTASCII_USTRINGPARAM("libperfobj.so") ), + OUString("libperfobj.so"), #else - OUString( RTL_CONSTASCII_USTRINGPARAM("perfobj.dll") ), + OUString("perfobj.dll"), #endif - OUString( RTL_CONSTASCII_USTRINGPARAM("-r") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("-u") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ), - OUString( RTL_CONSTASCII_USTRINGPARAM("--singleaccept") ) + OUString("-r"), + OUString("applicat.rdb"), + OUString("-u"), + OUString("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject"), + OUString("--singleaccept") }; rtl_uString * pArgs[] = { aArgs[0].pData, @@ -1132,7 +1132,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) osl_freeSecurityHandle( hSecurity ); if (! hProcess) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("cannot start server process!") ), Reference< XInterface >() ); + throw RuntimeException( OUString("cannot start server process!"), Reference< XInterface >() ); osl_freeProcessHandle( hProcess ); // wait three seconds @@ -1141,8 +1141,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) osl_waitThread( &threeSeconds ); // connect and resolve outer process object - Reference< XInterface > xResolvedObject( resolveObject( OUString( - RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ) ) ); + Reference< XInterface > xResolvedObject( resolveObject( OUString("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ) ); benchmark( aSheets[ "remote same host" ], xResolvedObject, nLoop / 300 ); } @@ -1152,7 +1151,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) if (aArg.indexOf( 'r' ) >= 0) { // remote - OUString aUnoUrl( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("url") ) ) ); + OUString aUnoUrl( extractParam( rArgs, OUString("url") ) ); if (! aUnoUrl.getLength()) throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("performance test r(emote) needs additional uno url!") ), Reference< XInterface >() ); @@ -1172,7 +1171,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) { // java benchmark( aSheets[ "java in process" ], - _xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.benchmark.JavaTestObject"))), + _xSMgr->createInstance(OUString("com.sun.star.comp.benchmark.JavaTestObject")), nLoop / 1000 ); } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 1163e5d9903c..0eb97e2e345c 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4615,7 +4615,7 @@ void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); - // bool localize = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ); + // bool localize = xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; if ( xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ) ) { diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index e07c4edcce74..0f5d3ea3bd8d 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -169,7 +169,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument //===== Service =============================================================== ::rtl::OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel")); + return rtl::OUString("com.sun.star.awt.tab.UnoControlTabPageModel"); } Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void) @@ -195,7 +195,7 @@ UnoControlTabPage::~UnoControlTabPage() ::rtl::OUString UnoControlTabPage::GetComponentServiceName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPageModel")); + return ::rtl::OUString("TabPageModel"); } void UnoControlTabPage::dispose() throw(RuntimeException) @@ -265,8 +265,8 @@ throw (::com::sun::star::uno::RuntimeException) Sequence< rtl::OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); // Properties in a sequence must be sorted! - aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" )); - aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" )); + aProps[0] = rtl::OUString( "Height" ); + aProps[1] = rtl::OUString( "Width" ); aValues[0] <<= aAppFontSize.Height(); aValues[1] <<= aAppFontSize.Width(); @@ -292,8 +292,8 @@ throw (::com::sun::star::uno::RuntimeException) mbPosModified = true; Sequence< rtl::OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionX" )); - aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionY" )); + aProps[0] = rtl::OUString( "PositionX" ); + aProps[1] = rtl::OUString( "PositionY" ); aValues[0] <<= aTmp.Width(); aValues[1] <<= aTmp.Height(); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index d228b2e7e050..5e6c64b056cc 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -289,7 +289,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti if ( existent == maControls.end() ) return candidateId; } - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "out of identifiers" ) ), NULL ); + throw uno::RuntimeException( ::rtl::OUString( "out of identifiers" ), NULL ); } //------------------------------------------------------------------------ @@ -308,7 +308,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti if ( loop == maControls.end() ) return candidateName; } - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "out of identifiers" ) ), NULL ); + throw uno::RuntimeException( ::rtl::OUString( "out of identifiers" ), NULL ); } // ---------------------------------------------------- // Function to set the controls' visibility according @@ -494,7 +494,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain uno::Reference< awt::XControl > xControl; if ( !( _rElement >>= xControl ) || !xControl.is() ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Elements must support the XControl interface." ) ), + ::rtl::OUString( "Elements must support the XControl interface." ), *this, 1 ); @@ -509,7 +509,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier uno::Reference< awt::XControl > xControl; if ( !mpControls->getControlForIdentifier( _nIdentifier, xControl ) ) throw container::NoSuchElementException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "There is no element with the given identifier." ) ), + ::rtl::OUString( "There is no element with the given identifier." ), *this ); @@ -523,14 +523,14 @@ void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, uno::Reference< awt::XControl > xExistentControl; if ( !mpControls->getControlForIdentifier( _nIdentifier, xExistentControl ) ) throw container::NoSuchElementException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "There is no element with the given identifier." ) ), + ::rtl::OUString( "There is no element with the given identifier." ), *this ); uno::Reference< awt::XControl > xNewControl; if ( !( _rElement >>= xNewControl ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Elements must support the XControl interface." ) ), + ::rtl::OUString( "Elements must support the XControl interface." ), *this, 1 ); diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index f8579d57e192..70a29ffc9bde 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -458,7 +458,7 @@ namespace toolkitform { ::vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< ::vcl::PDFWriter::PushButtonWidget* >( _rpDescriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) >>= eButtonType ); + OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "ButtonType" ) ) >>= eButtonType ); static const ::rtl::OUString FM_PROP_TARGET_URL(RTL_CONSTASCII_USTRINGPARAM("TargetURL")); if ( eButtonType == FormButtonType_SUBMIT ) { @@ -470,12 +470,12 @@ namespace toolkitform if ( xParentProps.is() ) { Reference< XServiceInfo > xParentSI( xParentProps, UNO_QUERY ); - if ( xParentSI.is() && xParentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.HTMLForm" ) ) ) ) + if ( xParentSI.is() && xParentSI->supportsService( ::rtl::OUString( "com.sun.star.form.component.HTMLForm" ) ) ) { OSL_VERIFY( xParentProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= pButtonWidget->URL ); pButtonWidget->Submit = true; FormSubmitMethod eMethod = FormSubmitMethod_POST; - OSL_VERIFY( xParentProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubmitMethod" ) ) ) >>= eMethod ); + OSL_VERIFY( xParentProps->getPropertyValue( rtl::OUString( "SubmitMethod" ) ) >>= eMethod ); pButtonWidget->SubmitGet = (eMethod == FormSubmitMethod_GET); } } @@ -543,7 +543,7 @@ namespace toolkitform } catch(...) { - pRadioWidget->OnValue = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" ) ); + pRadioWidget->OnValue = rtl::OUString( "On" ); } } @@ -558,7 +558,7 @@ namespace toolkitform OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_DROPDOWN ) >>= pListWidget->DropDown ); // ............................ // multi selection - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= pListWidget->MultiSelect ); + OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "MultiSelection" ) ) >>= pListWidget->MultiSelect ); // ............................ // entries getStringItemVector( xModelProps, pListWidget->Entries ); @@ -568,7 +568,7 @@ namespace toolkitform // get selected items Sequence< sal_Int16 > aSelectIndices; - OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= aSelectIndices ); + OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString( "SelectedItems" ) ) >>= aSelectIndices ); if( aSelectIndices.getLength() > 0 ) { pListWidget->SelectedEntries.resize( 0 ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 1191d6ab8f59..b3922f9ac462 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -174,7 +174,7 @@ namespace ucb { namespace ucp { namespace ext // obtain the properties which our result set is set up for from the wrapped content Sequence< ::rtl::OUString > aPropertyNames(1); - aPropertyNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); + aPropertyNames[0] = ::rtl::OUString( "Title" ); const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 6a498446c620..9005de240c48 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,57 +41,57 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND // | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), + rtl::OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -124,49 +124,46 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index f4d60c85b5fc..638c2ff5820b 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -61,7 +61,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw io::NotConnectedException(); if (!g_seekable_can_seek(G_SEEKABLE(mpStream))) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Seek unsupported")), + throw io::IOException(rtl::OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index 2f9774ef5de4..b3777144b463 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -46,7 +46,7 @@ void SAL_CALL Seekable::truncate( void ) throw io::NotConnectedException(); if (!g_seekable_can_truncate(mpStream)) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Truncate unsupported")), + throw io::IOException(rtl::OUString("Truncate unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -61,7 +61,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) throw io::NotConnectedException(); if (!g_seekable_can_seek(mpStream)) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Seek unsupported")), + throw io::IOException(rtl::OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -111,7 +111,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc } if (!bOk) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting size unsupported")), + throw io::IOException(rtl::OUString("Getting size unsupported"), static_cast< cppu::OWeakObject * >(this)); return nSize; diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 4d5a91384e84..96aa7dad4faf 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -102,30 +102,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -135,15 +133,15 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ) ), + rtl::OUString( "TargetURL" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -163,30 +161,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -195,14 +191,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ) ), + rtl::OUString( "TargetURL" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -231,30 +227,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -264,8 +258,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -285,30 +279,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -317,8 +309,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -348,28 +340,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -379,8 +371,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -417,27 +409,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -461,27 +449,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -491,12 +475,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ) @@ -523,27 +507,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -553,7 +533,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -572,27 +552,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -602,29 +578,28 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -651,27 +626,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -681,7 +652,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -700,27 +671,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -730,19 +697,18 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 40f345a841e9..5453c195b328 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -728,13 +728,13 @@ Content::createNewContent( const ucb::ContentInfo& Info ) return uno::Reference< ucb::XContent >(); rtl::OUString aURL = m_aUri.getUri(); - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aURL += rtl::OUString("/"); if ( Info.Type.equalsIgnoreAsciiCase( getContentType( m_aUri.getScheme(), sal_True ) ) ) - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder")); + aURL += rtl::OUString("New_Folder"); else - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Stream")); + aURL += rtl::OUString("New_Stream"); uno::Reference< ucb::XContentIdentifier > xId( new ::ucbhelper::ContentIdentifier( aURL ) ); @@ -922,7 +922,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")), + rtl::OUString("ContentType"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -930,14 +930,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.aContentType ); xRow->appendString( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), + rtl::OUString("Title"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")), + rtl::OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")), + rtl::OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -953,7 +953,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")), + rtl::OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -963,7 +963,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), + rtl::OUString("MediaType"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), @@ -974,7 +974,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")), + rtl::OUString("Size"), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -983,7 +983,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")), + rtl::OUString("Compressed"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -991,7 +991,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")), + rtl::OUString("Encrypted"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasEncryptedEntries")), + rtl::OUString("HasEncryptedEntries"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1075,32 +1075,32 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1109,8 +1109,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1139,8 +1139,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Empty title not allowed!" )), + rtl::OUString( + "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1149,8 +1149,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1175,8 +1175,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1184,8 +1184,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Compressed" ) @@ -1211,16 +1211,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Compressed only supported by streams!" )), + rtl::OUString( + "Compressed only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1247,16 +1247,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Encrypted only supported by streams!" )), + rtl::OUString( + "Encrypted only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1264,8 +1264,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "EncryptionKey" ) @@ -1296,16 +1296,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "EncryptionKey not supported by non-root folder!" )), + rtl::OUString( + "EncryptionKey not supported by non-root folder!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1358,8 +1358,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "No property set for storing the value!" )), + rtl::OUString( + "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1371,7 +1371,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Assemble new content identifier... rtl::OUString aNewURL = m_aUri.getParentUri(); - aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aNewURL += rtl::OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); @@ -1394,14 +1394,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")), + rtl::OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aNewTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aEvent.PropertyName = rtl::OUString("Title"); aEvent.OldValue = uno::makeAny( m_aProps.aTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1422,8 +1422,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Uri")), + rtl::OUString( + "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1432,8 +1432,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Cannot store persistent data!" )), + rtl::OUString( + "Cannot store persistent data!" ), this ); // Unreachable } @@ -1496,8 +1496,8 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Uri")), + rtl::OUString( + "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1508,7 +1508,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Got no data stream!")), + rtl::OUString("Got no data stream!"), this ); // Unreachable } diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 528b18d948df..a1261eb565ba 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -103,30 +103,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -136,14 +134,14 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -154,8 +152,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "HasEncryptedEntries" ) ), + rtl::OUString( "HasEncryptedEntries" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -178,30 +175,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -210,14 +205,14 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -245,28 +240,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -275,21 +270,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -300,13 +295,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), + rtl::OUString( "Compressed" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) ), + rtl::OUString( "Encrypted" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -339,28 +334,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -370,20 +361,19 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -391,7 +381,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flush" ) ), + rtl::OUString( "flush" ), -1, getCppuVoidType() ) @@ -413,28 +403,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -444,30 +430,29 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -475,7 +460,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flush" ) ), + rtl::OUString( "flush" ), -1, getCppuVoidType() ) @@ -498,27 +483,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -528,17 +509,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index b3c201786b24..cfa46a17a9db 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -77,7 +77,7 @@ void PackageUri::init() const if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -92,7 +92,7 @@ void PackageUri::init() const != sal_Unicode( '/' ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -116,8 +116,8 @@ void PackageUri::init() const { m_aParam += ( !m_aParam.isEmpty() - ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "&purezip" ) ) - : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?purezip" ) ) ); + ? ::rtl::OUString( "&purezip" ) + : ::rtl::OUString( "?purezip" ) ); } aPureUri = aPureUri.replaceAt( 0, @@ -131,7 +131,7 @@ void PackageUri::init() const // Only <scheme>:/// - Empty authority // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } else if ( nEnd == ( aPureUri.getLength() - 1 ) ) @@ -142,7 +142,7 @@ void PackageUri::init() const // Only <scheme>://// or <scheme>://<something>// // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -163,7 +163,7 @@ void PackageUri::init() const nStart, aPureUri.getLength() - nStart, aNormPackage ); m_aPackage = ::ucb_impl::urihelper::decodeSegment( aNormPackage ); - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); m_aUri = m_aUri.replaceAt( 0, ( nParam >= 0 ) ? nParam @@ -189,11 +189,11 @@ void PackageUri::init() const if ( m_aPath.indexOf( "//" ) != -1 || m_aPath.indexOf( "%2F" ) != -1 || m_aPath.indexOf( "%2f" ) != -1 - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) ) - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( ".." ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( "." ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -230,7 +230,7 @@ void PackageUri::init() const else { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); } } } diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 61eb808e15d0..0ebf3729b26a 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -110,30 +110,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -142,8 +140,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -170,30 +168,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -202,8 +198,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -214,7 +210,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Storage" ) ), + rtl::OUString( "Storage" ), -1, getCppuType( static_cast< const uno::Reference< embed::XStorage > * >( 0 ) ), @@ -238,30 +234,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -271,8 +265,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -283,7 +277,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentModel" ) ), + rtl::OUString( "DocumentModel" ), -1, getCppuType( static_cast< const uno::Reference< frame::XModel > * >( 0 ) ), @@ -309,28 +303,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -340,8 +334,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -383,27 +377,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -413,12 +403,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -442,27 +432,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -472,17 +458,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -507,27 +493,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -537,29 +519,28 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -583,27 +564,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -613,19 +590,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -651,27 +627,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -681,7 +653,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 19f35caaa349..b0e03e8ac664 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -76,8 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; - aDocEvent.EventName = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) ); + aDocEvent.EventName = rtl::OUString( "OfficeDocumentsListener::notifyClosing" ); m_pManager->notifyEvent( aDocEvent ); } @@ -147,8 +146,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) try { uno::Any aValue = xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "RuntimeUID" ) ) ); + rtl::OUString( "RuntimeUID" ) ); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 8c7b5859c9fb..dca9415f4bd8 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -93,8 +93,8 @@ DocumentContentFactory::getSupportedServiceNames() // static rtl::OUString DocumentContentFactory::getImplementationName_Static() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ) ); + return rtl::OUString( + "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ); } //========================================================================= @@ -104,8 +104,8 @@ DocumentContentFactory::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ) ); + = rtl::OUString( + "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ); return aSNS; } @@ -127,8 +127,8 @@ DocumentContentFactory::createDocumentContent( xDocFac = uno::Reference< frame::XTransientDocumentsDocumentContentFactory >( m_xSMgr->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.TransientDocumentsContentProvider" ) ) + rtl::OUString( + "com.sun.star.ucb.TransientDocumentsContentProvider" ) ), uno::UNO_QUERY ); } @@ -141,8 +141,8 @@ DocumentContentFactory::createDocumentContent( return xDocFac->createDocumentContent( Model ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unable to obtain document content factory!" ) ), + rtl::OUString( + "Unable to obtain document content factory!" ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 7a9c223a04c5..6993d2e143ab 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -97,8 +97,8 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ), + rtl::OUString( + "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) ); @@ -125,7 +125,7 @@ ContentProvider::queryContent( Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) throw ucb::IllegalIdentifierException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid URL!" ) ), + rtl::OUString( "Invalid URL!" ), Identifier ); // Normalize URI. @@ -190,16 +190,16 @@ ContentProvider::createDocumentContent( // no content. throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Illegal Content Identifier!" ) ), + rtl::OUString( + "Illegal Content Identifier!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } else { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unable to obtain document id from model!" ) ), + rtl::OUString( + "Unable to obtain document id from model!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } @@ -207,8 +207,8 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No Document Manager!" ) ), + rtl::OUString( + "No Document Manager!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index e31a877796f2..5b84469822c6 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -98,8 +98,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, ( eMode != READ_WRITE_NOCREATE ) && ( eMode != READ_WRITE_CREATE ) ) throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Invalid open mode!" ) ), + rtl::OUString( + "Invalid open mode!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -107,8 +107,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Root never has a storage!" ) ), + rtl::OUString( + "Root never has a storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 1 ) ); } @@ -420,8 +420,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( sal_Int16( 2 ) ); else throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Invalid document id!" ) ), + rtl::OUString( + "Invalid document id!" ), uno::Reference< uno::XInterface >() ); } @@ -435,8 +435,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( try { uno::Any aPropValue = xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ) ) ); + rtl::OUString( "OpenMode" ) ); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) @@ -448,8 +447,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not readable. throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Storage is open, but not readable!" ) ), + rtl::OUString( + "Storage is open, but not readable!" ), uno::Reference< uno::XInterface >() ); } // storage okay @@ -461,8 +460,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not writable. throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Storage is open, but not writable!" ) ), + rtl::OUString( + "Storage is open, but not writable!" ), uno::Reference< uno::XInterface >() ); } // storage okay @@ -475,8 +474,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "Bug! Value of property OpenMode has wrong type!" ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Bug! Value of property OpenMode has wrong type!" ) ), + rtl::OUString( + "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >() ); } } @@ -485,8 +484,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Property OpenMode not supported!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Bug! Value of property OpenMode has wrong type!" ) ), + rtl::OUString( + "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -495,8 +494,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Caught WrappedTargetException!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "WrappedTargetException during getPropertyValue!" ) ), + rtl::OUString( + "WrappedTargetException during getPropertyValue!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -559,8 +558,8 @@ StorageElementFactory::queryStream( if ( !xParentStorage.is() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No parent storage!" ) ), + rtl::OUString( + "No parent storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -569,16 +568,16 @@ StorageElementFactory::queryStream( if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Root never is a stream!" ) ), + rtl::OUString( + "Root never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } else if ( aUri.isDocument() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "A document never is a stream!" ) ), + rtl::OUString( + "A document never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -615,8 +614,8 @@ StorageElementFactory::queryStream( OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" ); throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unknown open mode!" ) ), + rtl::OUString( + "Unknown open mode!" ), uno::Reference< uno::XInterface >() ); } @@ -672,8 +671,8 @@ StorageElementFactory::queryStream( if ( !xStream.is() ) { throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No stream!" ) ), + rtl::OUString( + "No stream!" ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 530306c2badc..5886429d2089 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -268,7 +268,7 @@ void NeonUri::calculateURI () return aTemp; } else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")); + return rtl::OUString("/"); } bool NeonUri::operator== ( const NeonUri & rOther ) const @@ -284,7 +284,7 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const void NeonUri::AppendPath (const rtl::OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")); + mPath += rtl::OUString("/"); mPath += rPath; calculateURI (); diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 478dc66a4bb4..0c3cd9ac6456 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -78,8 +78,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -87,8 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -96,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -104,7 +102,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); @@ -113,8 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -122,8 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + rtl::OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -131,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -139,7 +135,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -147,7 +143,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -155,8 +151,8 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -431,21 +427,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ) ); + rtl::OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ) ); + rtl::OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ); + rtl::OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ); + rtl::OUString( "Title" ) ); } // Add optional properties. @@ -454,29 +450,29 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ) ); + rtl::OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ) ); + rtl::OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ); + rtl::OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ) ); + rtl::OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ); + rtl::OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ) ); + rtl::OUString( + "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) @@ -532,27 +528,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -563,18 +555,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -585,7 +577,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "post" ) ), + rtl::OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -618,14 +610,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "createNewContent" ) ), + rtl::OUString( + "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); nPos++; @@ -639,13 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lock" ) ), + rtl::OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unlock" ) ), + rtl::OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 9e5a4f7cd0a8..3df9f0cc7766 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -97,8 +97,7 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "*** unknown ***" ) ) ), + rtl::OUString( "*** unknown ***" ) ), true ); } @@ -578,17 +577,17 @@ namespace DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ETag" ) ), + rtl::OUString( "ETag" ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Last-Modified" ) ), + rtl::OUString( "DateModified" ), + rtl::OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content-Length" ) ), + rtl::OUString( "Size" ), + rtl::OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) + rtl::OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 8f351de50912..2c1b7819753b 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -138,7 +138,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DAV:" ) ); + aNameSpace = rtl::OUString( "DAV:" ); } } diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 0a98c4edf2c1..32201ef410a0 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -207,7 +207,7 @@ bool SerfSession::isHeadRequestInProgress() bool SerfSession::isSSLNeeded() { - return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "https" ) ) ); + return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( "https" ) ); } char* SerfSession::getHostinfo() diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 3594ddd96083..0c75ca3fd1e3 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,8 +188,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) m_xSMgr, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xCtx; xCtx.set( xProps->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), + rtl::OUString( "DefaultContext" ) ), uno::UNO_QUERY_THROW ); uno::Reference< task::XInteractionHandler > xIH( @@ -961,7 +960,7 @@ Content::queryCreatableContentsInfo() beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), aProp ); + rtl::OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -1383,7 +1382,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1393,16 +1392,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1425,7 +1424,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1435,11 +1434,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ) + rtl::OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "CreatableContentsInfo" ) ), + rtl::OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -3129,8 +3127,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { rtl::OUString aLocation; m_xCachedProps->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Content-Location" ) ) ) >>= aLocation; + "Content-Location" ) ) >>= aLocation; if ( aLocation.getLength() ) { try diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 011094154092..982a2a19b9e0 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -62,8 +62,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -71,8 +70,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -80,7 +78,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -88,7 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); @@ -97,8 +95,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -106,8 +103,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + rtl::OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -115,7 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -123,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -131,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -139,8 +135,8 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -426,21 +422,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ) ); + rtl::OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ) ); + rtl::OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ); + rtl::OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ); + rtl::OUString( "Title" ) ); } // Add optional properties. @@ -449,29 +445,29 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ) ); + rtl::OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ) ); + rtl::OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ); + rtl::OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ) ); + rtl::OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ); + rtl::OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ) ); + rtl::OUString( + "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) @@ -525,27 +521,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -556,18 +548,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -578,7 +570,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "post" ) ), + rtl::OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -611,14 +603,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "createNewContent" ) ), + rtl::OUString( + "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); nPos++; @@ -632,13 +624,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lock" ) ), + rtl::OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unlock" ) ), + rtl::OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 2d01a1eac1f8..1d1523ff84de 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -444,8 +444,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "IsFolder" ) ) ); + "IsFolder" ) ); rValue >>= bFolder; if ( !bFolder ) @@ -461,8 +460,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "IsDocument" ) ) ); + "IsDocument" ) ); rValue >>= bDocument; if ( !bDocument ) diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 60bd5b42d599..7cf724ccf539 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -108,12 +108,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break; - case BUTTON_ABORT: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break; - case BUTTON_CANCEL: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break; - case BUTTON_RETRY: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break; - case BUTTON_YES: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break; - case BUTTON_NO : aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break; + case BUTTON_OK: aText = rtl::OUString( "OK" );break; + case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; + case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; + case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; + case BUTTON_YES: aText = rtl::OUString( "Yes" );break; + case BUTTON_NO : aText = rtl::OUString( "No" );break; } } return aText.isEmpty() ? nil : CreateNSString( aText); diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index f4b2df42b87b..36b6a9fca71c 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -63,12 +63,12 @@ bool DragSource::g_DropSuccess = false; OUString dragSource_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1")); + return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); } Sequence<OUString> dragSource_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"))); + return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDragSource")); } @@ -179,7 +179,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) { if (aArguments.getLength() < 2) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Not enough parameter.")), + throw Exception(OUString("DragSource::initialize: Not enough parameter."), static_cast<OWeakObject*>(this)); } @@ -197,13 +197,13 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) if (![mView respondsToSelector: @selector(registerMouseEventListener:)] || ![mView respondsToSelector: @selector(unregisterMouseEventListener:)]) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view doesn't support mouse listener")), + throw Exception(OUString("DragSource::initialize: Provided view doesn't support mouse listener"), static_cast<OWeakObject*>(this)); } NSWindow* pWin = [mView window]; if( ! pWin || ![pWin respondsToSelector: @selector(getSalFrame)] ) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view is not attached to a vcl frame")), + throw Exception(OUString("DragSource::initialize: Provided view is not attached to a vcl frame"), static_cast<OWeakObject*>(this)); } mpFrame = (AquaSalFrame*)[pWin performSelector: @selector(getSalFrame)]; @@ -212,7 +212,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) if (mDragSourceHelper == nil) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Cannot initialize DragSource")), + throw Exception(OUString("DragSource::initialize: Cannot initialize DragSource"), static_cast<OWeakObject*>(this)); } diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 1b4751877c7c..1eeebc520186 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -56,13 +56,13 @@ using ::rtl::OUString; OUString dropTarget_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1")); + return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"); } Sequence<OUString> dropTarget_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"))); + return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDropTarget")); } @@ -385,7 +385,7 @@ void DropTarget::concludeDragOperation(id /*sender*/) { if (aArguments.getLength() < 2) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("DropTarget::initialize: Cannot install window event handler")), + throw RuntimeException(OUString("DropTarget::initialize: Cannot install window event handler"), static_cast<OWeakObject*>(this)); } diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 6d7ef1b8ed15..5d541972f82b 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -70,7 +70,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } @@ -93,7 +93,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) if (dp.get() == NULL) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } @@ -131,7 +131,7 @@ void OSXTransferable::initClipboardItemList() if (pboardFormats == NULL) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot get clipboard data")), + throw RuntimeException(OUString("AquaClipboard: Cannot get clipboard data"), static_cast<XTransferable*>(this)); } diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 87a7b6d10f74..0db1318695de 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -72,12 +72,12 @@ using ::rtl::OUString; OUString clipboard_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.AquaClipboard")); + return OUString("com.sun.star.datatransfer.clipboard.AquaClipboard"); } Sequence<OUString> clipboard_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"))); + return makeSequence(OUString("com.sun.star.datatransfer.clipboard.SystemClipboard")); } @@ -103,8 +103,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard if (mPasteboard == nil) { - throw RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create Cocoa pasteboard")), + throw RuntimeException(OUString("AquaClipboard: Cannot create Cocoa pasteboard"), static_cast<XClipboardEx*>(this)); } } @@ -118,7 +117,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard [mPasteboard release]; throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create pasteboard change listener")), + OUString("AquaClipboard: Cannot create pasteboard change listener"), static_cast<XClipboardEx*>(this)); } @@ -215,7 +214,7 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.push_back(listener); @@ -228,7 +227,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.remove(listener); diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index dab0bb9a9ecf..d27361a81f7d 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -400,7 +400,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // do we want a progress panel ? sal_Bool bShowProgressPanel = sal_True; - beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) ); + beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShowProgressPanel; if( ! i_rController.isShowDialogs() ) @@ -408,7 +408,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // possibly create one job for collated output sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ) ); + beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index da36cfab633f..10eb3c24e067 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1079,7 +1079,7 @@ rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "esc" ) ); + aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 953c38653772..72cd828c3628 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -63,9 +63,9 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; { rtl::OUString aDialog; if( nDialog == SHOWDIALOG_ID_ABOUT ) - aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABOUT")); + aDialog = rtl::OUString("ABOUT"); else if( nDialog == SHOWDIALOG_ID_PREFERENCES ) - aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PREFERENCES")); + aDialog = rtl::OUString("PREFERENCES"); const ApplicationEvent* pAppEvent = new ApplicationEvent( ApplicationEvent::TYPE_SHOWDIALOG, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx index c5dfabb9fd34..37ac4e4d99b1 100644 --- a/vcl/ios/source/app/salsys.cxx +++ b/vcl/ios/source/app/salsys.cxx @@ -108,12 +108,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break; - case BUTTON_ABORT: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break; - case BUTTON_CANCEL: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break; - case BUTTON_RETRY: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break; - case BUTTON_YES: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break; - case BUTTON_NO : aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break; + case BUTTON_OK: aText = rtl::OUString( "OK" );break; + case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; + case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; + case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; + case BUTTON_YES: aText = rtl::OUString( "Yes" );break; + case BUTTON_NO : aText = rtl::OUString( "No" );break; } } return aText.getLength() ? CreateNSString( aText) : nil; diff --git a/vcl/ios/source/dtrans/iOSTransferable.cxx b/vcl/ios/source/dtrans/iOSTransferable.cxx index 1f335403d1ff..2ff71156c01d 100644 --- a/vcl/ios/source/dtrans/iOSTransferable.cxx +++ b/vcl/ios/source/dtrans/iOSTransferable.cxx @@ -66,11 +66,11 @@ Any SAL_CALL iOSTransferable::getTransferData( const DataFlavor& aFlavor ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); // ??? return Any(); @@ -107,7 +107,7 @@ void iOSTransferable::initClipboardItemList() if (pboardFormats == NULL) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot get clipboard data")), + throw RuntimeException(OUString("IosClipboard: Cannot get clipboard data"), static_cast<XTransferable*>(this)); } diff --git a/vcl/ios/source/dtrans/ios_clipboard.cxx b/vcl/ios/source/dtrans/ios_clipboard.cxx index 03e493713bef..a7fc7af8ff9d 100644 --- a/vcl/ios/source/dtrans/ios_clipboard.cxx +++ b/vcl/ios/source/dtrans/ios_clipboard.cxx @@ -71,12 +71,12 @@ using ::rtl::OUString; OUString clipboard_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.IosClipboard")); + return OUString("com.sun.star.datatransfer.clipboard.IosClipboard"); } Sequence<OUString> clipboard_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"))); + return makeSequence(OUString("com.sun.star.datatransfer.clipboard.SystemClipboard")); } @@ -103,8 +103,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard) if (mPasteboard == nil) { - throw RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard")), + throw RuntimeException(OUString("IosClipboard: Cannot create pasteboard"), static_cast<XClipboardEx*>(this)); } } @@ -118,7 +117,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard) [mPasteboard release]; throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard change listener")), + OUString("IosClipboard: Cannot create pasteboard change listener"), static_cast<XClipboardEx*>(this)); } @@ -216,7 +215,7 @@ void SAL_CALL IosClipboard::addClipboardListener(const Reference< XClipboardList MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.push_back(listener); @@ -229,7 +228,7 @@ void SAL_CALL IosClipboard::removeClipboardListener(const Reference< XClipboardL MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.remove(listener); diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx index e619111ac768..43cc7ba24a45 100644 --- a/vcl/ios/source/window/salframe.cxx +++ b/vcl/ios/source/window/salframe.cxx @@ -635,7 +635,7 @@ rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "esc" ) ); + aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 314ade5e1960..c7ec909f1a1a 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -236,7 +236,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) ); #elif defined WNT (void)pPrinter; - xFilePicker->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) ); + xFilePicker->appendFilter( ::rtl::OUString( "*.PRN" ), ::rtl::OUString( "*.prn" ) ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index fe2a6a945d08..b303a221f52b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -728,7 +728,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) - aRet = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ) ); + aRet = rtl::OUString( "???" ); else { aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym ); diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 76ef59886ac4..b2de7a048333 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const pWMA->m_bWMshouldSwitchWorkspace = true; vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get(); - rtl::OUString aSetting( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WM" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShouldSwitchWorkspace" ) ) ) ); + rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ), + rtl::OUString( "ShouldSwitchWorkspace" ) ) ); if( aSetting.isEmpty() ) { if( m_aWMName.EqualsAscii( "awesome" ) ) @@ -996,7 +996,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const if( !aCountry.isEmpty() ) { - aLocaleString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")); + aLocaleString += ::rtl::OUString("_"); aLocaleString += aCountry; } if( !aVariant.isEmpty() ) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 80f6056006ed..1e621f18c2ae 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -476,7 +476,7 @@ void PPDParser::initPPDFiles() INetURLObject aPPDDir( *ppd_it, INET_PROT_FILE, INetURLObject::ENCODE_ALL ); scanPPDDir( aPPDDir.GetMainURL( INetURLObject::NO_DECODE ) ); } - if( rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() ) + if( rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ) { // last try: search in directory of executable (mainly for setup) OUString aExe; @@ -489,7 +489,7 @@ void PPDParser::initPPDFiles() #endif scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); #ifdef DEBUG - fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" ); + fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" ); #endif } } @@ -1978,7 +1978,7 @@ int PPDContext::getRenderResolution() const void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set - rPaper = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ); + rPaper = rtl::OUString( "A4" ); rWidth = 595; rHeight = 842; if( m_pParser ) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 133a342ce282..3f3353259189 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -1244,8 +1244,8 @@ static void lpgetSysQueueTokenHandler( rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); boost::unordered_set< OUString, OUStringHash > aUniqueSet; boost::unordered_set< OUString, OUStringHash > aOnlySet; - aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) ); - aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) ); + aUniqueSet.insert( OUString( "_all" ) ); + aUniqueSet.insert( OUString( "_default" ) ); // the eventual "all" attribute of the "_all" queue tells us, which // printers are to be used for this user at all diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 524717b558c1..6b284669ed30 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2882,7 +2882,7 @@ void X11SalFrame::beginUnicodeSequence() if( !rSeq.isEmpty() ) endUnicodeSequence(); - rSeq = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "u" ) ); + rSeq = rtl::OUString( "u" ); if( ! aDeleteWatch.isDeleted() ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 0527a827156d..290020883ee1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -906,7 +906,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( !bExtensionTypedIn && ( sToken != "*" ) ) { //if the filename does not already have the auto extension, stick it on - OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken; + OUString sExtension = OUString( "." ) + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx ); @@ -1469,7 +1469,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ": " )); + aLabel += rtl::OUString( ": " ); aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } @@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast<XFilePicker2*>( this ), 1 ); aAny = aArguments[0]; @@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast<XFilePicker2*>( this ), 1 ); sal_Int16 templateId = -1; @@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu break; default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -1855,7 +1855,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O if (!aToken.isEmpty()) { if (!aTokens.isEmpty()) - aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + aTokens += OUString(","); aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 6d5a9c68bcce..3f8b67bbacd3 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -66,7 +66,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) } else { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); if( !aNewURL.isEmpty() ) sURL = aNewURL; } @@ -82,7 +82,7 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) INetURLObject aURL(rURL); if (INET_PROT_FILE == aURL.GetProtocol()) { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); if( !aNewURL.isEmpty() ) { diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 904b47b1cb4a..83c92b2cf792 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper() void GtkPrintWrapper::impl_load() { - m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so.0"))); + m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0")); if (!m_aModule.is()) - m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so"))); + m_aModule.load(rtl::OUString("libgtk-x11-2.0.so")); if (!m_aModule.is()) return; diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index a0e4ac4aa7f3..025373488f71 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled } beans::PropertyValue* const pPrintContent( - m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent")))); + m_rController.getValue(rtl::OUString("PrintContent"))); if (pPrintContent) { @@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY); uno::Reference < XFilter > xFilter( - ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.PDFFilter"))), + ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")), UNO_QUERY); if (xFilter.is()) @@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); uno::Sequence<beans::PropertyValue> aFilterData(2); - aFilterData[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageLayout")); + aFilterData[0].Name = rtl::OUString("PageLayout"); aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPageOnLeft")); + aFilterData[1].Name = rtl::OUString("FirstPageOnLeft"); aFilterData[1].Value <<= sal_False; @@ -987,7 +987,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings aRangeText.AppendAscii(","); } aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText); } else if (pStr && !strcmp(pStr, "current")) @@ -1027,7 +1027,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (i < xSheets->getCount()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1)); } } @@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (aSelection.hasValue()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection"); aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } #endif uno::Sequence<beans::PropertyValue> aArgs(2); - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData")); + aArgs[0].Name = rtl::OUString("FilterData"); aArgs[0].Value <<= aFilterData; - aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream")); + aArgs[1].Name = rtl::OUString("OutputStream"); aArgs[1].Value <<= xOStm; xFilter->filter(aArgs); } @@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange() // TODO: use get_print_pages if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES)) { - beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintRange"))); + beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange")); if (!pVal) - pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent"))); + pVal = m_rController.getValue(rtl::OUString("PrintContent")); SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!"); if (pVal) { @@ -1093,7 +1093,7 @@ GtkPrintDialog::updateControllerPrintRange() if (nVal == 1) { - pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange"))); + pVal = m_rController.getValue(rtl::OUString("PageRange")); SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!"); if (pVal) { @@ -1135,9 +1135,9 @@ GtkPrintDialog::impl_readFromSettings() const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount")))); + rtl::OUString("CopyCount"))); const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate")))); + rtl::OUString("Collate"))); bool bChanged(false); @@ -1173,13 +1173,13 @@ const const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); pItem->setValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount")), + rtl::OUString("CopyCount"), rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); pItem->setValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate")), + rtl::OUString("Collate"), m_pWrapper->print_settings_get_collate(pSettings) - ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false"))) + ? rtl::OUString("true") + : rtl::OUString("false")) ; // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), ); g_object_unref(G_OBJECT(pSettings)); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 2bd096ae3901..d9cf2f0c6e01 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -71,12 +71,12 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); #ifdef ENABLE_TDE - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.TDEFilePicker")); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker"); #else // ENABLE_TDE - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker")); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker"); #endif // ENABLE_TDE return aRet; } @@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker() { if ( m_nFilePickerPid > 0 ) { - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) ); + sendCommand( ::rtl::OUString( "exit" ) ); waitpid( m_nFilePickerPid, NULL, 0 ); } @@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() // this is _not_ an osl::Condition, see i#93366 m_pCommandThread->execCondition().reset(); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) )); + sendCommand( ::rtl::OUString( "exec" )); m_pCommandThread->execCondition().wait(); @@ -184,8 +184,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) ::osl::MutexGuard aGuard( m_aMutex ); ::rtl::OUString aString = bMode? - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )): - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" )); + ::rtl::OUString( "setMultiSelection true" ): + ::rtl::OUString( "setMultiSelection false" ); sendCommand( aString ); } @@ -224,7 +224,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )), + sendCommand( ::rtl::OUString( "getDirectory" ), m_pCommandThread->getDirectoryCondition() ); return m_pCommandThread->getDirectory(); @@ -236,7 +236,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )), + sendCommand( ::rtl::OUString( "getFiles" ), m_pCommandThread->getFilesCondition() ); return m_pCommandThread->getFiles(); @@ -278,7 +278,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )), + sendCommand( ::rtl::OUString( "getCurrentFilter" ), m_pCommandThread->getCurrentFilterCondition() ); return m_pCommandThread->getCurrentFilter(); @@ -531,14 +531,14 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen uno::Any aAny; if ( 0 == rArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); aAny = rArguments[0]; if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); sal_Int16 templateId = -1; @@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -769,7 +769,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep else { throw uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )), + ::rtl::OUString( "the external file picker does not run" ), *this ); } } @@ -779,7 +779,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) if ( m_nFilePickerWrite < 0 ) return; - ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 ); + ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); #if OSL_DEBUG_LEVEL > 0 ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl; @@ -883,17 +883,17 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt const ElementToName *pPtr; const ElementToName pArray[] = { - { ControlActions::ADD_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItem" ) ) }, - { ControlActions::ADD_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItems" ) ) }, - { ControlActions::DELETE_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItem" ) ) }, - { ControlActions::DELETE_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItems" ) ) }, - { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setSelectedItem" ) ) }, - { ControlActions::GET_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getItems" ) ) }, - { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItem" ) ) }, - { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItemIndex" ) ) }, - { ControlActions::SET_HELP_URL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setHelpURL" ) ) }, - { ControlActions::GET_HELP_URL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getHelpURL" ) ) }, - { 0, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "noAction" ) ) } + { ControlActions::ADD_ITEM, ::rtl::OUString( "addItem" ) }, + { ControlActions::ADD_ITEMS, ::rtl::OUString( "addItems" ) }, + { ControlActions::DELETE_ITEM, ::rtl::OUString( "deleteItem" ) }, + { ControlActions::DELETE_ITEMS, ::rtl::OUString( "deleteItems" ) }, + { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( "setSelectedItem" ) }, + { ControlActions::GET_ITEMS, ::rtl::OUString( "getItems" ) }, + { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( "getSelectedItem" ) }, + { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) }, + { ControlActions::SET_HELP_URL, ::rtl::OUString( "setHelpURL" ) }, + { ControlActions::GET_HELP_URL, ::rtl::OUString( "getHelpURL" ) }, + { 0, ::rtl::OUString( "noAction" ) } }; for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 86583d40529d..cd20d3da69e6 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -77,9 +77,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker")); + aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); return aRet; } } @@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) if (args.getLength() == 0) { throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) { throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 31992b8d919a..9a8cac9b2b04 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2218,7 +2218,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); ::rtl::OUString aUserPath; - aBootstrap.getFrom( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath ); + aBootstrap.getFrom( rtl::OUString( "UserInstallation" ), aUserPath ); aUserPath += String( RTL_CONSTASCII_USTRINGPARAM("/user/config/fontnames.dat") ); String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 4db851ad177e..bf1a44de7570 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -55,7 +55,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 34a2c9ac78d4..3d67d486d982 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -48,7 +48,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx index 6155a094a010..70739e094697 100644 --- a/xmlreader/source/span.cxx +++ b/xmlreader/source/span.cxx @@ -42,8 +42,7 @@ rtl::OUString Span::convertFromUtf8() const { RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw css::uno::RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("cannot convert from UTF-8")), + rtl::OUString("cannot convert from UTF-8"), css::uno::Reference< css::uno::XInterface >()); } return rtl::OUString(s, SAL_NO_ACQUIRE); diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index cfdad6f497f9..1da81d4a854c 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -71,8 +71,8 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl) fileUrl_, css::uno::Reference< css::uno::XInterface >()); default: throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot open ")) + - fileUrl_ + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + + (rtl::OUString("cannot open ") + + fileUrl_ + rtl::OUString(": ") + OUString::number(e)), css::uno::Reference< css::uno::XInterface >()); } @@ -273,7 +273,7 @@ void XmlReader::skipProcessingInstruction() { pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("?>")); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad '<?' in ")) + + (rtl::OUString("bad '<?' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -460,8 +460,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) if (val > 0x10FFFF) { // avoid overflow throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "'&#x...' too large in ")) + + "'&#x...' too large in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -478,8 +477,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) if (val > 0x10FFFF) { // avoid overflow throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "'&#...' too large in ")) + + "'&#...' too large in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -487,8 +485,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } if (position == p || *position++ != ';') { throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("'&#...' missing ';' in ")) + + (rtl::OUString("'&#...' missing ';' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -498,8 +495,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "character reference denoting invalid character in ")) + + "character reference denoting invalid character in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -556,8 +552,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } } throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("unknown entity reference in ")) + + (rtl::OUString("unknown entity reference in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -668,7 +663,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char const * nameColon = 0; if (!scanName(&nameColon)) { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad tag name in ")) + + (rtl::OUString("bad tag name in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -686,8 +681,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { if (pos_ == p) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "missing whitespace before attribute in ")) + + "missing whitespace before attribute in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -695,8 +689,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char const * attrNameColon = 0; if (!scanName(&attrNameColon)) { throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("bad attribute name in ")) + + (rtl::OUString("bad attribute name in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -704,7 +697,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { skipSpace(); if (read() != '=') { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '=' in ")) + + (rtl::OUString("missing '=' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -712,8 +705,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char del = read(); if (del != '\'' && del != '"') { throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("bad attribute value in ")) + + (rtl::OUString("bad attribute value in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -722,8 +714,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { if (i < 0) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unterminated attribute value in ")) + + "unterminated attribute value in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -762,7 +753,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { } if (peek() != '>') { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) + + (rtl::OUString("missing '>' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -784,8 +775,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { XmlReader::Result XmlReader::handleEndTag() { if (elements_.empty()) { throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("spurious end tag in ")) + + (rtl::OUString("spurious end tag in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -795,7 +785,7 @@ XmlReader::Result XmlReader::handleEndTag() { !elements_.top().name.equals(nameBegin, pos_ - nameBegin)) { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tag mismatch in ")) + + (rtl::OUString("tag mismatch in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -803,7 +793,7 @@ XmlReader::Result XmlReader::handleEndTag() { skipSpace(); if (peek() != '>') { throw css::uno::RuntimeException( - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) + + (rtl::OUString("missing '>' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -823,8 +813,7 @@ XmlReader::Result XmlReader::handleSkippedText(Span * data, int * nsId) { sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, '<'); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + + (rtl::OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -855,8 +844,7 @@ XmlReader::Result XmlReader::handleRawText(Span * text) { switch (peek()) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + + (rtl::OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '\x0D': @@ -923,8 +911,7 @@ XmlReader::Result XmlReader::handleNormalizedText(Span * text) { switch (peek()) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("premature end of ")) + + (rtl::OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '\x09': diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index ed17c86f531b..afb6c36818a1 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -492,14 +492,14 @@ void DocumentDigitalSignatures::addLocationToTrustedSources( const ::rtl::OUStri rtl::OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ); + return rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" ); } Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (cssu::RuntimeException) { Sequence < rtl::OUString > aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ); + pArray[0] = rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" ); return aRet; } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index fbdc2c5348cf..f70965f9b6d7 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -87,8 +87,8 @@ namespace void SaveODFItem::Commit() {} void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} - SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Office.Common/Save"))), m_nODF(0) + SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString( + "Office.Common/Save")), m_nODF(0) { OUString sDef(RTL_CONSTASCII_USTRINGPARAM("ODF/DefaultVersion")); Sequence< css::uno::Any > aValues = GetProperties( Sequence<OUString>(&sDef,1) ); @@ -105,8 +105,8 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString > } else throw uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "[xmlsecurity] Could not open property Office.Common/Save/ODF/DefaultVersion")), 0); + OUString( + "[xmlsecurity] Could not open property Office.Common/Save/ODF/DefaultVersion"), 0); } } diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index 1f4006d039f7..974ddb9ddce7 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -251,34 +251,34 @@ rtl::OUString BufferNode::printChildren() const for( ; ii != m_vElementCollectors.end() ; ++ii ) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BufID=" )); + rc += rtl::OUString( "BufID=" ); rc += rtl::OUString::valueOf((*ii)->getBufferId()); if (((ElementCollector*)(*ii))->getModify()) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[M]" )); + rc += rtl::OUString( "[M]" ); } - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",Pri=" )); + rc += rtl::OUString( ",Pri=" ); switch (((ElementCollector*)(*ii))->getPriority()) { case cssxc::sax::ElementMarkPriority_BEFOREMODIFY: - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BEFOREMODIFY" )); + rc += rtl::OUString( "BEFOREMODIFY" ); break; case cssxc::sax::ElementMarkPriority_AFTERMODIFY: - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AFTERMODIFY" )); + rc += rtl::OUString( "AFTERMODIFY" ); break; default: - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UNKNOWN" )); + rc += rtl::OUString( "UNKNOWN" ); break; } - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "(" )); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SecID=" )); + rc += rtl::OUString( "(" ); + rc += rtl::OUString( "SecID=" ); rc += rtl::OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId()); rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )); + rc += rtl::OUString( " " ); } return rc; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 54ed9152bbee..d0d42fae4e1e 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -348,44 +348,44 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode( for ( int i=0; i<nIndent; ++i ) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )); + rc += rtl::OUString( " " ); } if (pBufferNode == m_pCurrentBufferNode) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[%]" )); + rc += rtl::OUString( "[%]" ); } if (pBufferNode == m_pCurrentBlockingBufferNode) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[B]" )); + rc += rtl::OUString( "[B]" ); } - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )); + rc += rtl::OUString( " " ); rc += m_xXMLDocument->getNodeName(pBufferNode->getXMLElement()); BufferNode* pParent = (BufferNode*)pBufferNode->getParent(); if (pParent != NULL) { - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[" )); + rc += rtl::OUString( "[" ); rc += m_xXMLDocument->getNodeName(pParent->getXMLElement()); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )); + rc += rtl::OUString( "]" ); } - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":EC=" )); + rc += rtl::OUString( ":EC=" ); rc += pBufferNode->printChildren(); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " BR=" )); + rc += rtl::OUString( " BR=" ); ElementMark * pBlocker = pBufferNode->getBlocker(); if (pBlocker != NULL) { rc += rtl::OUString::valueOf( pBlocker->getBufferId() ); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "(SecId=" )); + rc += rtl::OUString( "(SecId=" ); rc += rtl::OUString::valueOf( pBlocker->getSecurityId() ); rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )); + rc += rtl::OUString( " " ); } - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" )); + rc += rtl::OUString( "\n" ); std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren(); std::vector< const BufferNode* >::const_iterator jj = vChildren->begin(); @@ -1056,11 +1056,11 @@ rtl::OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() { rtl::OUString rc; - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ElementMarkBuffers: size = " )); + rc += rtl::OUString( "ElementMarkBuffers: size = " ); rc += rtl::OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size()); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\nCurrentBufferNode: " )); + rc += rtl::OUString( "\nCurrentBufferNode: " ); rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement()); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" )); + rc += rtl::OUString( "\n" ); rc += printBufferNode(m_pRootBufferNode, 0); return rc; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 0af5650188ef..edc6ee371301 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -87,7 +87,7 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { - if ( aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Signature")) ) + if ( aName == rtl::OUString("Signature") ) { maStartVerifySignatureElementListener.Call( (void*)&xAttribs ); } @@ -195,8 +195,8 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno const ::rtl::OUString sName = ::rtl::Uri::decode( rURI, rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (sName.isEmpty() && !rURI.isEmpty()) - throw uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Could not decode URI for stream element.")), 0); + throw uno::Exception(::rtl::OUString( + "Could not decode URI for stream element."), 0); uno::Reference< io::XStream > xStream; xStream = rxStore->cloneStreamElement( sName ); @@ -210,8 +210,8 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno rURI.copy( 0, nSepPos ), rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (aStoreName.isEmpty() && !rURI.isEmpty()) throw uno::Exception( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Could not decode URI for stream element.")), 0); + ::rtl::OUString( + "Could not decode URI for stream element."), 0); rtl::OUString aElement = rURI.copy( nSepPos+1 ); uno::Reference < embed::XStorage > xSubStore = rxStore->openStorageElement( aStoreName, embed::ElementModes::READ ); diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index bb8aec5a31ce..547ec823580a 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -171,7 +171,7 @@ void SAL_CALL XSecParser::startElement( } } else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + +rtl::OUString(":") +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { m_ouDate = rtl::OUString(); @@ -187,14 +187,14 @@ void SAL_CALL XSecParser::startElement( {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "xmlsecurity: Exception in XSecParser::startElement")), + rtl::OUString( + "xmlsecurity: Exception in XSecParser::startElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity: unexpected exception in XSecParser::startElement")), 0, + rtl::OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0, cssu::Any()); } } @@ -246,7 +246,7 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) m_bInX509Certificate = false; } else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + +rtl::OUString(":") +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { m_pXSecController->setDate( m_ouDate ); @@ -262,14 +262,14 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "xmlsecurity: Exception in XSecParser::endElement")), + rtl::OUString( + "xmlsecurity: Exception in XSecParser::endElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity: unexpected exception in XSecParser::endElement")), 0, + rtl::OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0, cssu::Any()); } } diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx index 67ec993f5edd..913c87c7e025 100644 --- a/xmlsecurity/source/xmlsec/diagnose.cxx +++ b/xmlsecurity/source/xmlsec/diagnose.cxx @@ -31,7 +31,7 @@ struct UseDiagnose : public rtl::StaticWithInit< bool, UseDiagnose> { ::rtl::OUString value; sal_Bool res = rtl::Bootstrap::get( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("XMLSECURITY_TRACE")), value); + ::rtl::OUString("XMLSECURITY_TRACE"), value); return res == sal_True ? true : false; } }; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index 0f562b482f6b..23961db9e350 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -187,7 +187,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDis // if it is decryption, the amount of data should be rounded to the block size even in case of padding if ( ( !m_bPadding || !m_bEncryption ) && nSizeForPadding ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The data should contain complete blocks only." ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( "The data should contain complete blocks only." ), uno::Reference< uno::XInterface >() ); if ( m_bW3CPadding && m_bEncryption ) { diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index f9bc48799730..373f4f96d5e5 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -443,10 +443,10 @@ css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer b1KData = ( nDigestID == css::xml::crypto::DigestID::SHA1_1K ); } else - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected digest requested." ) ), css::uno::Reference< css::uno::XInterface >(), 1 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected digest requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); if ( aParams.getLength() ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected arguments provided for digest creation." ) ), css::uno::Reference< css::uno::XInterface >(), 2 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for digest creation." ), css::uno::Reference< css::uno::XInterface >(), 2 ); css::uno::Reference< css::xml::crypto::XDigestContext > xResult; if( initNSS( m_xContext ) ) @@ -470,19 +470,19 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer bW3CPadding = true; if ( aKey.getLength() != 16 && aKey.getLength() != 24 && aKey.getLength() != 32 ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected key length." ) ), css::uno::Reference< css::uno::XInterface >(), 2 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected key length." ), css::uno::Reference< css::uno::XInterface >(), 2 ); if ( aParams.getLength() ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected arguments provided for cipher creation." ) ), css::uno::Reference< css::uno::XInterface >(), 5 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for cipher creation." ), css::uno::Reference< css::uno::XInterface >(), 5 ); } else - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected cipher requested." ) ), css::uno::Reference< css::uno::XInterface >(), 1 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected cipher requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); css::uno::Reference< css::xml::crypto::XCipherContext > xResult; if( initNSS( m_xContext ) ) { if ( aInitializationVector.getLength() != PK11_GetIVLength( nNSSCipherID ) ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected length of initialization vector." ) ), css::uno::Reference< css::uno::XInterface >(), 3 ); + throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected length of initialization vector." ), css::uno::Reference< css::uno::XInterface >(), 3 ); xResult = OCipherContext::Create( nNSSCipherID, aKey, aInitializationVector, bEncryption, bW3CPadding ); } |