diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
| commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
| tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c | |
| parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) | |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
348 files changed, 1091 insertions, 1135 deletions
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index 5c0db33946b8..aa7a279582f5 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); 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 7d85b1a3746a..892dc8c689db 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -582,7 +582,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); 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 366c18eab6f4..45e51a9929fc 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -394,7 +394,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index fa9eccbc70ba..522f4c50373f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -434,7 +434,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 66d43bbd8704..c2c7d28332c9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -641,7 +641,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index 4efc23488fad..8475b2733b0f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -418,7 +418,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index a0212286ad6d..b7b0020e1f98 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -592,7 +592,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 4e3f7db4c811..55a1250f94cc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -292,7 +292,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index 312744065023..ba66b6e0da9f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -393,7 +393,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index e14e86f09d6e..19f429491955 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index 5d1c47ca6d6d..e3c2dd3facd2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -585,7 +585,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index 03dbd00c2184..bc8a1a40406b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 7b5c99e7268b..3582aaeb8658 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -536,7 +536,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index ac7607ad8b3f..b8fa8ad86f2c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -439,7 +439,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index fc92e3922e70..37b00d258ad1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -503,7 +503,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); 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 7be37bbe18c0..d5711a5e7ac8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx index 0bef4f8f1182..9b14f17c526c 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx @@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx index 8e63487af658..0f5e0bc0e683 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx @@ -547,7 +547,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); 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 7be37bbe18c0..d5711a5e7ac8 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index be63fdb0ccb1..1be121519577 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -331,7 +331,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index d91d49039472..4129785d39be 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx index dd26e389c280..60a57a4b5a3b 100644 --- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx @@ -291,7 +291,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 47e96d0b8aa3..301e617c2505 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -369,7 +369,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); 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 6062332a75b9..67f2a0df99ce 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -336,7 +336,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = NULL; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName("void"); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index 47a2a0bd0767..a0f5ef65cd91 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -517,7 +517,7 @@ namespace { bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); + rtl::OUString keyName( "/" ); keyName += implementationName; keyName += rtl::OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > key; diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index dc3936f77f80..5c274934465c 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -177,7 +177,7 @@ namespace { bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, css::uno::Sequence< rtl::OUString > const & rServiceNames) { - rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); + rtl::OUString aKeyName( "/" ); aKeyName += rtl::OUString::createFromAscii(pImplementationName); aKeyName += rtl::OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > xKey; diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx index 36102aca31c4..75d12ad17d44 100644 --- a/bridges/test/performance/testperformance.cxx +++ b/bridges/test/performance/testperformance.cxx @@ -171,7 +171,7 @@ void main() MyTimer timer( "performance - 1000*1000 unicode string construction/destruction" ); for( int i = 0 ; i < 1000*1000 ; i ++ ) { - OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) ); + OUString textEnc( "this is a test string" ); } } diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 21eadd91b100..08248b0952fe 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -672,7 +672,7 @@ void testRemote( const Reference< XInterface > &rRemote ) //-------------------- // Test attributes //---------------------- - OUString ow( RTL_CONSTASCII_USTRINGPARAM( "dum didel dum dideldei" )); + OUString ow( "dum didel dum dideldei" ); rLCallMe->setsAttribute( ow ); OSL_ASSERT( rLCallMe->getsAttribute() == ow ); diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index d5d17baf5b32..828e7f4f41e1 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -237,7 +237,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD) case typelib_TypeClass_INTERFACE: { //special handling for XInterface, since it does not exist in cli. - rtl::OUString usXInterface(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")); + rtl::OUString usXInterface("com.sun.star.uno.XInterface"); if (usXInterface.equals(pTD->pTypeName)) retVal= System::Object::typeid; else @@ -1072,7 +1072,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, { typelib_TypeDescriptionReference * member_type= NULL; - rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")); + rtl::OUString usUnoException("com.sun.star.uno.Exception"); for (; nPos < nMembers; ++nPos) { member_type= comp_td->ppTypeRefs[nPos]; @@ -1092,7 +1092,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, // System.Exception property. Type.GetField("Message") returns null if ( ! aField && usUnoException.equals(td.get()->pTypeName)) {// get Exception.Message property - rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message")); + rtl::OUString usMessageMember("Message"); if (usMessageMember.equals(comp_td->ppMemberNames[nPos])) { sr::PropertyInfo^ pi= cliType->GetProperty( @@ -1625,7 +1625,7 @@ void Bridge::map_to_cli( pCTD = pCTD->pBaseTypeDescription; int nPos = -1; - rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message")); + rtl::OUString usMessageMember("Message"); for (int i = 0; i < pCTD->nMembers; i ++) { #if OSL_DEBUG_LEVEL >= 2 @@ -1685,7 +1685,7 @@ void Bridge::map_to_cli( ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr, true); } - rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")); + rtl::OUString usUnoException("com.sun.star.uno.Exception"); for (sal_Int32 nPos = comp_td->nMembers; nPos--; ) { typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ]; diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index c3a136678020..ffbb348dcd60 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.cxx @@ -29,8 +29,8 @@ namespace connectivity if ( sStmt.startsWith("INSERT") ) { sStatement = m_sGeneratedValueStatement; - static const ::rtl::OUString sColumn(RTL_CONSTASCII_USTRINGPARAM("$column")); - static const ::rtl::OUString sTable(RTL_CONSTASCII_USTRINGPARAM("$table")); + static const ::rtl::OUString sColumn("$column"); + static const ::rtl::OUString sTable("$table"); sal_Int32 nIndex = 0; nIndex = sStatement.indexOf(sColumn,nIndex); if ( -1 != nIndex ) diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 7d19e700dfbf..a8408fe83cb6 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -118,7 +118,7 @@ OConnectionWrapper::~OConnectionWrapper() aSupported = m_xServiceInfo->getSupportedServiceNames(); // append our own service, if necessary - ::rtl::OUString sConnectionService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) ); + ::rtl::OUString sConnectionService( "com.sun.star.sdbc.Connection" ); if ( 0 == ::comphelper::findValue( aSupported, sConnectionService, sal_True ).getLength() ) { sal_Int32 nLen = aSupported.getLength(); diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index f102744f10f6..b9c0b3d98f04 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno; ::rtl::OUString aTemp; _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp; sal_Int32 nIndex = (sal_Int32)-1; - const ::rtl::OUString sQuot(RTL_CONSTASCII_USTRINGPARAM("\'")); - const ::rtl::OUString sQuotToReplace(RTL_CONSTASCII_USTRINGPARAM("\'\'")); + const ::rtl::OUString sQuot("\'"); + const ::rtl::OUString sQuotToReplace("\'\'"); do { nIndex += 2; @@ -258,7 +258,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass)) { // formatting should be "percent", but the String provides just a simple number -> adjust ::rtl::OUString sExpanded(rString); - static ::rtl::OUString s_sPercentSymbol( RTL_CONSTASCII_USTRINGPARAM( "%" )); + static ::rtl::OUString s_sPercentSymbol( "%" ); // need a method to add a sal_Unicode to a string, 'til then we use a static string sExpanded += s_sPercentSymbol; fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded); diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 8b94f6919d0c..1bdf05ee6fce 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -43,7 +43,7 @@ namespace if ( aPropertiesNode.isValid() ) { uno::Sequence< ::rtl::OUString > aStringSeq; - static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("/Value")); + static const ::rtl::OUString s_sValue("/Value"); const uno::Sequence< ::rtl::OUString > aProperties = aPropertiesNode.getNodeNames(); const ::rtl::OUString* pPropertiesIter = aProperties.getConstArray(); const ::rtl::OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength(); @@ -96,7 +96,7 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx { if ( !m_aInstalled.isValid() ) { - static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed + static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); } diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 309ec2fe58c1..65ef48317858 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1060,8 +1060,8 @@ bool ORowSetValue::getBool() const case DataType::LONGVARCHAR: { const ::rtl::OUString sValue(m_aValue.m_pString); - const static ::rtl::OUString s_sTrue(RTL_CONSTASCII_USTRINGPARAM("true")); - const static ::rtl::OUString s_sFalse(RTL_CONSTASCII_USTRINGPARAM("false")); + const static ::rtl::OUString s_sTrue("true"); + const static ::rtl::OUString s_sFalse("false"); if ( sValue.equalsIgnoreAsciiCase(s_sTrue) ) { bRet = sal_True; diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 0f7830fa2692..8f68406813c3 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -177,7 +177,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName return cloneDescriptor( descriptor ); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " )); + ::rtl::OUString aSql( "ALTER TABLE " ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); aSql += ::rtl::OUString(" ADD "); @@ -198,7 +198,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!"); if ( m_pTable && !m_pTable->isNew() ) { - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " )); + ::rtl::OUString aSql( "ALTER TABLE " ); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index c64e94bf1d14..eb04b27eb391 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -60,7 +60,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D")); + ::rtl::OUString aD("D"); while( xResult->next() ) { if(xRow->getString(9) == _rName) diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index ea28c41c451e..d1db21506511 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -138,7 +138,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE ")); ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." )); + ::rtl::OUString aDot( "." ); if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE)))) aSql.appendAscii("UNIQUE "); @@ -226,7 +226,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem aSchema = _sElementName.copy(0,nLen); aName = _sElementName.copy(nLen+1); - ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP INDEX " )); + ::rtl::OUString aSql( "DROP INDEX " ); ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); ::rtl::OUString sIndexName,sTemp; diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 3822b9af2ecd..e17eaa5a013c 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -122,13 +122,13 @@ namespace connectivity Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY); if ( xFac.is() ) { - static const ::rtl::OUString s_sTableRename(RTL_CONSTASCII_USTRINGPARAM("TableRenameServiceName")); + static const ::rtl::OUString s_sTableRename("TableRenameServiceName"); m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY); - static const ::rtl::OUString s_sTableAlteration(RTL_CONSTASCII_USTRINGPARAM("TableAlterationServiceName")); + static const ::rtl::OUString s_sTableAlteration("TableAlterationServiceName"); m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY); - static const ::rtl::OUString s_sKeyAlteration(RTL_CONSTASCII_USTRINGPARAM("KeyAlterationServiceName")); + static const ::rtl::OUString s_sKeyAlteration("KeyAlterationServiceName"); m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY); - static const ::rtl::OUString s_sIndexAlteration(RTL_CONSTASCII_USTRINGPARAM("IndexAlterationServiceName")); + static const ::rtl::OUString s_sIndexAlteration("IndexAlterationServiceName"); m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY); } } @@ -475,7 +475,7 @@ void OTableHelper::refreshIndexes() // ----------------------------------------------------------------------------- ::rtl::OUString OTableHelper::getRenameStart() const { - ::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME ")); + ::rtl::OUString sSql("RENAME "); if ( m_Type == ::rtl::OUString("VIEW") ) sSql += ::rtl::OUString(" VIEW "); else diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 94ab93245bbc..2da06c8f9179 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -35,7 +35,7 @@ namespace dbtools //===================================================================== static const ::rtl::OUString& getActiveConnectionPropertyName() { - static const ::rtl::OUString s_sActiveConnectionPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" )); + static const ::rtl::OUString s_sActiveConnectionPropertyName( "ActiveConnection" ); return s_sActiveConnectionPropertyName; } diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 087495d26fc1..698ce2e37e18 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -441,7 +441,7 @@ namespace dbtools { // our time struct only supports hundredth seconds sNano = sNano.copy(0,::std::min<sal_Int32>(sNano.getLength(),2)); - const static ::rtl::OUString s_Zeros(RTL_CONSTASCII_USTRINGPARAM("00")); + const static ::rtl::OUString s_Zeros("00"); sNano += s_Zeros.copy(0,s_Zeros.getLength() - sNano.getLength()); nHundredthSeconds = static_cast<sal_uInt16>(sNano.toInt32()); } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index d06ca5e4e276..499e6b23ca83 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -393,7 +393,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R // build a connection with it's current settings (4. data source name, or 5. URL) - const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" )); + const ::rtl::OUString sUserProp( "User" ); ::rtl::OUString sDataSourceName; xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; ::rtl::OUString sURL; @@ -952,7 +952,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats( // ask the parent of the connection (should be an DatabaseAccess) Reference< XNumberFormatsSupplier> xReturn; Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY); - ::rtl::OUString sPropFormatsSupplier( RTL_CONSTASCII_USTRINGPARAM( "NumberFormatsSupplier" )); + ::rtl::OUString sPropFormatsSupplier( "NumberFormatsSupplier" ); if (xConnAsChild.is()) { Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY); @@ -990,22 +990,22 @@ try Property* pOldProps = aOldProperties.getArray(); Property* pNewProps = aNewProperties.getArray(); - ::rtl::OUString sPropDefaultControl(RTL_CONSTASCII_USTRINGPARAM("DefaultControl")); - ::rtl::OUString sPropLabelControl(RTL_CONSTASCII_USTRINGPARAM("LabelControl")); - ::rtl::OUString sPropFormatsSupplier(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")); - ::rtl::OUString sPropCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM("CurrencySymbol")); - ::rtl::OUString sPropDecimals(RTL_CONSTASCII_USTRINGPARAM("Decimals")); - ::rtl::OUString sPropEffectiveMin(RTL_CONSTASCII_USTRINGPARAM("EffectiveMin")); - ::rtl::OUString sPropEffectiveMax(RTL_CONSTASCII_USTRINGPARAM("EffectiveMax")); - ::rtl::OUString sPropEffectiveDefault(RTL_CONSTASCII_USTRINGPARAM("EffectiveDefault")); - ::rtl::OUString sPropDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText")); - ::rtl::OUString sPropDefaultDate(RTL_CONSTASCII_USTRINGPARAM("DefaultDate")); - ::rtl::OUString sPropDefaultTime(RTL_CONSTASCII_USTRINGPARAM("DefaultTime")); - ::rtl::OUString sPropValueMin(RTL_CONSTASCII_USTRINGPARAM("ValueMin")); - ::rtl::OUString sPropValueMax(RTL_CONSTASCII_USTRINGPARAM("ValueMax")); - ::rtl::OUString sPropDecimalAccuracy(RTL_CONSTASCII_USTRINGPARAM("DecimalAccuracy")); - ::rtl::OUString sPropClassId(RTL_CONSTASCII_USTRINGPARAM("ClassId")); - ::rtl::OUString sFormattedServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) ); + ::rtl::OUString sPropDefaultControl("DefaultControl"); + ::rtl::OUString sPropLabelControl("LabelControl"); + ::rtl::OUString sPropFormatsSupplier("FormatsSupplier"); + ::rtl::OUString sPropCurrencySymbol("CurrencySymbol"); + ::rtl::OUString sPropDecimals("Decimals"); + ::rtl::OUString sPropEffectiveMin("EffectiveMin"); + ::rtl::OUString sPropEffectiveMax("EffectiveMax"); + ::rtl::OUString sPropEffectiveDefault("EffectiveDefault"); + ::rtl::OUString sPropDefaultText("DefaultText"); + ::rtl::OUString sPropDefaultDate("DefaultDate"); + ::rtl::OUString sPropDefaultTime("DefaultTime"); + ::rtl::OUString sPropValueMin("ValueMin"); + ::rtl::OUString sPropValueMax("ValueMax"); + ::rtl::OUString sPropDecimalAccuracy("DecimalAccuracy"); + ::rtl::OUString sPropClassId("ClassId"); + ::rtl::OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" ); for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i) { diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index a348e8743c66..4d6d802f046d 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -229,7 +229,7 @@ namespace static const ::rtl::OUString sComma(::rtl::OUString(",")); const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); - ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" )); + ::rtl::OUString sSql( " (" ); Reference< XPropertySet > xColProp; sal_Int32 nColCount = _xColumns->getCount(); @@ -673,15 +673,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY); const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName(); - static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" )); - static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" )); - static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" )); - static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" )); - static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" )); - static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" )); - static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" )); - static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" )); - static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" )); + static const ::rtl::OUString sSELECT( "SELECT" ); + static const ::rtl::OUString sINSERT( "INSERT" ); + static const ::rtl::OUString sUPDATE( "UPDATE" ); + static const ::rtl::OUString sDELETE( "DELETE" ); + static const ::rtl::OUString sREAD( "READ" ); + static const ::rtl::OUString sCREATE( "CREATE" ); + static const ::rtl::OUString sALTER( "ALTER" ); + static const ::rtl::OUString sREFERENCE( "REFERENCE" ); + static const ::rtl::OUString sDROP( "DROP" ); if ( xCurrentRow.is() ) { @@ -795,7 +795,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, } catch(const SQLException& e) { - static ::rtl::OUString sNotSupportedState( RTL_CONSTASCII_USTRINGPARAM( "IM001" )); + static ::rtl::OUString sNotSupportedState( "IM001" ); // some drivers don't support any privileges so we assume that we are allowed to do all we want :-) if(e.SQLState == sNotSupportedState) nPrivileges |= Privilege::DROP | @@ -966,19 +966,19 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& } ::rtl::OUString lcl_getReportEngines() { - static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ReportEngines")); + static ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines"); return s_sNodeName; } // ----------------------------------------------------------------------------- ::rtl::OUString lcl_getDefaultReportEngine() { - static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DefaultReportEngine")); + static ::rtl::OUString s_sNodeName("DefaultReportEngine"); return s_sNodeName; } // ----------------------------------------------------------------------------- ::rtl::OUString lcl_getReportEngineNames() { - static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("ReportEngineNames")); + static ::rtl::OUString s_sNodeName("ReportEngineNames"); return s_sNodeName; } // ----------------------------------------------------------------------------- @@ -1000,7 +1000,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& if ( aReportEngine.isValid() ) { ::rtl::OUString sRet; - const static ::rtl::OUString s_sService(RTL_CONSTASCII_USTRINGPARAM("ServiceName")); + const static ::rtl::OUString s_sService("ServiceName"); aReportEngine.getNodeValue(s_sService) >>= sRet; return sRet; } diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 46be1486fc2d..972e6831eee6 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -380,7 +380,7 @@ namespace dbtools // did we find links where the detail field refers to a detail column (instead of a parameter name)? if ( !aAdditionalFilterComponents.empty() ) { - const static ::rtl::OUString s_sAnd( RTL_CONSTASCII_USTRINGPARAM( " AND " ) ); + const static ::rtl::OUString s_sAnd( " AND " ); // build a conjunction of all the filter components ::rtl::OUStringBuffer sAdditionalFilter; for ( ::std::vector< ::rtl::OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 43ac90c181e4..42d60a047d7c 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -156,8 +156,8 @@ namespace dbtools ) ) { - static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) ); - static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) ); + static const ::rtl::OUString sSingleQuote( "'" ); + static const ::rtl::OUString sDoubleQuote( "''" ); sal_Int32 nIndex = -1; sal_Int32 nTemp = 0; @@ -306,8 +306,8 @@ namespace dbtools if ( bValidQuotedText ) { sValue = sValue.copy( 1, sValue.getLength() - 2 ); - static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) ); - static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) ); + static const ::rtl::OUString sSingleQuote( "'" ); + static const ::rtl::OUString sDoubleQuote( "''" ); sal_Int32 nIndex = -1; sal_Int32 nTemp = 0; diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 7a10ad2318d7..075978fd7b03 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -115,7 +115,7 @@ namespace connectivity //-------------------------------------------------------------------- const ::rtl::OUString& SQLError_Impl::getMessagePrefix() { - static ::rtl::OUString s_sMessagePrefix( RTL_CONSTASCII_USTRINGPARAM( "[OOoBase]" ) ); + static ::rtl::OUString s_sMessagePrefix( "[OOoBase]" ); return s_sMessagePrefix; } diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index f0bf69a5bb63..40cee318d3a1 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -180,7 +180,7 @@ namespace dbtools // the filter sal_Bool bApplyFilter = sal_True; - const ::rtl::OUString sPropApply( RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )); + const ::rtl::OUString sPropApply( "ApplyFilter" ); if ( ::comphelper::hasProperty( sPropApply, xQuery ) ) { OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter ); diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index cdd889797968..83879188af38 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -53,7 +53,7 @@ namespace //-------------------------------------------------------------------- static const ::rtl::OUString& getTimeoutNodeName() { - static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" )); + static ::rtl::OUString s_sNodeName( "Timeout" ); return s_sNodeName; } diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 775f0a2aa175..019935d344b4 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException) if ( bOk ) { // HACK for access - static const ::rtl::OUString s_sVarChar(RTL_CONSTASCII_USTRINGPARAM("VarChar")); + static const ::rtl::OUString s_sVarChar("VarChar"); do { sal_Int32 nPos = 1; diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index de0ba5f7e5cf..cca5f6ae001f 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -68,7 +68,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf { // special handling for parameters /* we recusive replace all occurrences of ? in the statement and replace them with name like "" */ sal_Int32 nParameterCount = 0; - ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" )); + ::rtl::OUString sDefaultName( "parame" ); replaceParameterNodeName(pNode,sDefaultName,nParameterCount); pNode->parseNodeToStr( sNewSql, _pConnection ); delete pNode; @@ -215,7 +215,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn m_pParameters->get_Count(&nCount); if(nCount < (parameterIndex-1)) { - ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" )); + ::rtl::OUString sDefaultName( "parame" ); sDefaultName += ::rtl::OUString::valueOf(parameterIndex); ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val); if(pParam) diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 7d754064a480..5d38e0a8b0a9 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -1986,7 +1986,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata ++nPos; ::rtl::OUStringBuffer aTypes; - ::rtl::OUString aComma( RTL_CONSTASCII_USTRINGPARAM( "," )); + ::rtl::OUString aComma( "," ); const ::rtl::OUString* pIter = types.getConstArray(); const ::rtl::OUString* pEnd = pIter + types.getLength(); for( ; pIter != pEnd ; ++pIter) diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index ea447b75fc02..22f5a0057834 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -53,8 +53,8 @@ void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject void OHCatalog::refreshTables() { TStringVector aVector; - static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); + static const ::rtl::OUString s_sTableTypeView("VIEW"); + static const ::rtl::OUString s_sTableTypeTable("TABLE"); Sequence< ::rtl::OUString > sTableTypes(2); sTableTypes[0] = s_sTableTypeView; diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 5667b7547081..9207cdb4b5f8 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -757,7 +757,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri // ----------------------------------------------------------------------------- ::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass) { - static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths")); + static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"); ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext( m_pDriver->getContext().getUNOContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); ::rtl::OUString sURL; diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index ee1e1b3c6761..d71c6ece474b 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -46,7 +46,7 @@ namespace connectivity com::sun::star::configuration::theDefaultProvider::get( comphelper::getComponentContext( _rxORB ) ) ); - ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/" )); + ::rtl::OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); sCompleteNodePath += OConnection::getDriverImplementationName(); //========================================================= diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 090a7ca152e5..09d665bde55f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -114,8 +114,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) { nsCOMPtr<nsILocalFile> binDir; // Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2() - rtl::OUString path1( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")); + rtl::OUString path1("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(path1); rtl::OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index a756e2ce01c8..cb0bd5a86e62 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -54,9 +54,9 @@ void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfOb void OMySQLCatalog::refreshTables() { TStringVector aVector; - static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - static const ::rtl::OUString s_sAll(RTL_CONSTASCII_USTRINGPARAM("%")); + static const ::rtl::OUString s_sTableTypeView("VIEW"); + static const ::rtl::OUString s_sTableTypeTable("TABLE"); + static const ::rtl::OUString s_sAll("%"); Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 7a14c3b20478..e0060e9cd6ee 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -164,7 +164,7 @@ OUString ConnectionGetImplementationName() } com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void) { - OUString serv( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) ); + OUString serv( "com.sun.star.sdbc.Connection" ); return Sequence< OUString> (&serv,1); } diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 96e719faf5e0..2d2d03daacef 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -102,8 +102,7 @@ OUString DriverGetImplementationName() if (! p ) { MutexGuard guard( osl::Mutex::getGlobalMutex() ); - static OUString instance( - RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) ); + static OUString instance( "org.openoffice.comp.connectivity.pq.Driver.noext" ); p = &instance; } return *p; @@ -115,7 +114,7 @@ Sequence< OUString > DriverGetSupportedServiceNames() if( ! p ) { MutexGuard guard( osl::Mutex::getGlobalMutex() ); - OUString tmp( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Driver" ) ); + OUString tmp( "com.sun.star.sdbc.Driver" ); static Sequence< OUString > instance( &tmp,1 ); p = &instance; } diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index aadc1b35338c..31c26fa4ee9c 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -291,7 +291,7 @@ void Test::testVoid() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -389,7 +389,7 @@ void Test::testBoolean() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -488,7 +488,7 @@ void Test::testByte() { } } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -587,7 +587,7 @@ void Test::testShort() { } } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -688,7 +688,7 @@ void Test::testUnsignedShort() { } } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -783,7 +783,7 @@ void Test::testLong() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -878,7 +878,7 @@ void Test::testUnsignedLong() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -973,7 +973,7 @@ void Test::testHyper() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1068,7 +1068,7 @@ void Test::testUnsignedHyper() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1163,7 +1163,7 @@ void Test::testFloat() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1258,7 +1258,7 @@ void Test::testDouble() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1358,7 +1358,7 @@ void Test::testChar() { } } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1453,7 +1453,7 @@ void Test::testString() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" ); } { @@ -1548,7 +1548,7 @@ void Test::testType() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1644,7 +1644,7 @@ void Test::testSequence() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1745,7 +1745,7 @@ void Test::testEnum() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1844,7 +1844,7 @@ void Test::testStruct() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -1964,7 +1964,7 @@ void Test::testException() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -2080,7 +2080,7 @@ void Test::testInterface() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { @@ -2194,7 +2194,7 @@ void Test::testNull() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); + rtl::OUString b("2"); CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 2aa66b61d29a..d8b6727df8c3 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -46,11 +46,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (0 == s_type_XCurrentContext) { - OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext") ); + OUString sTypeName("com.sun.star.uno.XCurrentContext"); typelib_InterfaceTypeDescription * pTD = 0; typelib_TypeDescriptionReference * pMembers[1] = { 0 }; - OUString sMethodName0( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext::getValueByName") ); + OUString sMethodName0("com.sun.star.uno.XCurrentContext::getValueByName"); typelib_typedescriptionreference_new( &pMembers[0], typelib_TypeClass_INTERFACE_METHOD, @@ -67,18 +66,17 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() typelib_InterfaceMethodTypeDescription * pMethod = 0; typelib_Parameter_Init aParameters[1]; - OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("Name") ); - OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("string") ); + OUString sParamName0("Name"); + OUString sParamType0("string"); aParameters[0].pParamName = sParamName0.pData; aParameters[0].eTypeClass = typelib_TypeClass_STRING; aParameters[0].pTypeName = sParamType0.pData; aParameters[0].bIn = sal_True; aParameters[0].bOut = sal_False; rtl_uString * pExceptions[1]; - OUString sExceptionName0( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") ); + OUString sExceptionName0("com.sun.star.uno.RuntimeException"); pExceptions[0] = sExceptionName0.pData; - OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") ); + OUString sReturnType0("any"); typelib_typedescription_newInterfaceMethod( &pMethod, 3, sal_False, diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index a01040146e18..f12cf1f7d286 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -161,7 +161,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // type if (! s_aTypes[typelib_TypeClass_TYPE]) { - OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("type") ); + OUString sTypeName("type"); ::typelib_typedescriptionreference_new( &s_aTypes[typelib_TypeClass_TYPE], typelib_TypeClass_TYPE, sTypeName.pData ); // another static ref: @@ -170,7 +170,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // any if (! s_aTypes[typelib_TypeClass_ANY]) { - OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("any") ); + OUString sTypeName("any"); ::typelib_typedescriptionreference_new( &s_aTypes[typelib_TypeClass_ANY], typelib_TypeClass_ANY, sTypeName.pData ); // another static ref: @@ -179,7 +179,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // string if (! s_aTypes[typelib_TypeClass_STRING]) { - OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("string") ); + OUString sTypeName("string"); ::typelib_typedescriptionreference_new( &s_aTypes[typelib_TypeClass_STRING], typelib_TypeClass_STRING, sTypeName.pData ); // another static ref: @@ -188,18 +188,18 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // XInterface if (! s_aTypes[typelib_TypeClass_INTERFACE]) { - OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") ); + OUString sTypeName("com.sun.star.uno.XInterface"); typelib_InterfaceTypeDescription * pTD = 0; typelib_TypeDescriptionReference * pMembers[3] = { 0,0,0 }; - OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::queryInterface") ); + OUString sMethodName0("com.sun.star.uno.XInterface::queryInterface"); ::typelib_typedescriptionreference_new( &pMembers[0], typelib_TypeClass_INTERFACE_METHOD, sMethodName0.pData ); - OUString sMethodName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::acquire") ); + OUString sMethodName1("com.sun.star.uno.XInterface::acquire"); ::typelib_typedescriptionreference_new( &pMembers[1], typelib_TypeClass_INTERFACE_METHOD, sMethodName1.pData ); - OUString sMethodName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::release") ); + OUString sMethodName2("com.sun.star.uno.XInterface::release"); ::typelib_typedescriptionreference_new( &pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData ); @@ -221,16 +221,16 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ assert( ! s_aTypes[typelib_TypeClass_EXCEPTION] ); { typelib_TypeDescription * pTD1 = 0; - OUString sTypeName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception") ); + OUString sTypeName1("com.sun.star.uno.Exception"); typelib_CompoundMember_Init aMembers[2]; - OUString sMemberType0( RTL_CONSTASCII_USTRINGPARAM("string") ); - OUString sMemberName0( RTL_CONSTASCII_USTRINGPARAM("Message") ); + OUString sMemberType0("string"); + OUString sMemberName0("Message"); aMembers[0].eTypeClass = typelib_TypeClass_STRING; aMembers[0].pTypeName = sMemberType0.pData; aMembers[0].pMemberName = sMemberName0.pData; - OUString sMemberType1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") ); - OUString sMemberName1( RTL_CONSTASCII_USTRINGPARAM("Context") ); + OUString sMemberType1("com.sun.star.uno.XInterface"); + OUString sMemberName1("Context"); aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE; aMembers[1].pTypeName = sMemberType1.pData; aMembers[1].pMemberName = sMemberName1.pData; @@ -243,7 +243,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // another static ref: ++s_aTypes[typelib_TypeClass_EXCEPTION]->nStaticRefCount; // RuntimeException - OUString sTypeName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") ); + OUString sTypeName2("com.sun.star.uno.RuntimeException"); ::typelib_typedescription_new( &pTD1, typelib_TypeClass_EXCEPTION, sTypeName2.pData, s_aTypes[typelib_TypeClass_EXCEPTION], 0, 0 ); ::typelib_typedescription_register( &pTD1 ); @@ -252,24 +252,24 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_ // XInterface members typelib_InterfaceMethodTypeDescription * pMethod = 0; typelib_Parameter_Init aParameters[1]; - OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("aType") ); - OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("type") ); + OUString sParamName0("aType"); + OUString sParamType0("type"); aParameters[0].pParamName = sParamName0.pData; aParameters[0].eTypeClass = typelib_TypeClass_TYPE; aParameters[0].pTypeName = sParamType0.pData; aParameters[0].bIn = sal_True; aParameters[0].bOut = sal_False; rtl_uString * pExceptions[1]; - OUString sExceptionName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") ); + OUString sExceptionName0("com.sun.star.uno.RuntimeException"); pExceptions[0] = sExceptionName0.pData; - OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") ); + OUString sReturnType0("any"); typelib_typedescription_newInterfaceMethod( &pMethod, 0, sal_False, sMethodName0.pData, typelib_TypeClass_ANY, sReturnType0.pData, 1, aParameters, 1, pExceptions ); ::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod ); - OUString sReturnType1( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString sReturnType1("void"); ::typelib_typedescription_newInterfaceMethod( &pMethod, 1, sal_True, sMethodName1.pData, typelib_TypeClass_VOID, sReturnType1.pData, 0, 0, 0, 0 ); diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 08d65ea5ab5d..5e53ea8d476c 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -199,10 +199,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & return result; } -// rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi")); -// rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def")); -// rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc")); -// rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM("")); +// rtl::OUString str1("abc:def:ghi"); +// rtl::OUString str2("abc:def"); +// rtl::OUString str3("abc"); +// rtl::OUString str4(""); // rtl::OUString pref; diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index ef922dca6733..e230c1514689 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -532,91 +532,91 @@ static typelib_TypeDescription * createCTD( // built in types case TypeClass_VOID: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aTypeName("void"); typelib_typedescription_new( &pRet, typelib_TypeClass_VOID, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_CHAR: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("char") ); + OUString aTypeName("char"); typelib_typedescription_new( &pRet, typelib_TypeClass_CHAR, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_BOOLEAN: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("boolean") ); + OUString aTypeName("boolean"); typelib_typedescription_new( &pRet, typelib_TypeClass_BOOLEAN, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_BYTE: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("byte") ); + OUString aTypeName("byte"); typelib_typedescription_new( &pRet, typelib_TypeClass_BYTE, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_SHORT: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("short") ); + OUString aTypeName("short"); typelib_typedescription_new( &pRet, typelib_TypeClass_SHORT, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_UNSIGNED_SHORT: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned short") ); + OUString aTypeName("unsigned short"); typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_SHORT, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_LONG: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("long") ); + OUString aTypeName("long"); typelib_typedescription_new( &pRet, typelib_TypeClass_LONG, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_UNSIGNED_LONG: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned long") ); + OUString aTypeName("unsigned long"); typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_LONG, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_HYPER: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("hyper") ); + OUString aTypeName("hyper"); typelib_typedescription_new( &pRet, typelib_TypeClass_HYPER, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_UNSIGNED_HYPER: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned hyper") ); + OUString aTypeName("unsigned hyper"); typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_HYPER, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_FLOAT: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("float") ); + OUString aTypeName("float"); typelib_typedescription_new( &pRet, typelib_TypeClass_FLOAT, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_DOUBLE: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("double") ); + OUString aTypeName("double"); typelib_typedescription_new( &pRet, typelib_TypeClass_DOUBLE, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_STRING: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("string") ); + OUString aTypeName("string"); typelib_typedescription_new( &pRet, typelib_TypeClass_STRING, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_TYPE: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("type") ); + OUString aTypeName("type"); typelib_typedescription_new( &pRet, typelib_TypeClass_TYPE, aTypeName.pData, 0, 0, 0 ); break; } case TypeClass_ANY: { - OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("any") ); + OUString aTypeName("any"); typelib_typedescription_new( &pRet, typelib_TypeClass_ANY, aTypeName.pData, 0, 0, 0 ); break; } diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 4acc23c2e741..dbbc3e0b05b3 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -53,7 +53,7 @@ namespace cfg_test //-------------------------------------------------------------------------------------------------- static Sequence< OUString > impl0_getSupportedServiceNames() { - OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent0") ); + OUString str("com.sun.star.bootstrap.TestComponent0"); return Sequence< OUString >( &str, 1 ); } //-------------------------------------------------------------------------------------------------- @@ -64,7 +64,7 @@ static OUString impl0_getImplementationName() //-------------------------------------------------------------------------------------------------- static Sequence< OUString > impl1_getSupportedServiceNames() { - OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent1") ); + OUString str("com.sun.star.bootstrap.TestComponent1"); return Sequence< OUString >( &str, 1 ); } //-------------------------------------------------------------------------------------------------- diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index a5cd71daea35..999417a57a24 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -179,7 +179,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( rtl::OUString uTmp(pImplName, rtl_str_getLength(pImplName), RTL_TEXTENCODING_ASCII_US); rtl::OUString uImplName(cppu::EnvDcp::getTypeName(uTmp)); - rtl::OUString cmpName(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")); + rtl::OUString cmpName("impl.test.TestComponent"); if (uImplName.equals(cmpName)) { diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 0aed44a083df..8c06245c8407 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -99,7 +99,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, sal_uInt32 * pnIndex, const OUString & aArg) throw (RuntimeException) { - const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-")); + const OUString dash("-"); if(aArg.indexOf(dash) != 0) return sal_False; @@ -155,7 +155,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, sal_uInt32 * pnIndex, const OUString & aArg) { - const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--")); + const OUString dashdash("--"); OUString aOpt = OUString::createFromAscii(pOpt); if(aArg.indexOf(dashdash) == 0 && aOpt.equals(aArg.copy(2))) @@ -511,7 +511,7 @@ SAL_IMPLEMENT_MAIN() rtl_getAppCommandArg(nPos, &arg.pData); - const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--")); + const OUString dashdash("--"); if (dashdash == arg) { ++nPos; diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx index c827c1c539e2..a67e43420c98 100644 --- a/crashrep/source/win32/soreport.cxx +++ b/crashrep/source/win32/soreport.cxx @@ -159,7 +159,7 @@ static FILE *_tmpfile(void) static BOOL GetCrashDataPath( LPTSTR szBuffer ) { - ::rtl::OUString ustrValue(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); + ::rtl::OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); ::rtl::Bootstrap::expandMacros( ustrValue ); if ( !ustrValue.isEmpty() ) diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index bbe06d6aa432..c9a2c0926345 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -173,7 +173,7 @@ sal_Int32 HexColorControl::GetColor() { sal_Int32 nColor = -1; - OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "#" ) ); + OUString aStr( "#" ); aStr += GetText(); sal_Int32 nLen = aStr.getLength(); if( nLen < 7 ) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index d5c0fed2139e..eec7c36c2d3f 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -825,7 +825,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& ::rtl::OUString TPGalleryThemeProperties::addExtension( const ::rtl::OUString& _rDisplayText, const ::rtl::OUString& _rExtension ) { ::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) ); - ::rtl::OUString sOpenBracket( RTL_CONSTASCII_USTRINGPARAM( " (" ) ); + ::rtl::OUString sOpenBracket( " (" ); ::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) ); ::rtl::OUString sRet = _rDisplayText; @@ -901,7 +901,7 @@ void TPGalleryThemeProperties::FillFilterList() } // media filters - static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); + static const ::rtl::OUString aWildcard( "*." ); ::avmedia::FilterNameVector aFilters; ::avmedia::MediaWindow::getMediaFilters( aFilters ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 15066802f930..782743d6aaaa 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -311,9 +311,9 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink const OUString* pNames = aNames.getConstArray(); Color aMaskColor( COL_LIGHTMAGENTA ); - const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayName" ) ); - const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.LinkTarget" ) ); - const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayBitmap" ) ); + const OUString aProp_LinkDisplayName( "LinkDisplayName" ); + const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" ); + const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" ); for( sal_uLong i = 0; i < nLinks; i++ ) { uno::Any aAny; diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index b3f30b9f432c..2d0151c88177 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -72,7 +72,7 @@ private: void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) { - rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString aSep("/"); rtl::OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); @@ -86,8 +86,8 @@ DBAccessTest::DBAccessTest() void DBAccessTest::test() { - const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("testdb.")); - const rtl::OUString aFileExtension(RTL_CONSTASCII_USTRINGPARAM("odb")); + const rtl::OUString aFileNameBase("testdb."); + const rtl::OUString aFileExtension("odb"); rtl::OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index dc51d3c6c675..ed88d8d7dbd4 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1291,7 +1291,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) ActivateAggregate( tpScale ); pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale())); pScale->SetMin(pFieldType->nMinimumScale); - static const ::rtl::OUString s_sPRECISION(RTL_CONSTASCII_USTRINGPARAM("PRECISION")); + static const ::rtl::OUString s_sPRECISION("PRECISION"); pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION); } else diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 3660aa5de92e..40516da304c1 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -285,10 +285,10 @@ void OCollectionView::initCurrentPath() if ( m_xContent.is() ) { const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); - const static ::rtl::OUString s_sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms")); - const static ::rtl::OUString s_sReportsCID(RTL_CONSTASCII_USTRINGPARAM("private:reports")); + const static ::rtl::OUString s_sFormsCID("private:forms"); + const static ::rtl::OUString s_sReportsCID("private:reports"); m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0; - ::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM("/")); + ::rtl::OUString sPath("/"); if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength()) sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 9c4cc2ef6b13..5b1cebced880 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -228,7 +228,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS: { - const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb")); + const ::rtl::OUString sExt("*.mdb"); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -240,7 +240,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS_2007: { - const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb")); + const ::rtl::OUString sAccdb("*.accdb"); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 559f04a2ed9c..f600a38335b3 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -311,8 +311,8 @@ void ODbaseIndexDialog::Init() Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx")); - ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf")); + ::rtl::OUString aIndexExt("ndx"); + ::rtl::OUString aTableExt("dbf"); ::std::vector< String > aUsedIndexes; diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index c6047a15639d..12c6d9c5d272 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -349,7 +349,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - ::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program/odbcconfig.exe" ) ); + ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 26c0fb65bddc..130ee03ab2a9 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -328,10 +328,10 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom } } xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; - static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); + static ::rtl::OUString sAgg("AggregateFunction"); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; - static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); + static ::rtl::OUString sFunction("Function"); if ( xInfo->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } @@ -341,7 +341,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( !sTableName.isEmpty() ) { - static ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM(".")); + static ::rtl::OUString sSep("."); sTableName += sSep; sTableName += _rFilter.Name; _rFilter.Name = sTableName; diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 1f1b2e5e17dd..33d1bef259c3 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -220,8 +220,8 @@ void DlgOrderCrit::EnableLines() DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); - static const ::rtl::OUString sDESC(RTL_CONSTASCII_USTRINGPARAM(" DESC ")); - static const ::rtl::OUString sASC(RTL_CONSTASCII_USTRINGPARAM(" ASC ")); + static const ::rtl::OUString sDESC(" DESC "); + static const ::rtl::OUString sASC(" ASC "); Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); @@ -245,7 +245,7 @@ void DlgOrderCrit::EnableLines() ::rtl::OUString sRealName; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; - static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); + static ::rtl::OUString sFunction("Function"); if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index f31c32af66f9..7817ddff32c6 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -467,8 +467,8 @@ DBG_NAME(OTableSubscriptionPage) Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const { Sequence< ::rtl::OUString > aTableFilter; - static const ::rtl::OUString sDot(RTL_CONSTASCII_USTRINGPARAM(".")); - static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%")); + static const ::rtl::OUString sDot("."); + static const ::rtl::OUString sWildcard("%"); ::rtl::OUString sComposedName; const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 5d199166bb5e..9ba2dd768061 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -838,9 +838,9 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R aSql += sComposedTableName; aSql += ::rtl::OUString(" ( "); // set values and column names - ::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( ")); - static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); - static ::rtl::OUString aComma(RTL_CONSTASCII_USTRINGPARAM(",")); + ::rtl::OUString aValues(" VALUES ( "); + static ::rtl::OUString aPara("?,"); + static ::rtl::OUString aComma(","); ::rtl::OUString aQuote; if ( _xMetaData.is() ) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 3f409cf51eaa..98be0f40c77c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -448,8 +448,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo // Information for a single SQL type if(xRs.is()) { - static const ::rtl::OUString aB1(RTL_CONSTASCII_USTRINGPARAM(" [ ")); - static const ::rtl::OUString aB2(RTL_CONSTASCII_USTRINGPARAM(" ]")); + static const ::rtl::OUString aB1(" [ "); + static const ::rtl::OUString aB2(" ]"); Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); ::connectivity::ORowSetValue aValue; ::std::vector<sal_Int32> aTypes; @@ -1376,7 +1376,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType } if ( !pTypeInfo ) { - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")),sTypeName; + ::rtl::OUString sCreate("x"),sTypeName; sal_Bool bForce = sal_True; pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce); } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index cb6974176626..db68666cb5a0 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent ) m_aFT_KeyName.Enable(sal_False); m_edKeyName.Enable(sal_False); - ::rtl::OUString sKeyName(RTL_CONSTASCII_USTRINGPARAM("ID")); + ::rtl::OUString sKeyName("ID"); sKeyName = m_pParent->createUniqueName(sKeyName); m_edKeyName.SetText(sKeyName); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 8255bfc0bf9f..fa220bf19b43 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -180,7 +180,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); - ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); + ::rtl::OUString sStatement("SELECT * FROM "); sStatement += sTargetName; sStatement += ::rtl::OUString(" WHERE 0=1"); @@ -1113,7 +1113,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColumns.clear(); OFieldDescription* pActFieldDescr = NULL; - ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreateParam("x"); ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag // On drop no line must be editable. @@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& if ( !pType.get() ) { _bNotConvert = sal_False; - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreate("x"); pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce); if ( !pType.get() ) pType = m_pTypeInfo; diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 5cab1e4a9bc7..765a240dcb7c 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -108,7 +108,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) { - static ::rtl::OUString sDescription(RTL_CONSTASCII_USTRINGPARAM("Relation")); + static ::rtl::OUString sDescription("Relation"); return sDescription; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 4bb97c530104..b1b91f6beae1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -69,8 +69,8 @@ using namespace ::com::sun::star::container; // please look at the book LargeScale C++ to know why namespace { - static const OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - static const OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR ")); + static const OUString C_AND(" AND "); + static const OUString C_OR(" OR "); // forward declarations sal_Bool InsertJoin( const OQueryDesignView* _pView, @@ -302,7 +302,7 @@ namespace { const Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData(); const OUString aQuote = xMetaData->getIdentifierQuoteString(); - const OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = ")); + const OUString sEqual(" = "); for(;aIter != aEnd;++aIter) { @@ -657,8 +657,8 @@ namespace OJoinTableView::OTableWindowMap* pTabList = _pView->getTableView()->GetTabWinMap(); - const static OUString sFieldSeparator(RTL_CONSTASCII_USTRINGPARAM(", ")); - const static OUString s_sAs(RTL_CONSTASCII_USTRINGPARAM(" AS ")); + const static OUString sFieldSeparator(", "); + const static OUString s_sAs(" AS "); aIter = _rFieldList.begin(); for(;aIter != aEnd;++aIter) @@ -1227,7 +1227,7 @@ namespace if ( !aGroupByStr.isEmpty() ) { aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, OUString(' ') ); - OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")); + OUString aGroupByStr2(" GROUP BY "); aGroupByStr2 += aGroupByStr; aGroupByStr = aGroupByStr2; } @@ -2154,7 +2154,7 @@ namespace { SqlParseError eErrorCode = eOk; sal_Bool bFirstField = sal_True; - OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); + OUString sAsterix("*"); OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin(); OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end(); for(;aIter != aEnd && eOk == eErrorCode ;++aIter) @@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement() GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList); if(!aJoinCrit.isEmpty()) { - OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( ")); + OUString aTmp("( "); aTmp += aJoinCrit; aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); if(aCriteriaListStr.getLength()) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 174fb8d49e71..2a0a08e3cff8 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -204,12 +204,12 @@ namespace dbaui Reference < XPropertySet > xPropSet( xBeamerFrame, UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); + const ::rtl::OUString aLayoutManager( "LayoutManager" ); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); if ( xLMPropSet.is() ) { - const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" )); + const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False )); } } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 77ec4fce4827..ce966a7c4a88 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -873,7 +873,7 @@ void OTableController::loadData() pTabEdRow->SetReadOnly(!bIsAlterAllowed); // search for type sal_Bool bForce; - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreate("x"); TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce); if ( !pTypeInfo.get() ) pTypeInfo = m_pTypeInfo; diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index a4c1ea19e060..b4e20a95599e 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -91,7 +91,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) m_pActFieldDescr = new OFieldDescription(_xColumn,sal_True); // search for type - ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreateParam("x"); sal_Bool bForce; TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce); if ( !pTypeInfo.get() ) diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index b23d48f48d4e..3cb4a3113ff9 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -79,7 +79,7 @@ namespace drawinglayer { uno::Sequence< rtl::OUString > XPrimitive2DRenderer_getSupportedServiceNames() { - static rtl::OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.Primitive2DTools" ) ); + static rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools" ); static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 ); return( aServiceNames ); diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 5a8f645b78ab..6a0b352fc29c 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -84,37 +84,37 @@ namespace drawinglayer // the local UNO API strings const ::rtl::OUString& getNamePropertyObjectTransformation() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation")); + static ::rtl::OUString s_sNameProperty("ObjectTransformation"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyViewTransformation() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ViewTransformation")); + static ::rtl::OUString s_sNameProperty("ViewTransformation"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyViewport() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Viewport")); + static ::rtl::OUString s_sNameProperty("Viewport"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyTime() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Time")); + static ::rtl::OUString s_sNameProperty("Time"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyVisualizedPage() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("VisualizedPage")); + static ::rtl::OUString s_sNameProperty("VisualizedPage"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyReducedDisplayQuality() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ReducedDisplayQuality")); + static ::rtl::OUString s_sNameProperty("ReducedDisplayQuality"); return s_sNameProperty; } diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 7ca51ff421fd..68c940adc2a8 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -81,55 +81,55 @@ namespace drawinglayer // the local UNO API strings const ::rtl::OUString& getNamePropertyObjectTransformation() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation")); + static ::rtl::OUString s_sNameProperty("ObjectTransformation"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyOrientation() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Orientation")); + static ::rtl::OUString s_sNameProperty("Orientation"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyProjection() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection")); + static ::rtl::OUString s_sNameProperty("Projection"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyProjection_30() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection30")); + static ::rtl::OUString s_sNameProperty("Projection30"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyProjection_31() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection31")); + static ::rtl::OUString s_sNameProperty("Projection31"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyProjection_32() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection32")); + static ::rtl::OUString s_sNameProperty("Projection32"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyProjection_33() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection33")); + static ::rtl::OUString s_sNameProperty("Projection33"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyDeviceToView() { - static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("DeviceToView")); + static ::rtl::OUString s_sNameProperty("DeviceToView"); return s_sNameProperty; } const ::rtl::OUString& getNamePropertyTime() { - static ::rtl::OUString s_sNamePropertyTime(RTL_CONSTASCII_USTRINGPARAM("Time")); + static ::rtl::OUString s_sNamePropertyTime("Time"); return s_sNamePropertyTime; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 1c0a2c10d735..c4ab4c557a90 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -841,7 +841,7 @@ rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, case SVXTIMEFORMAT_12_HMSH: { // no builtin format available, try to insert or reuse - OUString aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) ); + OUString aFormatCode( "HH:MM:SS.00 AM/PM" ); sal_Int32 nCheckPos; short nType; rFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 48ba83880628..c87d162ad2c7 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -699,7 +699,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() if (!xTmpDicList.is()) return NULL; - const OUString aDicName( RTL_CONSTASCII_USTRINGPARAM( "standard.dic" ) ); + const OUString aDicName( "standard.dic" ); uno::Reference< XDictionary > xDic( xTmpDicList->getDictionaryByName( aDicName ), UNO_QUERY ); if (!xDic.is()) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index cc8cd4cd7bbb..20f73674105b 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -666,12 +666,12 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM case WID_PORTIONTYPE: if ( rSet.GetItemState( EE_FEATURE_FIELD, sal_False ) == SFX_ITEM_SET ) { - OUString aType( RTL_CONSTASCII_USTRINGPARAM("TextField") ); + OUString aType("TextField"); rAny <<= aType; } else { - OUString aType( RTL_CONSTASCII_USTRINGPARAM("Text") ); + OUString aType("Text"); rAny <<= aType; } break; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 0b568f211f66..da42d5ce12e5 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -419,7 +419,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( rStream ) ); /* testcode - const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) ); + const OUString aURL( "file:///e:/test.xml" ); SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True ); aMedium.IsRemote(); uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) ); diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 128e9b4316ef..81963096b3e1 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -167,7 +167,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r uno::Reference<io::XInputStream> xInputStream = new utl::OInputStreamWrapper( rStream ); /* testcode - const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) ); + const OUString aURL( "file:///e:/test.xml" ); SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, sal_True ); aMedium.IsRemote(); uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) ); diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index fcd148936a24..064c74feffd5 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -181,7 +181,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc { const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, uno::UNO_QUERY_THROW ); const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, uno::UNO_QUERY_THROW ); - const ::rtl::OUString sMediaTypePropName( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ); + const ::rtl::OUString sMediaTypePropName( "MediaType" ); xTargetProps->setPropertyValue( sMediaTypePropName, xSourceProps->getPropertyValue( sMediaTypePropName ) ); } catch( const uno::Exception& ) diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f953509a3e60..f34d55c68a04 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -106,8 +106,8 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& const uno::Reference< frame::XDispatchProvider >& xSourceDisp ) { sal_Int32 nInd = 0; - ::rtl::OUString aModuleIdentPropName( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ) ); - ::rtl::OUString aDispProvPropName( RTL_CONSTASCII_USTRINGPARAM( "DispatchProvider" ) ); + ::rtl::OUString aModuleIdentPropName( "ModuleIdentifier" ); + ::rtl::OUString aDispProvPropName( "DispatchProvider" ); sal_Bool bModuleNameSet = sal_False; sal_Bool bDispProvSet = sal_False; diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 4e56995221e7..351aa34bbb56 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -537,7 +537,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" )); + ::rtl::OUString aStreamName( "\002OlePres00" ); aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); if ( xNameContainer->hasByName( aStreamName ) ) xNameContainer->removeByName( aStreamName ); @@ -605,7 +605,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() { for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ ) { - ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" )); + ::rtl::OUString aStreamName( "\002OlePres00" ); aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); try { @@ -655,7 +655,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" )); + ::rtl::OUString aStreamName( "\002OlePres00" ); aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); uno::Reference< io::XStream > xCachedCopyStream; try @@ -692,7 +692,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { if ( bAllowToRepair50 && !xResult.is() ) { - ::rtl::OUString aOrigContName( RTL_CONSTASCII_USTRINGPARAM( "Ole-Object" ) ); + ::rtl::OUString aOrigContName( "Ole-Object" ); if ( xNameContainer->hasByName( aOrigContName ) ) { uno::Reference< embed::XClassifiedObject > xClassified( xNameContainer, uno::UNO_QUERY_THROW ); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index d78d01702e17..f3c0692af630 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -348,8 +348,7 @@ HRESULT DocumentHolder::InPlaceActivate( m_xFrame->activate(); else { // create frame and initialize it with with the created window - static const ::rtl::OUString aFrameServiceName( - RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Frame" ) ); + static const ::rtl::OUString aFrameServiceName( "com.sun.star.frame.Frame" ); m_xFrame = uno::Reference<frame::XFrame>( m_xFactory->createInstance(aFrameServiceName), uno::UNO_QUERY); @@ -1068,8 +1067,7 @@ IDispatch* DocumentHolder::GetIDispatch() if ( !m_pIDispatch && m_xDocument.is() ) { const ::rtl::OUString aServiceName ( - RTL_CONSTASCII_USTRINGPARAM ( - "com.sun.star.bridge.OleBridgeSupplier2" ) ); + "com.sun.star.bridge.OleBridgeSupplier2" ); uno::Reference< bridge::XBridgeSupplier2 > xSupplier( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index aad96c614439..becbe85f4d5b 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -60,8 +60,8 @@ extern ::rtl::OUString getFilterNameFromGUID_Impl( GUID* ); // extern CLIPFORMAT getClipFormatFromGUID_Impl( GUID* ); ::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid ); -const ::rtl::OUString aOfficeEmbedStreamName( RTL_CONSTASCII_USTRINGPARAM ( "package_stream" ) ); -const ::rtl::OUString aExtentStreamName( RTL_CONSTASCII_USTRINGPARAM ( "properties_stream" ) ); +const ::rtl::OUString aOfficeEmbedStreamName( "package_stream" ); +const ::rtl::OUString aExtentStreamName( "properties_stream" ); uno::Reference< io::XInputStream > createTempXInStreamFromIStream( uno::Reference< lang::XMultiServiceFactory > xFactory, diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 5459bc5a3b5c..c5dc23568336 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -70,7 +70,7 @@ protected: // test the getUpdateInformationEnumeration() method void testGetUpdateInformationEnumeration() { - ::rtl::OUString aInstallSetID( RTL_CONSTASCII_USTRINGPARAM( "TODO" ) ); // unused when we do not have a 'feed' + ::rtl::OUString aInstallSetID( "TODO" ); // unused when we do not have a 'feed' uno::Reference< container::XEnumeration > aUpdateInfoEnumeration = m_xProvider->getUpdateInformationEnumeration( m_aRepositoryList, aInstallSetID ); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 25d1d12d1b9d..5ea8c5b0e639 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -534,7 +534,7 @@ namespace abp // failure to create the interaction handler is a serious issue ... if (!xInteractions.is()) { - ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); + ::rtl::OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); if ( _pMessageParent ) ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True ); return sal_False; diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index d0af8438ccf2..1bf4ac6d0b2e 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -52,14 +52,14 @@ namespace abp //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" )); + static const ::rtl::OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" )); + static const ::rtl::OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); return s_sAddressBookNodeName; } @@ -237,8 +237,8 @@ namespace abp const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" )); - const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" )); + const ::rtl::OUString sProgrammaticNodeName( "ProgrammaticFieldName" ); + const ::rtl::OUString sAssignedNodeName( "AssignedFieldName" ); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index b3b2fdc0d07e..58be55f2e894 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -90,16 +90,16 @@ bool LdapUserProfileBe::readLdapConfiguration( LdapDefinition * definition, rtl::OUString * loggedOnUser) { OSL_ASSERT(context.is() && definition != 0 && loggedOnUser != 0); - const rtl::OUString kReadOnlyViewService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")) ; - const rtl::OUString kComponent( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.LDAP/UserDirectory")); - const rtl::OUString kServerDefiniton(RTL_CONSTASCII_USTRINGPARAM ("ServerDefinition")); - const rtl::OUString kServer(RTL_CONSTASCII_USTRINGPARAM ("Server")); - const rtl::OUString kPort(RTL_CONSTASCII_USTRINGPARAM("Port")); - const rtl::OUString kBaseDN(RTL_CONSTASCII_USTRINGPARAM("BaseDN")); - const rtl::OUString kUser(RTL_CONSTASCII_USTRINGPARAM("SearchUser")); - const rtl::OUString kPassword(RTL_CONSTASCII_USTRINGPARAM("SearchPassword")); - const rtl::OUString kUserObjectClass(RTL_CONSTASCII_USTRINGPARAM("UserObjectClass")); - const rtl::OUString kUserUniqueAttr(RTL_CONSTASCII_USTRINGPARAM("UserUniqueAttribute")); + const rtl::OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; + const rtl::OUString kComponent("org.openoffice.LDAP/UserDirectory"); + const rtl::OUString kServerDefiniton("ServerDefinition"); + const rtl::OUString kServer("Server"); + const rtl::OUString kPort("Port"); + const rtl::OUString kBaseDN("BaseDN"); + const rtl::OUString kUser("SearchUser"); + const rtl::OUString kPassword("SearchPassword"); + const rtl::OUString kUserObjectClass("UserObjectClass"); + const rtl::OUString kUserUniqueAttr("UserUniqueAttribute"); uno::Reference< XInterface > xIface; try diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index 584bae01a1dd..d711543d58f9 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -136,8 +136,7 @@ UnxPluginComm::~UnxPluginComm() bool UnxPluginComm::getPluginappPath(rtl::OString * path) { OSL_ASSERT(path != NULL); - rtl::OUString p( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/pluginapp.bin")); + rtl::OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 287ba8b2cb2b..94f6464900b9 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -176,7 +176,7 @@ namespace pcr //-------------------------------------------------------------------- Sequence< ::rtl::OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - ::rtl::OUString sService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspectorModel" ) ); + ::rtl::OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); return Sequence< ::rtl::OUString >( &sService, 1 ); } diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx index 435042c6f115..a81244113d5d 100644 --- a/extensions/test/ole/unloading/unloadTest.cxx +++ b/extensions/test/ole/unloading/unloadTest.cxx @@ -66,7 +66,7 @@ sal_Bool test1() Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); Reference<XMultiComponentFactory> fac= context->getServiceManager(); - OUString sService1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.BridgeSupplier")); + OUString sService1("com.sun.star.bridge.oleautomation.BridgeSupplier"); Reference<XInterface> xint1= fac->createInstanceWithContext( sService1, context); OUString sModule( @@ -76,7 +76,7 @@ sal_Bool test1() rtl_unloadUnusedModules( NULL); - OUString sFactoryFunc( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sFactoryFunc("component_getFactory"); void* pSymbol= osl_getSymbol( hMod,sFactoryFunc.pData); // true, instance alive sal_Bool bTest1= pSymbol ? sal_True : sal_False; @@ -101,7 +101,7 @@ sal_Bool test2() Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); Reference<XMultiComponentFactory> fac= context->getServiceManager(); - OUString sService2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.OleBridgeSupplierVar1")); + OUString sService2("com.sun.star.bridge.OleBridgeSupplierVar1"); Reference<XInterface> xint= fac->createInstanceWithContext( sService2, context); OUString sModule( @@ -110,7 +110,7 @@ sal_Bool test2() osl_unloadModule( hMod); rtl_unloadUnusedModules( NULL); - OUString sFactoryFunc( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sFactoryFunc("component_getFactory"); void* pSymbol= osl_getSymbol( hMod,sFactoryFunc.pData); // true, instance alive sal_Bool bTest1= pSymbol ? sal_True : sal_False; @@ -135,7 +135,7 @@ sal_Bool test3() Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); Reference<XMultiComponentFactory> fac= context->getServiceManager(); - OUString sService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.Factory")); + OUString sService("com.sun.star.bridge.oleautomation.Factory"); Reference<XInterface> xint= fac->createInstanceWithContext( sService, context); @@ -145,7 +145,7 @@ sal_Bool test3() osl_unloadModule( hMod); rtl_unloadUnusedModules( NULL); - OUString sFactoryFunc( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sFactoryFunc("component_getFactory"); void* pSymbol= osl_getSymbol( hMod,sFactoryFunc.pData); // true, instance alive sal_Bool bTest1= pSymbol ? sal_True : sal_False; @@ -169,7 +169,7 @@ sal_Bool test4() oslModule hMod= NULL; OUString sModule( RTL_CONSTASCII_USTRINGPARAM("oleautobridge.uno" SAL_DLLEXTENSION)); - OUString sFactoryFunc( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sFactoryFunc("component_getFactory"); { printf("Test4: com.sun.star.bridge.oleautomation.ApplicationRegistration\n"); Reference<XSimpleRegistry> xreg= createSimpleRegistry(); @@ -178,7 +178,7 @@ sal_Bool test4() Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); Reference<XMultiComponentFactory> fac= context->getServiceManager(); - OUString sService4( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.ApplicationRegistration")); + OUString sService4("com.sun.star.bridge.oleautomation.ApplicationRegistration"); Reference<XInterface> xint= fac->createInstanceWithContext( sService4, context); hMod= osl_loadModule( sModule.pData, 0); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 34fe8a508e7a..25a84438a26c 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3258,7 +3258,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi { try { - const OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM ( "CustomShapeGeometry" ) ); + const OUString sCustomShapeGeometry( "CustomShapeGeometry" ); uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry ); uno::Sequence< beans::PropertyValue > aGeoPropSeq; if ( aGeoPropSet >>= aGeoPropSeq ) diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 5a06d41358ab..bc659c4be509 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -123,8 +123,8 @@ uno::Any CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd ) { //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document" - static rtl::OUString scheme( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" )); - static rtl::OUString part2( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" )); + static rtl::OUString scheme( "vnd.sun.star.script:" ); + static rtl::OUString part2( "?language=Basic&location=document" ); // create script url rtl::OUString scriptURL = scheme + sCmd + part2; return uno::makeAny( scriptURL ); @@ -153,7 +153,7 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re try { uno::Reference< ui::XUIConfigurationManager > xCfgManager( getCfgManager() ); - rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") ); + rtl::OUString sMenuBar("private:resource/menubar/"); sMenuBar += rName; uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW ); @@ -349,7 +349,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect else if ( rHeader.getTct() == 0x0a ) { aProp.Name = rtl::OUString("CommandURL") ; - rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") ); + rtl::OUString sMenuBar("private:resource/menubar/"); TBCMenuSpecific* pMenu = getMenuSpecific(); if ( pMenu ) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 44a0b5214264..d4b16e392df9 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7195,7 +7195,7 @@ void CreateTableRows( Reference< XTableRows > xTableRows, const std::set< sal_In else nHeight = nTableBottom - nLastPosition; - static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) ); + static const rtl::OUString sWidth( "Height" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nHeight ) ); } @@ -7220,7 +7220,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::se else nWidth = nTableRight - nLastPosition; - static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) ); + static const rtl::OUString sWidth( "Width" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nWidth ) ); } @@ -7255,16 +7255,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue()); const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue()); const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue()); - static const rtl::OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM( "TextUpperDistance" ) ); - static const rtl::OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) ); - static const rtl::OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) ); - static const rtl::OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) ); + static const rtl::OUString sTopBorder( "TextUpperDistance" ); + static const rtl::OUString sBottomBorder( "TextLowerDistance" ); + static const rtl::OUString sLeftBorder( "TextLeftDistance" ); + static const rtl::OUString sRightBorder( "TextRightDistance" ); xPropSet->setPropertyValue( sTopBorder, Any( nUpperDist ) ); xPropSet->setPropertyValue( sRightBorder, Any( nRightDist ) ); xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) ); xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) ); - static const rtl::OUString sTextVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) ); + static const rtl::OUString sTextVerticalAdjust( "TextVerticalAdjust" ); const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue()); drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP ); if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER ) @@ -7376,8 +7376,8 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); - static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) ); - static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) ); + static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" ); + static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" ); sal_Int32 nPosition = *aIter & 0xffffff; sal_Int32 nFlags = *aIter &~0xffffff; diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index f2096d6105c5..319b42e7e66f 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -313,7 +313,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read ); OUString aURL( aTempFile.getFileURL() ); #else - OUString aURL( RTL_CONSTASCII_USTRINGPARAM("file:///e:/test.zip") ); + OUString aURL("file:///e:/test.zip"); osl::File::remove( aURL ); osl::File aTempFile( aURL ); nRC = aTempFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write|osl_File_OpenFlag_Read ); @@ -344,7 +344,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < PageEntry* pEntry = exportPage( xDrawPage ); aPageEntries.push_back( pEntry ); - OUString aName( RTL_CONSTASCII_USTRINGPARAM("i") ); + OUString aName("i"); aName += OUString::valueOf( nPage ); aName += OUString(".gif"); pEntry->setURL( aName ); @@ -414,8 +414,8 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) pEntry->setName( xNamed->getName() ); // get title text from title presentation shape if available - const OUString szTitleTextShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape") ); - const OUString szIsEmptyPresObj( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ); + const OUString szTitleTextShape("com.sun.star.presentation.TitleTextShape"); + const OUString szIsEmptyPresObj("IsEmptyPresentationObject"); sal_Int32 nShapeCount = xDrawPage->getCount(); sal_Int32 nShape; @@ -451,7 +451,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) { Reference< XDrawPage > xNotesPage( xPresPage->getNotesPage() ); - const OUString szNotesShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesShape") ); + const OUString szNotesShape("com.sun.star.presentation.NotesShape"); nShapeCount = xNotesPage->getCount(); for( nShape = 0; nShape < nShapeCount; nShape++ ) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 81a4435325a2..e1fea4f4d183 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -586,8 +586,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) // font embedding const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); - rtl::OUString aEmbedFontEnv( - RTL_CONSTASCII_USTRINGPARAM("${SVG_DISABLE_FONT_EMBEDDING}")); + rtl::OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); rtl::Bootstrap::expandMacros(aEmbedFontEnv); const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : ( aEmbedFontEnv.getLength() ? false : true); diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index e3e7a7b7ee2b..a44b231f599d 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -63,7 +63,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if(!xInputStream.is()) return sal_False; - rtl::OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) ); + rtl::OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" ); Reference < XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY ); // The XImporter sets up an empty target document for XDocumentHandler to write to.. diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 62b7bb575f55..f9039b2bbce7 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -905,7 +905,7 @@ sal_Bool SVGTextWriter::nextParagraph() if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) ) { sal_Bool bIsNumbered = sal_True; - OUString msNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber")); + OUString msNumberingIsNumber("NumberingIsNumber"); if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) ) { if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) ) @@ -1035,7 +1035,7 @@ sal_Bool SVGTextWriter::nextParagraph() if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) ) { sal_Bool bIsNumbered = sal_True; - OUString msNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber")); + OUString msNumberingIsNumber("NumberingIsNumber"); if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) ) { if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) ) @@ -1161,8 +1161,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); - const ::rtl::OUString sPresentationServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.") ); + const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); + const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1260,8 +1260,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); - const ::rtl::OUString sPresentationServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.") ); + const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); + const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 9fb075306486..9fa3b3dc223e 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -65,7 +65,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString& } } - OUString aRelURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ); + OUString aRelURL( "vnd.sun.star.Package:" ); aRelURL += rFilterName; aRelURL += OUString( sal_Unicode( '/' ) ); aRelURL += aName; @@ -81,18 +81,18 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML { try { - const OUString sComponentData ( RTL_CONSTASCII_USTRINGPARAM ( "oor:component-data" ) ); - const OUString sNode ( RTL_CONSTASCII_USTRINGPARAM ( "node" ) ); - const OUString sName ( RTL_CONSTASCII_USTRINGPARAM ( "oor:name" ) ); - const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); - const OUString sUIName ( RTL_CONSTASCII_USTRINGPARAM ( "UIName" ) ); - const OUString sComma ( RTL_CONSTASCII_USTRINGPARAM ( "," ) ); - const OUString sDelim ( RTL_CONSTASCII_USTRINGPARAM ( ";" ) ); - const OUString sData ( RTL_CONSTASCII_USTRINGPARAM ( "Data" ) ); - const OUString sDocTypePrefix ( RTL_CONSTASCII_USTRINGPARAM ( "doctype:" ) ); - const OUString sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ); - const OUString sXSLTFilterService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) ); - const OUString sCdataAttribute ( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ); + const OUString sComponentData ( "oor:component-data" ); + const OUString sNode ( "node" ); + const OUString sName ( "oor:name" ); + const OUString sWhiteSpace ( " " ); + const OUString sUIName ( "UIName" ); + const OUString sComma ( "," ); + const OUString sDelim ( ";" ); + const OUString sData ( "Data" ); + const OUString sDocTypePrefix ( "doctype:" ); + const OUString sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ); + const OUString sXSLTFilterService ( "com.sun.star.documentconversion.XSLTFilter" ); + const OUString sCdataAttribute ( "CDATA" ); // set up sax writer and connect to given output stream @@ -227,10 +227,10 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU { try { - const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ); - const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) ); - const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) ); - const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); + const OUString sCdataAttribute( "CDATA" ); + const OUString sProp( "prop" ); + const OUString sValue( "value" ); + const OUString sWhiteSpace ( " " ); ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList; pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName ); @@ -257,10 +257,10 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co { try { - const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ); - const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) ); - const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) ); - const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); + const OUString sCdataAttribute( "CDATA" ); + const OUString sProp( "prop" ); + const OUString sValue( "value" ); + const OUString sWhiteSpace ( " " ); ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList; pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 91691d68e4bf..79f6a6a0442f 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -197,7 +197,7 @@ OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeExcepti Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() throw ( RuntimeException ) { - OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.XSLTFilterDialog" ) ); + OUString aServiceName( "com.sun.star.comp.ui.XSLTFilterDialog" ); Sequence< ::rtl::OUString > aSupported( &aServiceName, 1 ); return aSupported; } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 5947131be136..f99bd73938b1 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -177,7 +177,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // get root zip folder Reference< XInterface > xRootFolder; - OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") ); + OUString szRootFolder("/"); xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder; // export filters files @@ -227,7 +227,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt } Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, STREAM_READ ), true ) ); - OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection.xcu" ) ); + OUString szTypeDetection( "TypeDetection.xcu" ); _addFile( xRootFolder, xFactory, XIS, szTypeDetection ); Reference< XChangesBatch > xBatch( xIfc, UNO_QUERY ); @@ -277,10 +277,10 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // get root zip folder Reference< XInterface > xRootFolder; - OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") ); + OUString szRootFolder("/"); xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder; - OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM("TypeDetection.xcu") ); + OUString szTypeDetection("TypeDetection.xcu"); if( xIfc->hasByHierarchicalName( szTypeDetection ) ) { Reference< XActiveDataSink > xTypeDetection; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index b90b9cfc748c..c7c78f8d4d28 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -404,7 +404,7 @@ void XMLFilterTestDialog::onExportBrowse() Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) ); Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) ); - OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); + OUString aFrame( "_default" ); Sequence< PropertyValue > aArguments(1); aArguments[0].Name = OUString( "InteractionHandler" ); aArguments[0].Value <<= xInter; @@ -590,7 +590,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) ); Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) ); - OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); + OUString aFrame( "_default" ); Sequence< PropertyValue > aArguments(2); aArguments[0].Name = OUString( "FilterName" ); aArguments[0].Value <<= m_pFilterInfo->maFilterName; diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index eb4336479545..f109011a38b1 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -85,7 +85,7 @@ namespace XSLT m_rootStream = createTempFile(); Sequence<Any> args(1); args[0] <<= m_rootStream->getInputStream(); - OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")); + OUString serviceName("com.sun.star.embed.OLESimpleStorage"); Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(serviceName, args), UNO_QUERY); m_storage = cont; diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 5895bc8ad571..01c71872c3ca 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -87,8 +87,8 @@ const StringSequence& getColumnTypes() //------------------------------------------------------------------------------ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) { - const ::rtl::OUString aModelPrefix (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.") ); - const ::rtl::OUString aCompatibleModelPrefix (RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.") ); + const ::rtl::OUString aModelPrefix ("com.sun.star.form.component."); + const ::rtl::OUString aCompatibleModelPrefix ("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FRM_COMPONENT_EDIT) diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 378febb070ff..9f40e8e9d3d2 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2016,7 +2016,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) if ( xColProps.is() ) xPSI = xColProps->getPropertySetInfo( ); - static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( RTL_CONSTASCII_USTRINGPARAM( "ControlDefault" ) ); + static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" ); if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_CONTROLDEFAULT ) ) { Any aDefault = xColProps->getPropertyValue( PROPERTY_CONTROLDEFAULT ); diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 706e17e0afd5..c6c665f5db41 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -300,7 +300,7 @@ namespace frm bool bSelected = ( rEvent.Selected == STATE_CHECK ); - ::rtl::OUString sExpressionMarker( RTL_CONSTASCII_USTRINGPARAM( "$expression$" ) ); + ::rtl::OUString sExpressionMarker( "$expression$" ); ::dbtools::getBoleanComparisonPredicate( sExpressionMarker, bSelected, diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index a371c69e1729..42ed48f2795d 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -836,7 +836,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) ::rtl::OUString sFormatDescription; LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; - static const ::rtl::OUString s_aLocaleProp (RTL_CONSTASCII_USTRINGPARAM("Locale") ); + static const ::rtl::OUString s_aLocaleProp ("Locale"); Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { @@ -849,7 +849,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } } - static const ::rtl::OUString s_aFormatStringProp (RTL_CONSTASCII_USTRINGPARAM("FormatString") ); + static const ::rtl::OUString s_aFormatStringProp ("FormatString"); if (hasProperty(s_aFormatStringProp, xFormat)) xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a448416a80a7..ac526da62618 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -739,7 +739,7 @@ namespace frm Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); - ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); + ::rtl::OUString aStatement("SELECT "); if (aBoundFieldName.isEmpty()) // act like a combobox aStatement += ::rtl::OUString("DISTINCT "); diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index b8c7a1c04505..7a3bf4178de8 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -392,7 +392,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 ) { // the macro name does not already contain a : // -> default the type to "document" - ::rtl::OUString sNewScriptCode( RTL_CONSTASCII_USTRINGPARAM( "document:" ) ); + ::rtl::OUString sNewScriptCode( "document:" ); sNewScriptCode += _rDescriptor.ScriptCode; _rDescriptor.ScriptCode = sNewScriptCode; } diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 8a3597c16f7c..b31c97eb91ec 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -332,7 +332,7 @@ namespace frm if (!bFoundIt) { // somebody gave us an format which we can't translate - ::rtl::OUString sMessage (RTL_CONSTASCII_USTRINGPARAM("This control supports only a very limited number of formats.") ); + ::rtl::OUString sMessage ("This control supports only a very limited number of formats."); throw IllegalArgumentException(sMessage, NULL, 2); } diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 93e8497eec4c..045f98df265f 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -693,7 +693,7 @@ namespace frm } // is it an UNO slot? - ::rtl::OUString sUnoProtocolPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ); + ::rtl::OUString sUnoProtocolPrefix( ".uno:" ); if ( _rURL.Complete.startsWith( sUnoProtocolPrefix ) ) { ::rtl::OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() ); diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 5a0e14981941..b9db8ac9a8d7 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -750,7 +750,7 @@ void Binding::valueModified() void Binding::distributeMIP( const XNode_t & rxNode ) { typedef com::sun::star::xforms::XFormsEventConcrete XFormsEvent_t; - OUString sEventName( RTL_CONSTASCII_USTRINGPARAM("xforms-generic") ); + OUString sEventName("xforms-generic"); XFormsEvent_t *pEvent = new XFormsEvent_t; pEvent->initXFormsEvent(sEventName, sal_True, sal_False); Reference<XEvent> xEvent(pEvent); @@ -1257,7 +1257,7 @@ void Binding::handleEvent( const XEvent_t& xEvent ) throw( RuntimeException ) { OUString sType(xEvent->getType()); - //OUString sEventMIPChanged(RTL_CONSTASCII_USTRINGPARAM("xforms-generic")); + //OUString sEventMIPChanged("xforms-generic"); //if(sType.equals(sEventMIPChanged)) { if(!sType.compareToAscii("xforms-generic")) { diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index 462972018cd7..b313bd269cb7 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -55,7 +55,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext()); // use post command - OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post")); + OUString aCommandName("post"); PostCommandArgument2 aPostArgument; aPostArgument.Source = apSerialization->getInputStream(); CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink); diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 315e42933f34..6c35ea7fee90 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -302,7 +302,7 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z")); + ::rtl::OUString aUTCString("Z"); ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index b3ccbcdbeb62..b076990b3f83 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -359,7 +359,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: // append the filter if (bPrependSeparator) { - rtl::OUString dash(RTL_CONSTASCII_USTRINGPARAM("-")); + rtl::OUString dash("-"); OUStringList emptyList; m_pFilterList->push_back(FilterEntry(dash, emptyList)); } @@ -417,7 +417,7 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename) { rtl::OUString aName = [sFilename OUString]; - rtl::OUString allMatcher(RTL_CONSTASCII_USTRINGPARAM(".*")); + rtl::OUString allMatcher(".*"); for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); iter++) { if (aName.matchIgnoreAsciiCase(*iter, aName.getLength() - (*iter).getLength()) || ((*iter).equals(allMatcher))) { return sal_True; diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index bc02fa0109c6..3cb4e3a585e5 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -215,9 +215,9 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ) { - const ::rtl::OUString aPackage( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")); - const ::rtl::OUString aRelPath( RTL_CONSTASCII_USTRINGPARAM("Path/Info")); - const ::rtl::OUString aKey( RTL_CONSTASCII_USTRINGPARAM("WorkPathChanged")); + const ::rtl::OUString aPackage("org.openoffice.Office.Common/"); + const ::rtl::OUString aRelPath("Path/Info"); + const ::rtl::OUString aKey("WorkPathChanged"); css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY); diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index cef6ad360f35..772265059a36 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -240,8 +240,8 @@ void VistaFilePickerEventHandler::stopListening() } } -static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id")); -static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener")); +static const ::rtl::OUString PROP_CONTROL_ID("control_id"); +static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener"); //----------------------------------------------------------------------------------------- class AsyncPickerEvents : public RequestHandler diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 03e5a927b651..4279ab9b54e8 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -74,26 +74,26 @@ static const ::sal_Int32 FEATURE_PLAY = 256; static const ::sal_Int32 FEATURE_READONLY = 512; static const ::sal_Int32 FEATURE_VERSION = 1024; -static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener" ) ); // [XFilePickerListenert] -static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT(RTL_CONSTASCII_USTRINGPARAM("dialog_show_result" )); // [sal_Bool] true=OK, false=CANCEL -static const ::rtl::OUString PROP_SELECTED_FILES(RTL_CONSTASCII_USTRINGPARAM("selected_files" )); // [seq< OUString >] contains all user selected files (can be empty!) -static const ::rtl::OUString PROP_MULTISELECTION_MODE(RTL_CONSTASCII_USTRINGPARAM("multiselection_mode")); // [sal_Bool] true=ON, false=OFF -static const ::rtl::OUString PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title" )); // [OUString] -static const ::rtl::OUString PROP_FILENAME(RTL_CONSTASCII_USTRINGPARAM("filename" ) ); // [OUString] -static const ::rtl::OUString PROP_DIRECTORY(RTL_CONSTASCII_USTRINGPARAM("directory" )); // [OUString] -static const ::rtl::OUString PROP_FEATURES(RTL_CONSTASCII_USTRINGPARAM("features" )); // [sal_Int32] -static const ::rtl::OUString PROP_TEMPLATE_DESCR(RTL_CONSTASCII_USTRINGPARAM("templatedescription")); // [sal_Int32] -static const ::rtl::OUString PROP_FILTER_TITLE(RTL_CONSTASCII_USTRINGPARAM("filter_title" )); // [OUString] -static const ::rtl::OUString PROP_FILTER_VALUE(RTL_CONSTASCII_USTRINGPARAM("filter_value" )); // [OUString] -static const ::rtl::OUString PROP_FORCE(RTL_CONSTASCII_USTRINGPARAM("force" )); // [sal_Bool] -static const ::rtl::OUString PROP_FILTER_GROUP(RTL_CONSTASCII_USTRINGPARAM("filter-group" )); // [seq< css:beans::StringPair >] contains a group of filters - -static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id" )); // [sal_Int16] -static const ::rtl::OUString PROP_CONTROL_ACTION(RTL_CONSTASCII_USTRINGPARAM("control_action" )); // [sal_Int16] -static const ::rtl::OUString PROP_CONTROL_VALUE(RTL_CONSTASCII_USTRINGPARAM("control_value" )); // [Any] -static const ::rtl::OUString PROP_CONTROL_LABEL(RTL_CONSTASCII_USTRINGPARAM("control_label" )); // [OUString] -static const ::rtl::OUString PROP_CONTROL_ENABLE(RTL_CONSTASCII_USTRINGPARAM("control_enable" )); // [sal_Bool] true=ON, false=OFF -static const ::rtl::OUString STRING_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM("------------------------------------------" )); +static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert] +static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL +static const ::rtl::OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!) +static const ::rtl::OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF +static const ::rtl::OUString PROP_TITLE("title" ); // [OUString] +static const ::rtl::OUString PROP_FILENAME("filename" ); // [OUString] +static const ::rtl::OUString PROP_DIRECTORY("directory" ); // [OUString] +static const ::rtl::OUString PROP_FEATURES("features" ); // [sal_Int32] +static const ::rtl::OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32] +static const ::rtl::OUString PROP_FILTER_TITLE("filter_title" ); // [OUString] +static const ::rtl::OUString PROP_FILTER_VALUE("filter_value" ); // [OUString] +static const ::rtl::OUString PROP_FORCE("force" ); // [sal_Bool] +static const ::rtl::OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters + +static const ::rtl::OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16] +static const ::rtl::OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16] +static const ::rtl::OUString PROP_CONTROL_VALUE("control_value" ); // [Any] +static const ::rtl::OUString PROP_CONTROL_LABEL("control_label" ); // [OUString] +static const ::rtl::OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF +static const ::rtl::OUString STRING_SEPARATOR("------------------------------------------" ); //----------------------------------------------------------------------------- /** native implementation of the file picker on Vista and upcoming windows versions. diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx index 0589c58e02aa..d7dcd14d2e63 100644 --- a/fpicker/source/win32/filepicker/shared.hxx +++ b/fpicker/source/win32/filepicker/shared.hxx @@ -22,9 +22,9 @@ #include <rtl/ustring.hxx> -const ::rtl::OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" )); -const ::rtl::OUString FILTER_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM( "------------------------------------------" )); -const ::rtl::OUString ALL_FILES_WILDCARD(RTL_CONSTASCII_USTRINGPARAM( "*.*" )); +const ::rtl::OUString BACKSLASH( "\\" ); +const ::rtl::OUString FILTER_SEPARATOR( "------------------------------------------" ); +const ::rtl::OUString ALL_FILES_WILDCARD( "*.*" ); const ::sal_Bool ALLOW_DUPLICATES = sal_True; #endif diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index 9d3347893fd4..57608ccaf112 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -76,7 +76,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker ); Reference< XMultiServiceFactory > g_xFactory; -const OUString BMP_EXTENSION(RTL_CONSTASCII_USTRINGPARAM( "bmp" )); +const OUString BMP_EXTENSION( "bmp" ); //------------------------------------------------------------------------------------------------------------------------- // a test client diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 97c29ec25273..add1ee46da65 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -42,7 +42,7 @@ using osl::FileBase; // //------------------------------------------------------------------------ -const OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" )); +const OUString BACKSLASH( "\\" ); //------------------------------------------------------------------------ // ctor diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 8a993306b03f..403ab1cdeffc 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -39,9 +39,9 @@ using ::com::sun::star::uno::Sequence; // //------------------------------------------------------------ -const rtl::OUString TILDE(RTL_CONSTASCII_USTRINGPARAM( "~" )); +const rtl::OUString TILDE( "~" ); const sal_Unicode TILDE_SIGN = L'~'; -const rtl::OUString AMPERSAND(RTL_CONSTASCII_USTRINGPARAM( "&" )); +const rtl::OUString AMPERSAND( "&" ); const sal_Unicode AMPERSAND_SIGN = L'&'; //------------------------------------------------------------ diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx index a96735f6236d..082f099baa30 100644 --- a/framework/source/fwi/jobs/jobconst.cxx +++ b/framework/source/fwi/jobs/jobconst.cxx @@ -23,19 +23,19 @@ namespace framework{ const OUString JobConst::ANSWER_DEACTIVATE_JOB() { - static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); + static const OUString PROP("Deactivate"); return PROP; } const OUString JobConst::ANSWER_SAVE_ARGUMENTS() { - static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments")); + static const OUString PROP("SaveArguments"); return PROP; } const OUString JobConst::ANSWER_SEND_DISPATCHRESULT() { - static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult")); + static const OUString PROP("SendDispatchResult"); return PROP; } diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 288a2374f446..1e47e9854521 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -127,7 +127,7 @@ void TestBreakIterator::testLineBreaking() //See https://issues.apache.org/ooo/show_bug.cgi?id=17155 { - rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("foo /bar/baz")); + rtl::OUString aTest("foo /bar/baz"); aLocale.Language = rtl::OUString("en"); aLocale.Country = rtl::OUString("US"); @@ -142,7 +142,7 @@ void TestBreakIterator::testLineBreaking() //See https://issues.apache.org/ooo/show_bug.cgi?id=19716 { - rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("aaa]aaa")); + rtl::OUString aTest("aaa]aaa"); aLocale.Language = rtl::OUString("en"); aLocale.Country = rtl::OUString("US"); diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 13a8b3fa63c1..8770a2f37934 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -52,8 +52,8 @@ extern int yydebug; sal_Int32 lineNumber = 1; -static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); -static OUString TEMP(RTL_CONSTASCII_USTRINGPARAM("TEMP")); +static OUString TMP("TMP"); +static OUString TEMP("TEMP"); static sal_Char tmpFilePattern[512]; sal_Bool isFileUrl(const OString& fileName) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 0723910b566f..f58a66d3b4ea 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -92,18 +92,12 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) OUString sJavaLibraryPath; typedef vector<pair<OUString, OUString> >::const_iterator it_prop; - OUString sVendorProperty( - RTL_CONSTASCII_USTRINGPARAM("java.vendor")); - OUString sVersionProperty( - RTL_CONSTASCII_USTRINGPARAM("java.version")); - OUString sJavaHomeProperty( - RTL_CONSTASCII_USTRINGPARAM("java.home")); - OUString sJavaLibraryPathProperty( - RTL_CONSTASCII_USTRINGPARAM("java.library.path")); - OUString sGNUHomeProperty( - RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url")); - OUString sAccessProperty( - RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); + OUString sVendorProperty("java.vendor"); + OUString sVersionProperty("java.version"); + OUString sJavaHomeProperty("java.home"); + OUString sJavaLibraryPathProperty("java.library.path"); + OUString sGNUHomeProperty("gnu.classpath.home.url"); + OUString sAccessProperty("javax.accessibility.assistive_technologies"); bool bVersion = false; bool bVendor = false; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 810470e1c58e..9ac4503b1899 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -86,8 +86,8 @@ OString getPluginJarPath( const OUString& sVersion) { OString ret; - OUString sName1(RTL_CONSTASCII_USTRINGPARAM("javaplugin.jar")); - OUString sName2(RTL_CONSTASCII_USTRINGPARAM("plugin.jar")); + OUString sName1("javaplugin.jar"); + OUString sName2("plugin.jar"); OUString sPath; if ( sVendor == SUN_MICRO ) { @@ -599,7 +599,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #ifdef UNX //Setting the JAVA_HOME is needed for awt - rtl::OUString javaHome(RTL_CONSTASCII_USTRINGPARAM("JAVA_HOME=")); + rtl::OUString javaHome("JAVA_HOME="); rtl::OUString sPathLocation; osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData); javaHome += sPathLocation; @@ -609,8 +609,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #endif typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); - rtl::OUString sSymbolCreateJava( - RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM")); + rtl::OUString sSymbolCreateJava("JNI_CreateJavaVM"); JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol( moduleRt, sSymbolCreateJava.pData); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 7b6901aed5ec..e4e5b0945ddd 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -396,7 +396,7 @@ bool getJavaProps(const OUString & exePath, sal_Int32 cArgs = 3; OUString arg1 = OUString("-classpath");// + sClassPath; OUString arg2 = sClassPath; - OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties")); + OUString arg3("JREProperties"); OUString arg4 = "noaccessibility"; rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData}; @@ -467,7 +467,7 @@ bool getJavaProps(const OUString & exePath, #ifdef JVM_ONE_PATH_CHECK //replace absolute path by linux distro link - OUString sHomeProperty(RTL_CONSTASCII_USTRINGPARAM("java.home")); + OUString sHomeProperty("java.home"); if(sHomeProperty.equals(sKey)) { sVal = homePath + OUString::createFromAscii("/jre"); @@ -991,7 +991,7 @@ rtl::Reference<VendorBase> getJREInfoByPath( //find java.vendor property typedef vector<pair<OUString, OUString> >::const_iterator c_ip; - OUString sVendor(RTL_CONSTASCII_USTRINGPARAM("java.vendor")); + OUString sVendor("java.vendor"); OUString sVendorName; for (c_ip i = props.begin(); i != props.end(); ++i) @@ -1056,8 +1056,8 @@ inline OUString getDirFromFile(const OUString& usFilePath) void createJavaInfoFromPath(vector<rtl::Reference<VendorBase> >& vecInfos) { // Get Java from PATH environment variable - static OUString sCurDir(RTL_CONSTASCII_USTRINGPARAM(".")); - static OUString sParentDir(RTL_CONSTASCII_USTRINGPARAM("..")); + static OUString sCurDir("."); + static OUString sParentDir(".."); char *szPath= getenv("PATH"); if(szPath) { @@ -1169,7 +1169,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) - OUString usFile(RTL_CONSTASCII_USTRINGPARAM("file:///")); + OUString usFile("file:///"); for( int ii = 0; ii < cSearchPaths; ii ++) { OUString usDir1(usFile + arPaths[ii]); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 9f19d1768504..67957ef6fbd2 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -74,14 +74,10 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) //javax.accessibility.assistive_technologies from system properties typedef vector<pair<OUString, OUString> >::const_iterator it_prop; - OUString sVendorProperty( - RTL_CONSTASCII_USTRINGPARAM("java.vendor")); - OUString sVersionProperty( - RTL_CONSTASCII_USTRINGPARAM("java.version")); - OUString sHomeProperty( - RTL_CONSTASCII_USTRINGPARAM("java.home")); - OUString sAccessProperty( - RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); + OUString sVendorProperty("java.vendor"); + OUString sVersionProperty("java.version"); + OUString sHomeProperty("java.home"); + OUString sAccessProperty("javax.accessibility.assistive_technologies"); bool bVersion = false; bool bVendor = false; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 03a575a5708d..b4dde95ac429 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -412,8 +412,7 @@ javaFrameworkError SAL_CALL jfw_startVM( if ( ! modulePlugin) return JFW_E_NO_PLUGIN; - rtl::OUString sFunctionName( - RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine")); + rtl::OUString sFunctionName("jfw_plugin_startJavaVirtualMachine"); jfw_plugin_startJavaVirtualMachine_ptr pFunc = (jfw_plugin_startJavaVirtualMachine_ptr) osl_getFunctionSymbol(modulePlugin, sFunctionName.pData); @@ -1224,8 +1223,7 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) return JFW_E_NO_PLUGIN; - rtl::OUString sFunctionName( - RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_existJRE")); + rtl::OUString sFunctionName("jfw_plugin_existJRE"); jfw_plugin_existJRE_ptr pFunc = (jfw_plugin_existJRE_ptr) osl_getFunctionSymbol(modulePlugin, sFunctionName.pData); diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 22e94a0a983e..45b49f9e4ec0 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1118,7 +1118,7 @@ OUString SAL_CALL ODatabaseMetaData::getDriverName() throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getDriverName"); - OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org" ) ); + OUString aValue( "MySQL Connector/OO.org" ); return aValue; } /* }}} */ @@ -1129,7 +1129,7 @@ OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getDriverVersion"); - static const OUString sVersion( RTL_CONSTASCII_USTRINGPARAM( "0.9.2" ) ); + static const OUString sVersion( "0.9.2" ); return sVersion; } /* }}} */ diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index dc0ebc06facf..774ac5810067 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -921,7 +921,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column) { OSL_TRACE("OPreparedStatement::checkColumnIndex"); if (column < 1 || column > (sal_Int32) m_paramCount) { - OUString buf( RTL_CONSTASCII_USTRINGPARAM( "Parameter index out of range" ) ); + OUString buf( "Parameter index out of range" ); throw SQLException(buf, *this, OUString(), 1, Any ()); } } diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index c428dd7ab2ca..5e5161e1fb5e 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -1487,7 +1487,7 @@ void OResultSet::checkColumnIndex(sal_Int32 index) OSL_TRACE("OResultSet::checkColumnIndex"); if ((index < 1 || index > (int) fieldCount)) { /* static object for efficiency or thread safety is a problem ? */ - OUString buf( RTL_CONSTASCII_USTRINGPARAM( "index out of range" ) ); + OUString buf( "index out of range" ); throw SQLException(buf, *this, OUString(), 1, Any()); } } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 4eb89c3cd72d..a43156aee03f 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -237,7 +237,7 @@ Sequence< OUString > MyService1Impl::getSupportedServiceNames() throw (RuntimeException) { // this object only supports one service - OUString serviceName( RTL_CONSTASCII_USTRINGPARAM("my_module.MyService1") ); + OUString serviceName("my_module.MyService1"); return Sequence< OUString >( &serviceName, 1 ); } diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index eb9667f10427..07d0cc6dff73 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -113,7 +113,7 @@ OUString getImplementationName() Sequence< OUString > getSupportedServiceNames() { - OUString serviceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Python" ) ); + OUString serviceName( "com.sun.star.loader.Python" ); return Sequence< OUString > ( &serviceName, 1 ); } @@ -171,7 +171,7 @@ static void prependPythonPath( const OUString & pythonPathBootstrap ) if( oldEnv ) bufPYTHONPATH.append( rtl::OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) ); - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("PYTHONPATH")); + rtl::OUString envVar("PYTHONPATH"); rtl::OUString envValue(bufPYTHONPATH.makeStringAndClear()); osl_setEnvironment(envVar.pData, envValue.pData); } @@ -203,10 +203,10 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c #ifdef WNT //extend PATH under windows to include the branddir/program so ssl libs will be found //for use by terminal mailmerge dependency _ssl.pyd - rtl::OUString sEnvName(RTL_CONSTASCII_USTRINGPARAM("PATH")); + rtl::OUString sEnvName("PATH"); rtl::OUString sPath; osl_getEnvironment(sEnvName.pData, &sPath.pData); - rtl::OUString sBrandLocation(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")); + rtl::OUString sBrandLocation("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(sBrandLocation); osl::FileBase::getSystemPathFromFileURL(sBrandLocation, sBrandLocation); sPath = rtl::OUStringBuffer(sPath). diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index de051b2727f7..b709c13a63ca 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -225,7 +225,7 @@ OUString getLibDir() reinterpret_cast< oslGenericFunction >(getLibDir), libDir ) ) { libDir = OUString( libDir.getStr(), libDir.lastIndexOf('/' ) ); - OUString name ( RTL_CONSTASCII_USTRINGPARAM( "PYUNOLIBDIR" ) ); + OUString name ( "PYUNOLIBDIR" ); rtl_bootstrap_set( name.pData, libDir.pData ); } pLibDir = &libDir; diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 47dad3cf7bc7..726f00d8c7bc 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -214,7 +214,7 @@ RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey, if (pKey->isReadOnly()) return REG_REGISTRY_READONLY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -256,7 +256,7 @@ RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey, if (pKey->isReadOnly()) return REG_REGISTRY_READONLY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -298,7 +298,7 @@ RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey, if (pKey->isReadOnly()) return REG_REGISTRY_READONLY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -340,7 +340,7 @@ RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey, if (pKey->isReadOnly()) return REG_REGISTRY_READONLY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -385,7 +385,7 @@ RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey, RegValueType valueType; sal_uInt32 valueSize; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -431,7 +431,7 @@ RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey, if (pKey->isDeleted()) return REG_INVALID_KEY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -470,7 +470,7 @@ RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey, if (pKey->isDeleted()) return REG_INVALID_KEY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -509,7 +509,7 @@ RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey, if (pKey->isDeleted()) return REG_INVALID_KEY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; @@ -548,7 +548,7 @@ RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey, if (pKey->isDeleted()) return REG_INVALID_KEY; - OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") ); + OUString valueName("value"); if (keyName->length) { ORegKey* pSubKey = 0; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index c4cf461c3281..6c923518e435 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -306,7 +306,7 @@ OStyle::OStyle() const sal_Int32 nZero = 0; const sal_Int16 n16Zero = 0; const sal_Int16 nNummeringType = style::NumberingType::ARABIC; - const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Default")); + const ::rtl::OUString sName("Default"); const ::rtl::OUString sEmpty; const table::BorderLine eBorderLine(0,0,0,0); const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0); @@ -380,7 +380,7 @@ OStyle::OStyle() registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); - const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); + const ::rtl::OUString sPaperTray("[From printer settings]"); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); @@ -506,7 +506,7 @@ namespace { uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(m_xContext); uno::Reference<frame::XComponentLoader> xFrameLoad(xDesktop,uno::UNO_QUERY); - ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + ::rtl::OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = xDesktop->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set(xFrame,uno::UNO_QUERY); @@ -1466,7 +1466,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); if ( xProp.is() ) { - static const ::rtl::OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + static const ::rtl::OUString sPropName("MediaType"); ::rtl::OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType ) @@ -1583,8 +1583,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } if ( aImage.hasValue() ) { - ::rtl::OUString sObject1(RTL_CONSTASCII_USTRINGPARAM("report")); - ::rtl::OUString sPng(RTL_CONSTASCII_USTRINGPARAM("image/png")); + ::rtl::OUString sObject1("report"); + ::rtl::OUString sPng("image/png"); uno::Sequence<sal_Int8> aSeq; aImage >>= aSeq; @@ -1692,8 +1692,8 @@ sal_Bool OReportDefinition::WriteThroughComponent( xSeek->seek(0); } - ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType")); - ::rtl::OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") ); + ::rtl::OUString aPropName("MediaType"); + ::rtl::OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; xStreamProp->setPropertyValue( aPropName, aAny ); @@ -1888,7 +1888,7 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); embed::VisualRepresentation aResult; - ::rtl::OUString sImageName(RTL_CONSTASCII_USTRINGPARAM("report")); + ::rtl::OUString sImageName("report"); ::rtl::OUString sMimeType; uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream(sImageName,&sMimeType); if ( xStream.is() ) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 4a31c6b44bb7..9a61db0f2439 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -166,7 +166,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task if ( !m_xReport.is() || !m_xActiveConnection.is() ) throw lang::IllegalArgumentException(); - static const ::rtl::OUString s_sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + static const ::rtl::OUString s_sMediaType("MediaType"); try { MimeConfigurationHelper aConfighelper(m_xContext); @@ -234,11 +234,11 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task ::rtl::OUStringBuffer sAuthor(aUserOpts.GetFirstName()); sAuthor.appendAscii(" "); sAuthor.append(aUserOpts.GetLastName()); - static const ::rtl::OUString s_sAuthor(RTL_CONSTASCII_USTRINGPARAM("Author")); + static const ::rtl::OUString s_sAuthor("Author"); aConvertedProperties[nPos].Name = s_sAuthor; aConvertedProperties[nPos++].Value <<= sAuthor.makeStringAndClear(); - static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")); + static const ::rtl::OUString s_sTitle("Title"); aConvertedProperties[nPos].Name = s_sTitle; aConvertedProperties[nPos++].Value <<= m_xReport->getCaption(); @@ -294,7 +294,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { // if there is no frame given, find the right xFrameLoad.set( frame::Desktop::create(m_xContext), uno::UNO_QUERY); - ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + ::rtl::OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 826ef1feebca..9d486b867ba0 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -78,7 +78,7 @@ namespace rptui // Okay, let's start with replacing all $$ in our pattern with the actual field data source ::rtl::OUString sMatchExpression( m_sPattern ); - const ::rtl::OUString sFieldDataPattern( RTL_CONSTASCII_USTRINGPARAM( "$$" ) ); + const ::rtl::OUString sFieldDataPattern( "$$" ); sal_Int32 nIndex( sMatchExpression.indexOf( sFieldDataPattern ) ); while ( nIndex != -1 ) { @@ -86,8 +86,8 @@ namespace rptui nIndex = sMatchExpression.indexOf( sFieldDataPattern, nIndex + _rFieldDataSource.getLength() ); } - const ::rtl::OUString sLHSPattern( RTL_CONSTASCII_USTRINGPARAM( "$1" ) ); - const ::rtl::OUString sRHSPattern( RTL_CONSTASCII_USTRINGPARAM( "$2" ) ); + const ::rtl::OUString sLHSPattern( "$1" ); + const ::rtl::OUString sRHSPattern( "$2" ); sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) ); sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) ); diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index f1431e4c8f8d..2c12edfb057e 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -35,7 +35,7 @@ namespace rptui //---------------------------------------------------------------- const ::rtl::OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( RTL_CONSTASCII_USTRINGPARAM( "rpt:" ) ); + static ::rtl::OUString s_sPrefix( "rpt:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; @@ -44,7 +44,7 @@ namespace rptui //---------------------------------------------------------------- const ::rtl::OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( RTL_CONSTASCII_USTRINGPARAM( "field:" ) ); + static ::rtl::OUString s_sPrefix( "field:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 1f25cb715e88..2ecb91534735 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -224,7 +224,7 @@ namespace rptui return; ::rtl::OUString sDataField( _rxFormatted->getDataField() ); - const ::rtl::OUString sFieldPrefix( RTL_CONSTASCII_USTRINGPARAM( "field:[" ) ); + const ::rtl::OUString sFieldPrefix( "field:[" ); if ( sDataField.indexOf( sFieldPrefix ) != 0 ) // not bound to a table field // TODO: we might also do this kind of thing for functions and expressions ... diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 650b1c49cc46..18a6cb857b28 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -108,7 +108,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( ORptFilter& rImport = GetOwnImport(); const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); switch( nToken ) @@ -261,7 +261,7 @@ void OXMLCell::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); m_sText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 47327352352c..7a3c0e019bb9 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1423,7 +1423,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor ::rtl::OUString sFieldData = _xReportElement->getDataField(); static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); - static const ::rtl::OUString s_sReportPrefix(RTL_CONSTASCII_USTRINGPARAM("rpt:")); + static const ::rtl::OUString s_sReportPrefix("rpt:"); sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength()); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); if ( nPageNumberIndex != -1 ) @@ -1437,7 +1437,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { if ( sToken == s_sPageNumber ) { - static const ::rtl::OUString s_sCurrent(RTL_CONSTASCII_USTRINGPARAM("current")); + static const ::rtl::OUString s_sCurrent("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("1")); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 5762acc5d6e6..b32245c1931e 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -43,7 +43,7 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler > SvtSaveOptions aSaveOpt; if ( aSaveOpt.IsPrettyPrinting() ) { - static const ::rtl::OUString s_sWhitespaces(RTL_CONSTASCII_USTRINGPARAM(" ")); + static const ::rtl::OUString s_sWhitespaces(" "); _xDelegatee->ignorableWhitespace(s_sWhitespaces); } } @@ -283,7 +283,7 @@ void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) } else if ( m_bExportChar ) { - static const ::rtl::OUString s_sZero(RTL_CONSTASCII_USTRINGPARAM("0")); + static const ::rtl::OUString s_sZero("0"); m_xDelegatee->characters(s_sZero); } } @@ -371,16 +371,16 @@ void ExportDocumentHandler::exportTableRows() const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); - const static ::rtl::OUString s_sFieldPrefix(RTL_CONSTASCII_USTRINGPARAM("field:[")); - const static ::rtl::OUString s_sFieldPostfix(RTL_CONSTASCII_USTRINGPARAM("]")); + const static ::rtl::OUString s_sFieldPrefix("field:["); + const static ::rtl::OUString s_sFieldPostfix("]"); const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) ); const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) ); const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); - const static ::rtl::OUString s_sString(RTL_CONSTASCII_USTRINGPARAM("string")); - const static ::rtl::OUString s_sFloat(RTL_CONSTASCII_USTRINGPARAM("float")); + const static ::rtl::OUString s_sString("string"); + const static ::rtl::OUString s_sFloat("float"); SvXMLAttributeList* pCellAtt = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 523d4f6f4319..a62125b682cf 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -138,7 +138,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( if ( pContext ) return pContext; - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XComponentContext> xContext = m_rImport.GetComponentContext(); @@ -218,7 +218,7 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sPageText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); + static const ::rtl::OUString s_sStringConcat(" & "); m_sPageText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 51ea7ebb5303..64ed6651078c 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -338,7 +338,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - const static ::rtl::OUString s_sDatabaseDataProvider(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DatabaseDataProvider")); + const static ::rtl::OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider"); m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider ,m_xContext),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b557e839af7f..4b5d6ea96f80 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -538,7 +538,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) 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 const ::rtl::OUString s_sOld("OldFormat"); static comphelper::PropertyMapEntry pMap[] = { { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, @@ -556,8 +556,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) 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")); - static const rtl::OUString s_sStreamName(RTL_CONSTASCII_USTRINGPARAM("StreamName")); + static const ::rtl::OUString s_sMeta("meta.xml"); + static const rtl::OUString s_sStreamName("StreamName"); xProp->setPropertyValue(s_sStreamName, uno::makeAny(s_sMeta)); sal_Int32 nRet = ReadThroughComponent( xStorage ,xModel @@ -1080,7 +1080,7 @@ sal_Bool ORptFilter::isOldFormat() const uno::Reference<beans::XPropertySet> xProp = getImportInfo(); if ( xProp.is() ) { - const static ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); + const static ::rtl::OUString s_sOld("OldFormat"); if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld)) { xProp->getPropertyValue(s_sOld) >>= bOldFormat; diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 9de12edf5fb6..6dad9740dcd4 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -136,11 +136,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) { uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY); - const ::rtl::OUString sModel(RTL_CONSTASCII_USTRINGPARAM("Model")); + const ::rtl::OUString sModel("Model"); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) ) { m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index c06edad3aec6..6a3bdca05eee 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -139,7 +139,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin // ----------------------------------------------------------------------------- OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { - OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("[")); + OUString sQuotedFunctionName("["); sQuotedFunctionName += _sFunction + OUString("]"); return sQuotedFunctionName; } @@ -347,7 +347,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY ); m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); - const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const OUString sRowSet("RowSet"); if ( xObjectAsContainer->hasByName( sRowSet ) ) { const uno::Any aRowSet( xObjectAsContainer->getByName(sRowSet) ); diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 8c9fdd892029..13f179165c81 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -115,10 +115,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) xNameCont->getByName(sFormComponent) >>= m_xFormComponent; - const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const ::rtl::OUString sRowSet("RowSet"); if ( xNameCont->hasByName(sRowSet) ) { uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c8b4a2c5aba9..3f6f77262ca4 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1788,7 +1788,7 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter")); + rtl::OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); } else @@ -2846,7 +2846,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - const ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + const ::rtl::OUString sTarget("_blank"); Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag); return xFrame; } @@ -3969,7 +3969,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( xSection.is() ) { - const ::rtl::OUString sKeyModifier(RTL_CONSTASCII_USTRINGPARAM("KeyModifier")); + const ::rtl::OUString sKeyModifier("KeyModifier"); const beans::PropertyValue* pIter = _aArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); @@ -3993,8 +3993,8 @@ void OReportController::checkChartEnabled() if ( !m_bChartEnabledAsked ) { m_bChartEnabledAsked = true; - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "UserData/Chart" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); + const ::rtl::OUString sPropertyName( "UserData/Chart" ); try { diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 73bfcd6aba6b..a804d872b292 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -72,8 +72,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "DirectHelp" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); + const ::rtl::OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -145,7 +145,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { - const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspector" ) ); + const ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError(pParent, sServiceName, sal_True); } else diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index e800a598a0c9..03de113eb335 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -764,7 +764,7 @@ namespace /* private */ bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result) { bool bfound = false; - rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH")); + rtl::OUString path("PATH"); rtl::OUString env_path; if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData)) diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index aa71c36b0258..810ad5d4855a 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -254,7 +254,7 @@ static void ChildStatusProc(void *pData) if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno)); - const rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("HOME")); + const rtl::OUString envVar("HOME"); osl_clearEnvironment(envVar.pData); } diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 723d10bcd436..bd1e5a2f9726 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -234,7 +234,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) /* see @ osl_getExecutableFile(). */ if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1) { - const rtl::OUString PATH (RTL_CONSTASCII_USTRINGPARAM("PATH")); + const rtl::OUString PATH ("PATH"); rtl_uString * pSearchPath = 0; osl_getEnvironment (PATH.pData, &pSearchPath); diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index 0356e9e397f5..bdf50f0441e3 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -108,7 +108,7 @@ namespace rtl_string void convertUStringToString_001() { - rtl::OUString suString(RTL_CONSTASCII_USTRINGPARAM("Hello")); + rtl::OUString suString("Hello"); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS); diff --git a/sal/rtl/logfile.cxx b/sal/rtl/logfile.cxx index c5396a7ac1a8..c33eb5800ae8 100644 --- a/sal/rtl/logfile.cxx +++ b/sal/rtl/logfile.cxx @@ -113,7 +113,7 @@ void init() { MutexGuard guard( getLogMutex() ); if( ! g_bHasBeenCalled ) { - OUString name( RTL_CONSTASCII_USTRINGPARAM( "RTL_LOGFILE" ) ); + OUString name( "RTL_LOGFILE" ); OUString value; if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) ) { diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index 5de39f01de26..151b03a33cb1 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -69,8 +69,8 @@ int main( int argc, char *argv[] ) Bootstrap bootstrap(iniName); - OUString name( RTL_CONSTASCII_USTRINGPARAM( "MYBOOTSTRAPTESTVALUE" )); - OUString myDefault( RTL_CONSTASCII_USTRINGPARAM("$Default")); + OUString name( "MYBOOTSTRAPTESTVALUE" ); + OUString myDefault("$Default"); OUString value; sal_Bool useDefault; diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx index 39ced7a05af9..b822f8ecba06 100644 --- a/sal/test/unloading/unloadTest.cxx +++ b/sal/test/unloading/unloadTest.cxx @@ -198,7 +198,7 @@ sal_Bool test1() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( !pSymbol) @@ -242,7 +242,7 @@ sal_Bool test2() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( !pSymbol) @@ -286,7 +286,7 @@ sal_Bool test3() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must succeed - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( pSymbol) @@ -334,7 +334,7 @@ sal_Bool test4() rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod1, sSymbol.pData); void* pSymbol2= osl_getSymbol( handleMod2, sSymbol.pData); @@ -354,7 +354,7 @@ sal_Bool test5() sal_Bool btest1= sal_False; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( OUString("applicat.rdb")); @@ -423,7 +423,7 @@ sal_Bool test6() oslModule handleMod2=0; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); { Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory( OUString("applicat.rdb")); @@ -520,7 +520,7 @@ sal_Bool test8() printf("Test 8 ####################################################\n"); oslModule handleMod1=0; OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1)); - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); sal_Bool b_ifaceSupported=sal_False; sal_Bool b_instances_identical= sal_False; @@ -630,7 +630,7 @@ sal_Bool test9() // the service manager is still alive rtl_unloadUnusedModules( NULL); // Try to get a symbol, must fail - OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory")); + OUString sSymbol("component_getFactory"); void* pSymbol= osl_getSymbol( handleMod, sSymbol.pData); if( pSymbol) diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index a66eb1857989..094cb2d6cb9a 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -415,13 +415,13 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, static const OUString& getTrueString() { - static const OUString sTrue( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); + static const OUString sTrue( "true" ); return sTrue; } static const OUString& getFalseString() { - static const OUString sFalse( RTL_CONSTASCII_USTRINGPARAM( "false" ) ); + static const OUString sFalse( "false" ); return sFalse; } diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 85d4801519b7..906c49400784 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -84,7 +84,7 @@ void ScMacrosTest::testStarBasic() CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document")); + rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index d404d335c97c..771f7e33296b 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -103,7 +103,7 @@ private: void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) { - rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString aSep("/"); rtl::OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index a65a04878b9a..a3e925a17f12 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -88,7 +88,7 @@ ScCellRangeObj::ScCellRangeObj(): uno::Reference< uno::XInterface > ScCellRangeObj::init() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) @@ -108,7 +108,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 8403c051b076..892db8e1ec64 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -88,7 +88,7 @@ uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index b52962d85115..05424366c59d 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -76,7 +76,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); //set value from xnamedranges.hxx diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 3b23c60f19d5..191feb5ad7d1 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -242,7 +242,7 @@ void ScFiltersTest::testRangeNameODS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); testFile( aCSVPath, pDoc, 1); diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 5325bbc37850..8261358835d1 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -189,7 +189,7 @@ public: ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString( rsBaseString ) {} void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + OUString aSep("/"); OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 0bb7645944e5..d7cf013bee23 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -292,7 +292,7 @@ void ScFiltersTest::testRangeNameXLS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#44587 @@ -1152,7 +1152,7 @@ void ScFiltersTest::testDataValidityODS() void ScFiltersTest::testBrokenQuotesCSV() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes.")); + const OUString aFileNameBase("fdo48621_broken_quotes."); OUString aFileExtension(aFileFormats[CSV].pName, strlen(aFileFormats[CSV].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[CSV].pFilterName, strlen(aFileFormats[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1169,7 +1169,7 @@ void ScFiltersTest::testBrokenQuotesCSV() ScDocument* pDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes_exported.")); + OUString aSheet2CSV("fdo48621_broken_quotes_exported."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#48621 @@ -1180,7 +1180,7 @@ void ScFiltersTest::testBrokenQuotesCSV() void ScFiltersTest::testSharedFormulaXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("shared-formula.")); + const OUString aFileNameBase("shared-formula."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1215,7 +1215,7 @@ void ScFiltersTest::testSharedFormulaXLSX() void ScFiltersTest::testCellValueXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("cell-value.")); + const OUString aFileNameBase("cell-value."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1276,14 +1276,14 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) void ScFiltersTest::testPasswordNew() { //tests opening a file with new password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("password.")); + const OUString aFileNameBase("password."); testPassword_Impl(aFileNameBase); } void ScFiltersTest::testPasswordOld() { //tests opening a file with old password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("passwordOld.")); + const OUString aFileNameBase("passwordOld."); testPassword_Impl(aFileNameBase); } @@ -1777,7 +1777,7 @@ void testColorScale_Impl(ScDocument* pDoc, const OUString& aBaseString) void ScFiltersTest::testColorScaleODS() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[ODS].pName, strlen(aFileFormats[ODS].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[ODS].pFilterName, strlen(aFileFormats[ODS].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1803,7 +1803,7 @@ void ScFiltersTest::testColorScaleODS() void ScFiltersTest::testColorScaleXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index c031418f6e92..0198db842c4f 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1168,7 +1168,7 @@ OUString XclExpXmlStream::implGetImplementationName() const Sequence< OUString > SAL_CALL XlsxExport_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" ) ); + const OUString aServiceName( "com.sun.star.document.ExportFilter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 0c2f9c10b28a..fd02260ae039 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) ); + static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 7982f1d378e5..83ea5bfd9cb4 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2232,9 +2232,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) { // Pick up the number format associated with this class (if // any). - rtl::OUString aElem(RTL_CONSTASCII_USTRINGPARAM("td")); + rtl::OUString aElem("td"); rtl::OUString aClass = itr->GetString(); - rtl::OUString aProp(RTL_CONSTASCII_USTRINGPARAM("mso-number-format")); + rtl::OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); rtl::OUString aNumFmt = decodeNumberFormat(rVal); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4e20ab3f3fe4..4f07cf772766 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -200,7 +200,7 @@ FltError ImportLotus::Read() SCTAB nCnt; rtl::OUString aTabName; rtl::OUString aBaseName; - rtl::OUString aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) ); + rtl::OUString aRef( "temp" ); if( nTabs != 0 ) { if( nTabs > 1 ) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 2864b0ffeb36..790e2f6251e0 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -30,7 +30,7 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN if( !(aAny >>= aProps) ) return false; - OUString sCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ); + OUString sCodeNameProp("CodeName"); sal_Int32 nPropCount = aProps.getLength(); for( sal_Int32 i=0; i<nPropCount; i++ ) { @@ -165,7 +165,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xNameAccess, ScDocument *pDoc ) { uno::Any aAny; - OUString sDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ); + OUString sDocName("*doc*"); String sCodeName; if( xNameAccess->hasByName( sDocName ) ) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 3ee937109f72..c8a1e084a80f 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -163,7 +163,7 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, { sal_Int32 nNameIndex(nCount + 1); rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex)); - rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("val")); + rtl::OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; aValidationVec.push_back(aValidation); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 89c80bf6454f..33e0203dfecd 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -123,7 +123,7 @@ void ScMyOLEFixer::FixupOLEs() { if (!aShapes.empty() && rImport.GetModel().is()) { - rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName")); + rtl::OUString sPersistName ("PersistName"); ScMyToFixupOLEs::iterator aItr(aShapes.begin()); ScMyToFixupOLEs::iterator aEndItr(aShapes.end()); ScDocument* pDoc(rImport.GetDocument()); diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 091b66fd3d5c..3a0697b61e66 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -418,7 +418,7 @@ void ScXMLContentValidationContext::EndElement() // #i36650# event-listeners element moved up one level if (xEventContext.Is()) { - rtl::OUString sOnError(RTL_CONSTASCII_USTRINGPARAM("OnError")); + rtl::OUString sOnError("OnError"); XMLEventsImportContext* pEvents = (XMLEventsImportContext*)&xEventContext; uno::Sequence<beans::PropertyValue> aValues; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1d55a64526e9..3fd048b87040 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3006,9 +3006,9 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); bool bIsChart( false ); - rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID")); - rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model")); - rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName")); + rtl::OUString sPropCLSID ("CLSID"); + rtl::OUString sPropModel ("Model"); + rtl::OUString sPersistName ("PersistName"); if (xShapeProps.is()) { sal_Int32 nZOrder = 0; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c57810805c9f..14c022daf5b0 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2528,9 +2528,9 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa if (xMultiServiceFactory.is()) { sal_Int32 nCount(aConfigProps.getLength()); - rtl::OUString sCTName(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey")); - rtl::OUString sVBName(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode")); - rtl::OUString sSCName(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration")); + rtl::OUString sCTName("TrackedChangesProtectionKey"); + rtl::OUString sVBName("VBACompatibilityMode"); + rtl::OUString sSCName("ScriptConfiguration"); for (sal_Int32 i = nCount - 1; i >= 0; --i) { if (aConfigProps[i].Name == sCTName) @@ -2613,7 +2613,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri } catch ( const util::MalformedNumberFormatException& rException ) { - rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring ")); + rtl::OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; sErrorMessage += rtl::OUString(" an Position "); sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a0904fe90c1d..486f0b2911c0 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -714,7 +714,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( { if (aOperator == sheet::ConditionOperator_FORMULA) { - rtl::OUString sCondition(RTL_CONSTASCII_USTRINGPARAM("is-true-formula(")); + rtl::OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); @@ -812,7 +812,7 @@ void ScXMLStyleExport::exportStyleAttributes( if (xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); - rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); + rtl::OUString sNumberFormat("NumberFormat"); if( xPropSetInfo->hasPropertyByName( sNumberFormat ) ) { uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 2aca9fda70d4..02d88a38f128 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -163,7 +163,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + rtl::OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) ); } @@ -374,7 +374,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if( xParentSet.is() ) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xParentSet->getPropertySetInfo() ); - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sPropName("BuildId" ); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(sPropName) ) { xInfoSet->setPropertyValue( sPropName, xParentSet->getPropertyValue(sPropName) ); @@ -395,7 +395,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) // Set base URI OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString(); - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + rtl::OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -602,7 +602,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if( xModelSet.is() ) { uno::Reference< beans::XPropertySetInfo > xModelSetInfo( xModelSet->getPropertySetInfo() ); - OUString sBuildPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sBuildPropName("BuildId" ); if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sBuildPropName) ) { xModelSet->setPropertyValue( sBuildPropName, xInfoSet->getPropertyValue(sBuildPropName) ); @@ -683,7 +683,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic if (xSet.is()) { xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); - OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); + OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(sal_True) ); @@ -699,7 +699,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + rtl::OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sName ) ); } @@ -788,7 +788,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xStorage = pMedium->GetOutputStorage(); OUString sFileName; - OUString sTextMediaType(RTL_CONSTASCII_USTRINGPARAM("text/xml")); + OUString sTextMediaType("text/xml"); if (pMedium) sFileName = pMedium->GetName(); SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); @@ -830,18 +830,18 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) sal_Bool bUsePrettyPrinting(aSaveOpt.IsPrettyPrinting()); xInfoSet->setPropertyValue("UsePrettyPrinting", uno::makeAny(bUsePrettyPrinting)); - const OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") ); + const OUString sTargetStorage("TargetStorage"); xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + rtl::OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links if( SFX_CREATE_MODE_EMBEDDED == pObjSh->GetCreateMode() ) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName")); + OUString aName("dummyObjectName"); if ( pMedium && pMedium->GetItemSet() ) { const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>( diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 1fdd9e3933db..6ac43354cb71 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -152,9 +152,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType" ); + rtl::OUString sPropTargetURL( "TargetURL" ); + rtl::OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -537,7 +537,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse try { uno::Sequence < beans::PropertyValue > aSeq; - ::rtl::OUString aDummyName(RTL_CONSTASCII_USTRINGPARAM("Dummy")); + ::rtl::OUString aDummyName("Dummy"); xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq ); if ( xWorkStore->isStreamElement( aDummyName ) ) { diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index a136deff5334..5c84e26cbb6e 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -55,7 +55,7 @@ static sal_Bool lcl_IsURLButton( SdrObject* pObject ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); + rtl::OUString sPropButtonType( "ButtonType" ); if(xInfo->hasPropertyByName( sPropButtonType )) { uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType ); diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 540f5591d712..af9a1345dd58 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -68,7 +68,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, @@ -84,17 +84,17 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow() sal_uInt16 nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { - rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" )); + rtl::OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aInsertBarResStr ); } else if (nSlotId == SID_TBXCTL_INSCELLS) { - rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" )); + rtl::OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); createAndPositionSubToolBar( aInsertCellsBarResStr ); } else { - rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" )); + rtl::OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aInsertObjectBarResStr ); } return NULL; diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3c3a53a98e9a..0d7264121f35 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -289,7 +289,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, } // Default options are set in officecfg/registry/schema/org/openoffice/Office/Calc.xcs - OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t")); + OUString sFieldSeparators(",;\t"); OUString sTextSeparators(mcTextSep); bool bMergeDelimiters = false; bool bFixedWidth = false; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 4dca12ab764e..92a38de54a96 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -461,7 +461,7 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, sal_ // extra bits are used to tell the client to prefer external // reference link. - ::rtl::OUString aExtraBits(RTL_CONSTASCII_USTRINGPARAM("calc:extref")); + ::rtl::OUString aExtraBits("calc:extref"); WriteUnicodeOrByteString( rStrm, aAppName, true ); WriteUnicodeOrByteString( rStrm, aDocName, true ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index fa4c2ece3824..5d4029de27c6 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -92,10 +92,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); - rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType" ); + rtl::OUString sPropTargetURL( "TargetURL" ); + rtl::OUString sPropTargetFrame( "TargetFrame" ); + rtl::OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -179,16 +179,16 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); + rtl::OUString sPropTargetURL( "TargetURL" ); // Darf man eine URL an dem Objekt setzen? if (xInfo->hasPropertyByName( sPropTargetURL )) { // Ja! - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType") ); - rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType"); + rtl::OUString sPropTargetFrame( "TargetFrame" ); + rtl::OUString sPropLabel( "Label" ); uno::Any aAny; if ( xInfo->hasPropertyByName( sPropLabel ) ) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index d5d973905c04..0e871117593f 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -284,7 +284,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) // Get the "Delete Rows" commandimagelist images from sfx instead of // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index b438d3b23973..09ef26331a80 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -392,7 +392,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ) ); + ::rtl::OUString sPropName( "NumberFormat" ); Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY ); Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -456,7 +456,7 @@ namespace calc OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) { - ::rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM( "The given type (" ) ); + ::rtl::OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); sMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); // TODO: localize this error message diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 6fa397e52f8c..bc33f4f28630 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -277,7 +277,7 @@ ScPrintUIOptions::ScPrintUIOptions() aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + rtl::OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index a0c9abf624ed..e5dcc7f7f882 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -423,7 +423,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { - rtl::OUString aRet( RTL_CONSTASCII_USTRINGPARAM( "Entry" ) ); + rtl::OUString aRet( "Entry" ); aRet += rtl::OUString::valueOf( nIndex ); return aRet; } diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index b4bf3ff4670b..f61239c37bf3 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->RefreshZoom(); } -const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning")); +const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); class PasteCellsWarningReseter { diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index f3d32063b472..8e8729a31ae9 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -64,7 +64,7 @@ using ::rtl::OUString; using ::std::auto_ptr; -const OUString EXTN(RTL_CONSTASCII_USTRINGPARAM(".xls")); +const OUString EXTN(".xls"); OUString convertToURL( const OUString& rPath ) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 9afb8724653e..0d39fa37eead 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -707,7 +707,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) rtl::OUString SAL_CALL ScVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Excel" ) ); + static rtl::OUString appName("Microsoft Excel" ); return appName; } diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 035383a118c4..52f152ffd008 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -29,10 +29,10 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); -const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("Max") ); -const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("Min") ); +const rtl::OUString ORIGIN("Origin"); +const rtl::OUString AUTOORIGIN("AutoOrigin"); +const rtl::OUString VBA_MIN("Max"); +const rtl::OUString VBA_MAX("Min"); ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index e792c6ea5418..a184897d9ef0 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") ); +const static rtl::OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index a050d4f93553..760095a49bae 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlAxisGroup; -const rtl::OUString CHART_NAME( RTL_CONSTASCII_USTRINGPARAM("Name") ); +const rtl::OUString CHART_NAME("Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) -const rtl::OUString DEFAULTSERIESPREFIX( RTL_CONSTASCII_USTRINGPARAM("Series") ); -const rtl::OUString DATAROWSOURCE( RTL_CONSTASCII_USTRINGPARAM("DataRowSource") ); -const rtl::OUString UPDOWN( RTL_CONSTASCII_USTRINGPARAM("UpDown") ); -const rtl::OUString VOLUME( RTL_CONSTASCII_USTRINGPARAM("Volume") ); -const rtl::OUString LINES( RTL_CONSTASCII_USTRINGPARAM("Lines") ); -const rtl::OUString SPLINETYPE( RTL_CONSTASCII_USTRINGPARAM("SplineType") ); -const rtl::OUString SYMBOLTYPE( RTL_CONSTASCII_USTRINGPARAM("SymbolType") ); -const rtl::OUString DEEP( RTL_CONSTASCII_USTRINGPARAM("Deep") ); -const rtl::OUString SOLIDTYPE( RTL_CONSTASCII_USTRINGPARAM("SolidType") ); -const rtl::OUString VERTICAL( RTL_CONSTASCII_USTRINGPARAM("Vertical") ); -const rtl::OUString PERCENT( RTL_CONSTASCII_USTRINGPARAM("Percent") ); -const rtl::OUString STACKED( RTL_CONSTASCII_USTRINGPARAM("Stacked") ); -const rtl::OUString DIM3D( RTL_CONSTASCII_USTRINGPARAM("Dim3D") ); -const rtl::OUString HASMAINTITLE( RTL_CONSTASCII_USTRINGPARAM("HasMainTitle") ); -const rtl::OUString HASLEGEND( RTL_CONSTASCII_USTRINGPARAM("HasLegend") ); +const rtl::OUString DEFAULTSERIESPREFIX("Series"); +const rtl::OUString DATAROWSOURCE("DataRowSource"); +const rtl::OUString UPDOWN("UpDown"); +const rtl::OUString VOLUME("Volume"); +const rtl::OUString LINES("Lines"); +const rtl::OUString SPLINETYPE("SplineType"); +const rtl::OUString SYMBOLTYPE("SymbolType"); +const rtl::OUString DEEP("Deep"); +const rtl::OUString SOLIDTYPE("SolidType"); +const rtl::OUString VERTICAL("Vertical"); +const rtl::OUString PERCENT("Percent"); +const rtl::OUString STACKED("Stacked"); +const rtl::OUString DIM3D("Dim3D"); +const rtl::OUString HASMAINTITLE("HasMainTitle"); +const rtl::OUString HASLEGEND("HasLegend"); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart ) { diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 07183cc036da..42cf8f1758f2 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") ); +const rtl::OUString PERSIST_NAME("PersistName"); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index f0922d52f384..8e1989f6b2de 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -31,11 +31,11 @@ using namespace ::com::sun::star; typedef std::vector< beans::PropertyValue > VecPropValues; -static rtl::OUString OPERATOR( RTL_CONSTASCII_USTRINGPARAM("Operator") ); -static rtl::OUString FORMULA1( RTL_CONSTASCII_USTRINGPARAM("Formula1") ); -static rtl::OUString FORMULA2( RTL_CONSTASCII_USTRINGPARAM("Formula2") ); -static rtl::OUString STYLENAME( RTL_CONSTASCII_USTRINGPARAM("StyleName") ); -static rtl::OUString sStyleNamePrefix( RTL_CONSTASCII_USTRINGPARAM("Excel_CondFormat") ); +static rtl::OUString OPERATOR("Operator"); +static rtl::OUString FORMULA1("Formula1"); +static rtl::OUString FORMULA2("Formula2"); +static rtl::OUString STYLENAME("StyleName"); +static rtl::OUString sStyleNamePrefix("Excel_CondFormat"); void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 7b4d65d8496b..69b80b13d840 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair; using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const rtl::OUString BACKCOLOR( RTL_CONSTASCII_USTRINGPARAM( "CellBackColor" ) ); -static const rtl::OUString PATTERN( RTL_CONSTASCII_USTRINGPARAM( "Pattern" ) ); -static const rtl::OUString PATTERNCOLOR( RTL_CONSTASCII_USTRINGPARAM( "PatternColor" ) ); +static const rtl::OUString BACKCOLOR( "CellBackColor" ); +static const rtl::OUString PATTERN( "Pattern" ); +static const rtl::OUString PATTERNCOLOR( "PatternColor" ); static PatternMap lcl_getPatternMap() { diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 086dc8e322e4..427a70410722 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString DISPLAYNAME( RTL_CONSTASCII_USTRINGPARAM("DisplayName") ); +static rtl::OUString DISPLAYNAME("DisplayName"); diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index fa49f5f47819..2706440c972c 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString SDEFAULTCELLSTYLENAME( RTL_CONSTASCII_USTRINGPARAM("Default") ); +static rtl::OUString SDEFAULTCELLSTYLENAME("Default"); static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { @@ -99,7 +99,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr uno::Reference< excel::XStyle > aRet; try { - rtl::OUString sParentCellStyleName( RTL_CONSTASCII_USTRINGPARAM("Default")); + rtl::OUString sParentCellStyleName("Default"); if ( _aBasedOn.hasValue() ) { uno::Reference< excel::XRange > oRange; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index f56f3039987a..2ac13621ae32 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -305,7 +305,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) ); + static rtl::OUString sCrud(" - OpenOffice.org Calc" ); static sal_Int32 nCrudLen = sCrud.getLength(); rtl::OUString sTitle; @@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) if ( !sTitle.equals( sName ) ) { - static rtl::OUString sDot( RTL_CONSTASCII_USTRINGPARAM(".") ); + static rtl::OUString sDot("."); // starts with title if ( sName.indexOf( sTitle ) == 0 ) // extention starts immediately after diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 70d3ab4968c4..a9357fae6194 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -306,7 +306,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi sProps.realloc( 3 ); 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" ) ); + static rtl::OUString sRestOfFormat(",34,0,1" ); rtl::OUString sFormat; sal_Int16 nFormat = 0; // default indicator diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 967a799ce55a..abd83a0526b8 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -2552,8 +2552,7 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto if( !Storage.is() ) { - ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM - ( "StringResourceWithStorageImpl::setStorage: invalid storage" )); + ::rtl::OUString errorMsg( "StringResourceWithStorageImpl::setStorage: invalid storage" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2911,8 +2910,7 @@ void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL ) sal_Int32 nLen = URL.getLength(); if( nLen == 0 ) { - ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM - ( "StringResourceWithLocationImpl::setURL: invalid URL" )); + ::rtl::OUString errorMsg( "StringResourceWithLocationImpl::setURL: invalid URL" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index bdaddea1b098..2c6ca5bce558 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -353,8 +353,8 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl // put in the REAL file name, and copy all PropertyValues - const OUString sOutputStream ( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) ); - const OUString sStream ( RTL_CONSTASCII_USTRINGPARAM ( "StreamForOutput" ) ); + const OUString sOutputStream ( "OutputStream" ); + const OUString sStream ( "StreamForOutput" ); sal_Bool bHasOutputStream = sal_False; sal_Bool bHasStream = sal_False; sal_Bool bHasBaseURL = sal_False; diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 337316229a8e..c9ebbd6a8e36 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -36,8 +36,7 @@ using namespace ::com::sun::star::container; static const OUString& GetPathToConfigurationRoot (void) { - static const OUString sPathToConfigurationRoot ( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.SunPresentationMinimizer")); + static const OUString sPathToConfigurationRoot ("org.openoffice.Office.extension.SunPresentationMinimizer"); return sPathToConfigurationRoot; } @@ -168,7 +167,7 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) rtl::OUString aPath; try { - static const OUString sProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) ); + static const OUString sProtocol( "vnd.sun.star.expand:" ); Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW ); if ( xSet->hasByName( TKGet( eToken ) ) ) xSet->getByName( TKGet( eToken ) ) >>= aPath; diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 62859f82ca9c..922527e2a88d 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -334,7 +334,7 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString& void UnoDialog::enableControl( const OUString& rControlName ) { - const OUString sEnabled( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ); + const OUString sEnabled( "Enabled" ); setControlProperty( rControlName, sEnabled, Any( sal_True ) ); } @@ -342,7 +342,7 @@ void UnoDialog::enableControl( const OUString& rControlName ) void UnoDialog::disableControl( const OUString& rControlName ) { - const OUString sEnabled( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ); + const OUString sEnabled( "Enabled" ); setControlProperty( rControlName, sEnabled, Any( sal_False ) ); } diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 503971629ab8..efe23acab074 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -338,7 +338,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( RTL_CONSTASCII_USTRINGPARAM( "<no string>" ) ); + rtl::OUString aVal( "<no string>" ); pAttribs[i].Value >>= aVal; OSL_TRACE( "doDetection: Attrib: %s = %s\n", rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 609dc3d8424d..92a2376585fb 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -69,7 +69,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( RTL_CONSTASCII_USTRINGPARAM( "<no string>" ) ); + rtl::OUString aVal( "<no string>" ); pAttribs[i].Value >>= aVal; SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name << " = " << aVal << "\n"); #endif diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 774193e57306..c31ef1409111 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -50,7 +50,7 @@ SaxAttrList::~SaxAttrList() namespace { static const rtl::OUString& getCDATAString() { - static rtl::OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ); + static rtl::OUString aStr( "CDATA" ); return aStr; } } diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 59efcf79c225..e4367dabd1f9 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -421,7 +421,7 @@ void aqua_init_systray() std::set< rtl::OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); - const rtl::OUString sURLKey( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + const rtl::OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 87a20873131c..9c126122f7c9 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -130,7 +130,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , : SfxChildWindow( pParentWnd , nId ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - const rtl::OUString aDockWindowResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" )); + const rtl::OUString aDockWindowResourceURL( "private:resource/dockingwindow/" ); SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd, WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index b63e28a53006..173d44f3bb89 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -114,13 +114,13 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl xFrame, ::com::sun::star::uno::UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); + const ::rtl::OUString aLayoutManager( "LayoutManager" ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet; ::com::sun::star::uno::Any a = xPropSet->getPropertyValue( aLayoutManager ); if ( a >>= xLMPropSet ) { - const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" )); + const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, ::com::sun::star::uno::Any( sal_False )); } } diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index e1b1dad6980b..ec10f80824b9 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -172,7 +172,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( { // Retrieve label from helper function uno::Reference< frame::XFrame > xFrame = GetBindings().GetActiveFrame(); - rtl::OUString aCommandStr( RTL_CONSTASCII_USTRINGPARAM( ".uno:StopRecording" )); + rtl::OUString aCommandStr( ".uno:StopRecording" ); aTbx.SetItemText( SID_STOP_RECORDING, GetLabelFromCommandURL( aCommandStr, xFrame )); // Determine size of toolbar diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 5b29d130ddc9..f84def52eb8d 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -332,7 +332,7 @@ namespace sfx2 bHasMacroLib = sal_False; else { - ::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); + ::rtl::OUString aStdLibName( "Standard" ); Sequence< ::rtl::OUString > aElements = xContainer->getElementNames(); if ( aElements.getLength() ) { diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index e23229e1e491..770625aa2900 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -52,12 +52,12 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R xWriterHandler->setOutputStream( xOutStream ); - ::rtl::OUString aGroupListElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group-list" ) ); - ::rtl::OUString aGroupElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group" ) ); - ::rtl::OUString aNameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:name" ) ); - ::rtl::OUString aUINameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:default-ui-name" ) ); - ::rtl::OUString aCDATAString( RTL_CONSTASCII_USTRINGPARAM ( "CDATA" ) ); - ::rtl::OUString aWhiteSpace( RTL_CONSTASCII_USTRINGPARAM ( " " ) ); + ::rtl::OUString aGroupListElement( "groupuinames:template-group-list" ); + ::rtl::OUString aGroupElement( "groupuinames:template-group" ); + ::rtl::OUString aNameAttr( "groupuinames:name" ); + ::rtl::OUString aUINameAttr( "groupuinames:default-ui-name" ); + ::rtl::OUString aCDATAString( "CDATA" ); + ::rtl::OUString aWhiteSpace( " " ); // write the namespace ::comphelper::AttributeList* pRootAttrList = new ::comphelper::AttributeList; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index bd3910ac7716..c873e46d7574 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -197,7 +197,7 @@ public: ::rtl::OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) ); + ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); try { @@ -219,7 +219,7 @@ public: { if ( m_bRestoreSettings ) { - ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) ); + ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); try { diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 87b3a88a3294..d052c39240d1 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -391,7 +391,7 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); Image aImage = GetImage( xFrame, aSlotURL, false ); pSVMenu->SetItemImage( nSlotId, aImage ); @@ -467,7 +467,7 @@ void SfxVirtualMenu::CreateFromSVMenu() } else { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); aImage = GetImage( xFrame, aSlotURL, false ); } @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) } else { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); } @@ -790,7 +790,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS )); pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false )); } diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index abb67f5c672c..dbcafa187056 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -268,7 +268,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nV aLoadArgs = aArgs.getPropertyValues(); // load the doc into that frame - ::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) ); + ::rtl::OUString sLoaderURL( "private:object" ); Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sLoaderURL, @@ -397,7 +397,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn ) if ( xLayoutManager.is() ) { - rtl::OUString aMenuBarURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )); + rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( bOn ) xLayoutManager->showElement( aMenuBarURL ); diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index c83401082cfa..c4c8ddbde4f3 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -60,8 +60,7 @@ rtl::OUString SAL_CALL getDefaultImplementationName() { css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() { rtl::OUString name( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.DesktopBackend")); + "com.sun.star.configuration.backend.DesktopBackend"); return css::uno::Sequence< rtl::OUString >(&name, 1); } diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index b4f258af9b08..bf40d7cb4571 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -61,8 +61,7 @@ rtl::OUString SAL_CALL getServiceImplementationName() { css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { rtl::OUString name( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.GconfBackend")); + "com.sun.star.configuration.backend.GconfBackend"); return css::uno::Sequence< rtl::OUString >(&name, 1); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index f6b7fb9bf8d2..d39eb5a6974e 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -61,8 +61,7 @@ rtl::OUString SAL_CALL getServiceImplementationName() { css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { rtl::OUString name( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDE4Backend")); + "com.sun.star.configuration.backend.KDE4Backend"); return css::uno::Sequence< rtl::OUString >(&name, 1); } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 82a4989e8df2..5f1825a7da50 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -61,8 +61,7 @@ rtl::OUString SAL_CALL getServiceImplementationName() { css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { rtl::OUString name( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDEBackend")); + "com.sun.star.configuration.backend.KDEBackend"); return css::uno::Sequence< rtl::OUString >(&name, 1); } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 1fc00707d356..24cd0cc614a0 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2519,7 +2519,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( sal_Int32 nNameLen = aMethName2.getLength(); sal_Int32 nCopyLen2 = (nNameLen < 6) ? nNameLen : 6; ::rtl::OUString aStartStr2 = aMethName2.copy( 0, nCopyLen2 ); - ::rtl::OUString aRemoveStr( RTL_CONSTASCII_USTRINGPARAM("remove" ) ); + ::rtl::OUString aRemoveStr("remove" ); // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! if( !( aStartStr2 == aRemoveStr ) ) continue; diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 352782ede2e8..d97278d9c684 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -219,7 +219,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL css::uno::Reference<XInterface>()); // map the java JavaLoader to this environment - OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java")); + OUString sJava("java"); uno_getEnvironment(&pJava_environment, sJava.pData, xVirtualMachine.get()); if(!pJava_environment) diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 102605c072f1..86c32c170b12 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -216,8 +216,7 @@ rtl::OUString serviceGetImplementationName() css::uno::Sequence< rtl::OUString > serviceGetSupportedServiceNames() { - rtl::OUString aServiceName( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + rtl::OUString aServiceName("com.sun.star.java.JavaVirtualMachine"); return css::uno::Sequence< rtl::OUString >(&aServiceName, 1); } @@ -424,14 +423,14 @@ void getDefaultLocaleFromConfig( country = locale->getStringValue().copy(index + 1); if(!language.isEmpty()) { - rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.language=")); + rtl::OUString prop("user.language="); prop += language; pjvm->pushProp(prop); } if(!country.isEmpty()) { - rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.country=")); + rtl::OUString prop("user.country="); prop += country; pjvm->pushProp(prop); @@ -486,7 +485,7 @@ void getJavaPropsFromSafetySettings( case 3: sVal= rtl::OUString("none"); break; } - rtl::OUString sProperty( RTL_CONSTASCII_USTRINGPARAM("appletviewer.security.mode=")); + rtl::OUString sProperty("appletviewer.security.mode="); sProperty= sProperty + sVal; pjvm->pushProp(sProperty); } @@ -495,7 +494,7 @@ void getJavaPropsFromSafetySettings( if( key_CheckSecurity.is()) { sal_Bool val= (sal_Bool) key_CheckSecurity->getLongValue(); - rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("stardiv.security.disableSecurity=")); + rtl::OUString sProperty("stardiv.security.disableSecurity="); if( val) sProperty= sProperty + rtl::OUString("false"); else @@ -1500,12 +1499,12 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) JNIEnv * pJNIEnv = aAttachGuard.getEnvironment(); // The Java Properties - rtl::OUString sFtpProxyHost(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyHost") ); - rtl::OUString sFtpProxyPort(RTL_CONSTASCII_USTRINGPARAM("ftp.proxyPort") ); - rtl::OUString sFtpNonProxyHosts (RTL_CONSTASCII_USTRINGPARAM("ftp.nonProxyHosts")); - rtl::OUString sHttpProxyHost(RTL_CONSTASCII_USTRINGPARAM("http.proxyHost") ); - rtl::OUString sHttpProxyPort(RTL_CONSTASCII_USTRINGPARAM("http.proxyPort") ); - rtl::OUString sHttpNonProxyHosts(RTL_CONSTASCII_USTRINGPARAM("http.nonProxyHosts")); + rtl::OUString sFtpProxyHost("ftp.proxyHost"); + rtl::OUString sFtpProxyPort("ftp.proxyPort"); + rtl::OUString sFtpNonProxyHosts ("ftp.nonProxyHosts"); + rtl::OUString sHttpProxyHost("http.proxyHost"); + rtl::OUString sHttpProxyPort("http.proxyPort"); + rtl::OUString sHttpNonProxyHosts("http.nonProxyHosts"); // creat Java Properties as JNI strings jstring jsFtpProxyHost= pJNIEnv->NewString( sFtpProxyHost.getStr(), sFtpProxyHost.getLength()); diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index 405df9342e56..d95eb666ffcf 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -125,7 +125,7 @@ sal_Bool test1(const Reference< XMultiServiceFactory > & xMgr ) sal_Bool retVal= sal_True; setCurrentContext( Reference<XCurrentContext>( static_cast<XWeak*>(new Context()), UNO_QUERY)); - OUString sVMService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + OUString sVMService("com.sun.star.java.JavaVirtualMachine"); Reference<XInterface> xXInt= xMgr->createInstance(sVMService); if( ! xXInt.is()) return sal_False; diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 8e2f769582da..97418fa1df42 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -50,7 +50,7 @@ using ::rtl::OString; sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) { - OUString sVMService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine")); + OUString sVMService("com.sun.star.java.JavaVirtualMachine"); Reference<XInterface> xXInt= xMgr->createInstance(sVMService); if( ! xXInt.is()) return sal_False; @@ -126,14 +126,14 @@ SAL_IMPLEMENT_MAIN() sal_Bool bSucc = sal_False; try { - OUString sImplReg(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.registry.ImplementationRegistration")); + OUString sImplReg( + "com.sun.star.registry.ImplementationRegistration"); Reference<com::sun::star::registry::XImplementationRegistration> xImplReg( xMgr->createInstance( sImplReg ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); - OUString sLibLoader( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")); + OUString sLibLoader("com.sun.star.loader.SharedLibrary"); OUString sJenLib( RTL_CONSTASCII_USTRINGPARAM( "javavm.uno" SAL_DLLEXTENSION ) ); xImplReg->registerImplementation( diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 2fd907dea9b8..23742d7f0754 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -77,7 +77,7 @@ namespace svgio { uno::Sequence< rtl::OUString > XSvgParser_getSupportedServiceNames() { - static rtl::OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.SvgTools" ) ); + static rtl::OUString aServiceName("com.sun.star.graphic.SvgTools" ); static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 ); return( aServiceNames ); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 5c5e75e9a827..b5a94597daad 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -138,7 +138,7 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::O uno::Sequence< OUString> aNames(GetNodeNames(rScheme)); ::rtl::OUString* pIter = aNames.getArray(); ::rtl::OUString* pEnd = pIter + aNames.getLength(); - ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("/")); + ::rtl::OUString sSep("/"); for(;pIter != pEnd;++pIter) { *pIter = rScheme + sSep + *pIter; @@ -251,9 +251,9 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) // fill display names TDisplayNames aDisplayNameMap; - ::rtl::OUString sEntryNames(RTL_CONSTASCII_USTRINGPARAM("EntryNames")); + ::rtl::OUString sEntryNames("EntryNames"); uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sEntryNames); - ::rtl::OUString sDisplayName(RTL_CONSTASCII_USTRINGPARAM("/DisplayName")); + ::rtl::OUString sDisplayName("/DisplayName"); ::rtl::OUString* pIter = aComponentNames.getArray(); ::rtl::OUString* pEnd = pIter + aComponentNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) @@ -302,7 +302,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } // if(!sScheme.getLength()) m_sLoadedScheme = sScheme; - ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/")); + ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); sBase += sScheme; sal_Bool bFound = ExistsScheme(sScheme); @@ -317,10 +317,10 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) if ( sScheme != "default" ) { - ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default")); + ::rtl::OUString sDefault("default"); if ( ExistsScheme(sDefault) ) { - ::rtl::OUString sBaseDefault(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/default")); + ::rtl::OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default"); aComponentNames = GetPropertyNames(sBaseDefault); FillComponentColors(aComponentNames,aDisplayNameMap); } @@ -334,7 +334,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) // ----------------------------------------------------------------------------- void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames) { - const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("/Entries")); + const ::rtl::OUString sColorEntries("/Entries"); ::rtl::OUString* pIter = _rComponents.getArray(); ::rtl::OUString* pEnd = pIter + _rComponents.getLength(); for(;pIter != pEnd;++pIter) @@ -348,8 +348,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sEntry); uno::Sequence < ::rtl::OUString > aDefaultColorNames = aColorNames; - const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color")); - const ::rtl::OUString sDefaultColor(RTL_CONSTASCII_USTRINGPARAM("/DefaultColor")); + const ::rtl::OUString sColor("/Color"); + const ::rtl::OUString sDefaultColor("/DefaultColor"); lcl_addString(aColorNames,sColor); lcl_addString(aDefaultColorNames,sDefaultColor); uno::Sequence< uno::Any > aColors = GetProperties( aColorNames ); @@ -416,10 +416,10 @@ void ExtendedColorConfig_Impl::Commit() { if ( m_sLoadedScheme.isEmpty() ) return; - const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("Entries")); - const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color")); - ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/")); - const ::rtl::OUString s_sSep(RTL_CONSTASCII_USTRINGPARAM("/")); + const ::rtl::OUString sColorEntries("Entries"); + const ::rtl::OUString sColor("/Color"); + ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); + const ::rtl::OUString s_sSep("/"); sBase += m_sLoadedScheme; TComponents::iterator aIter = m_aConfigValues.begin(); @@ -450,7 +450,7 @@ void ExtendedColorConfig_Impl::Commit() pPropValues->Value <<= aConIter->second.getColor(); // the default color will never be changed } - ::rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes")); + ::rtl::OUString s("ExtendedColorScheme/ColorSchemes"); SetSetProperties(s, aPropValues); } } @@ -470,7 +470,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName() // ----------------------------------------------------------------------------- sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName) { - ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes")); + ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes"); uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase); sBase += ::rtl::OUString("/") + _sSchemeName; diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 4c8ea3f38ed7..f5a9d053eaa7 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -263,10 +263,10 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) { // the ignore counters for the help agent URLs - const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" )); - const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" )); - const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" )); - const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" )); + const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const ::rtl::OUString sPathSeparator( "/" ); + const ::rtl::OUString sURLLocalPath( "/Name" ); + const ::rtl::OUString sCounterLocalPath( "/Counter" ); // get the names of all the nodes containing ignore counters // collect the node names we have to ask @@ -323,10 +323,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" )); - const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" )); - const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" )); - const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" )); + const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const ::rtl::OUString sPathSeparator( "/" ); + const ::rtl::OUString sURLLocalPath( "/Name" ); + const ::rtl::OUString sCounterLocalPath( "/Counter" ); // get the current URL/counter pairs (as they're persistent at the moment) Sequence< ::rtl::OUString > aNodeNames; @@ -410,7 +410,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters() ::rtl::OUString sNewNodeName; Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2); Sequence< Any > aNewCounterDataValues(2); - const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" )); + const ::rtl::OUString sNodeNameBase( "URL" ); for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); aCollectNew != aURLIgnoreCounters.end(); ++aCollectNew diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 25b1269270fa..8213006459ea 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -986,7 +986,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, try { - OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( "Title" )); + OUString aPropName( "Title" ); bool canRename = true; ::ucbhelper::Content aContent( aURL, mxCmdEnv, comphelper::getProcessComponentContext() ); @@ -2115,8 +2115,8 @@ void SvtFileView_Impl::implEnumerationSuccess() // ----------------------------------------------------------------------- void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue ) { - OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" )); - OUString aTabString( RTL_CONSTASCII_USTRINGPARAM( "%09" )); + OUString aTab( "\t" ); + OUString aTabString( "%09" ); sal_Int32 iPos; while ( ( iPos = aValue.indexOf( aTab ) ) >= 0 ) @@ -2129,8 +2129,8 @@ void SvtFileView_Impl::CreateDisplayText_Impl() ::osl::MutexGuard aGuard( maMutex ); OUString aValue; - OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" )); - OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " )); + OUString aTab( "\t" ); + OUString aDateSep( ", " ); std::vector< SortingData_Impl* >::iterator aIt; @@ -2180,7 +2180,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) { ::osl::MutexGuard aGuard( maMutex ); - OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" )); + OUString aTab( "\t" ); sal_uInt32 nCount = (sal_uInt32) rList.getLength(); @@ -2466,8 +2466,8 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False ); OUString aValue; - OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" )); - OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " )); + OUString aTab( "\t" ); + OUString aDateSep( ", " ); // title, type, size, date aValue = pData->GetTitle(); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 10c7c5056b34..7628d36e7871 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -193,7 +193,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbAllSel = sal_False; mbDropPos = sal_False; - ::rtl::OUString aGregorian( RTL_CONSTASCII_USTRINGPARAM( "gregorian")); + ::rtl::OUString aGregorian( "gregorian"); maCalendarWrapper.loadCalendar( aGregorian, Application::GetAppLocaleDataWrapper().getLanguageTag().getLocale()); if (maCalendarWrapper.getUniqueID() != aGregorian) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 639ddfe8dca9..74984e68b55e 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -346,7 +346,7 @@ void AssignmentPersistentData::Commit() ::rtl::OUString sAssignment; if (hasFieldAssignment(_rLogicalName)) { - ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/")); + ::rtl::OUString sFieldPath("Fields/"); sFieldPath += _rLogicalName; sFieldPath += ::rtl::OUString("/AssignedFieldName"); sAssignment = getStringProperty(sFieldPath); @@ -417,7 +417,7 @@ void AssignmentPersistentData::Commit() } // Fields - ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields")); + ::rtl::OUString sDescriptionNodePath("Fields"); // Fields/<field> ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath); @@ -449,7 +449,7 @@ void AssignmentPersistentData::Commit() // nothing to do return; - ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields")); + ::rtl::OUString sDescriptionNodePath("Fields"); Sequence< ::rtl::OUString > aNames(&_rLogicalName, 1); ClearNodeElements(sDescriptionNodePath, aNames); } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 92c64ff6f177..38e738e1a102 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -76,7 +76,7 @@ short SvColorDialog::Execute() short ret = 0; try { - const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ); + const OUString sColor( "Color" ); Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< com::sun::star::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 29078cc949dd..b268cc4b2a3e 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -105,7 +105,7 @@ void SvObjectServerList::FillInsertObjects() uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory = configuration::theDefaultProvider::get(xContext); - ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )); + ::rtl::OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; aPathProp.Name = ::rtl::OUString( "nodepath" ); @@ -121,10 +121,10 @@ void SvObjectServerList::FillInsertObjects() uno::Sequence< ::rtl::OUString > seqNames= xNameAccess->getElementNames(); sal_Int32 nInd; - ::rtl::OUString aStringProductName( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" ) ); + ::rtl::OUString aStringProductName( "%PRODUCTNAME" ); sal_Int32 nStringProductNameLength = aStringProductName.getLength(); - ::rtl::OUString aStringProductVersion( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" ) ); + ::rtl::OUString aStringProductVersion( "%PRODUCTVERSION" ); sal_Int32 nStringProductVersionLength = aStringProductVersion.getLength(); for( nInd = 0; nInd < seqNames.getLength(); nInd++ ) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b8942d56ba12..b3b81b4bbb49 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -370,7 +370,7 @@ awt::Size ExportDialog::GetOriginalSize() aTransformation.m11 = aViewTransformation.get(1,1); aTransformation.m12 = aViewTransformation.get(1,2); - const OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) ); + const OUString sViewTransformation( "ViewTransformation" ); uno::Sequence< beans::PropertyValue > aViewInformation( 1 ); aViewInformation[ 0 ].Value <<= aTransformation; aViewInformation[ 0 ].Name = sViewTransformation; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 52f8b52baaaa..cba578609be9 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1148,7 +1148,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString & void GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< rtl::OUString >& rvEmbedImgUrls ) { - static rtl::OUString sImageURL(RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ) ); + static rtl::OUString sImageURL( "ImageURL" ); Reference< XPropertySet > xProps( xIf, UNO_QUERY ); if ( xProps.is() ) { diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index da76739afc95..4057f6a5180d 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -252,7 +252,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNa // -------------------------------------------------------- uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames() { - const rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.DocumentCloser" ) ); + const rtl::OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); } diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index 217272d24477..bdba8a91b9da 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) { bool bRes = false; - const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + const static rtl::OUString sNamedRanges("NamedRanges"); uno::Reference< sheet::XCellRangeReferrer > xReferrer; try { diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 4caf4fb0f663..9dfb5208eeaf 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -105,7 +105,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D if ( xPers.is() ) { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage(); - ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "Dummy" )); + ::rtl::OUString aName( "Dummy" ); SvStream* pStream = NULL; sal_Bool bDeleteStream = sal_False; uno::Sequence < beans::PropertyValue > aEmpty; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 8b8990903f05..38a273d8e46a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -222,14 +222,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons if( xMimeType.is() ) { - const ::rtl::OUString aClassNameString(RTL_CONSTASCII_USTRINGPARAM( "classname" )); - const ::rtl::OUString aTypeNameString(RTL_CONSTASCII_USTRINGPARAM( "typename" )); - const ::rtl::OUString aDisplayNameString(RTL_CONSTASCII_USTRINGPARAM( "displayname" )); - const ::rtl::OUString aViewAspectString(RTL_CONSTASCII_USTRINGPARAM( "viewaspect" )); - const ::rtl::OUString aWidthString(RTL_CONSTASCII_USTRINGPARAM( "width" )); - const ::rtl::OUString aHeightString(RTL_CONSTASCII_USTRINGPARAM( "height" )); - const ::rtl::OUString aPosXString(RTL_CONSTASCII_USTRINGPARAM( "posx" )); - const ::rtl::OUString aPosYString(RTL_CONSTASCII_USTRINGPARAM( "posy" )); + const ::rtl::OUString aClassNameString( "classname" ); + const ::rtl::OUString aTypeNameString( "typename" ); + const ::rtl::OUString aDisplayNameString( "displayname" ); + const ::rtl::OUString aViewAspectString( "viewaspect" ); + const ::rtl::OUString aWidthString( "width" ); + const ::rtl::OUString aHeightString( "height" ); + const ::rtl::OUString aPosXString( "posx" ); + const ::rtl::OUString aPosYString( "posy" ); if( xMimeType->hasParameter( aClassNameString ) ) { @@ -1345,7 +1345,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XMimeContentTypeFactory > xMimeFact = MimeContentTypeFactory::create( xContext ); DataFlavorEx aFlavorEx; - const ::rtl::OUString aCharsetStr(RTL_CONSTASCII_USTRINGPARAM( "charset" )); + const ::rtl::OUString aCharsetStr( "charset" ); for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ ) @@ -2279,7 +2279,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) { // special handling for text/plain media types - const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" )); + const ::rtl::OUString aCharsetString( "charset" ); if( !xRequestType2->hasParameter( aCharsetString ) || xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) || @@ -2291,7 +2291,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: 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" )); + const ::rtl::OUString aFormatString( "windows_formatname" ); if( xRequestType1->hasParameter( aFormatString ) && xRequestType2->hasParameter( aFormatString ) && diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index e268ddf5ada2..4b1ba9410842 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -157,7 +157,7 @@ bool StateEventHelper::isCommandEnabled() SolarMutexGuard aSolarGuard; if ( m_xDispatchProvider.is() && m_xURLTransformer.is() ) { - ::rtl::OUString aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" )); + ::rtl::OUString aSelf( "_self" ); aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 0469e928c3c3..140f37aa4060 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -317,7 +317,7 @@ throw( ::com::sun::star::uno::RuntimeException ) // Just use the main part of the URL for popup menu controllers sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); - rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" )); + rtl::OUString aMainURL( "vnd.sun.star.popup:" ); nSchemePart = aURL.indexOf( ':' ); if (( nSchemePart > 0 ) && diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 8fa36eb35faf..a3272144fa68 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -741,7 +741,7 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& Service Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) throw(RuntimeException) { - const ::rtl::OUString aSN( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.image.ImageMap" ) ); + const ::rtl::OUString aSN( "com.sun.star.image.ImageMap" ); return Sequence< ::rtl::OUString >( &aSN, 1 ); } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 9ea4b1698494..8b5ed3551153 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1699,7 +1699,7 @@ void FmGridControl::InitColumnByField( } // the control type is determined by the ColumnServiceName - static ::rtl::OUString s_sPropColumnServiceName( RTL_CONSTASCII_USTRINGPARAM( "ColumnServiceName" ) ); + static ::rtl::OUString s_sPropColumnServiceName( "ColumnServiceName" ); if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) ) return; diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 585ee17160e2..6c054e0a68f2 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -71,8 +71,8 @@ namespace //------------------------------------------------------------------------------ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) { - const ::rtl::OUString aModelPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")); - const ::rtl::OUString aCompatibleModelPrefix(RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.")); + const ::rtl::OUString aModelPrefix("com.sun.star.form.component."); + const ::rtl::OUString aCompatibleModelPrefix("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FM_COMPONENT_EDIT) diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 847e96f2a7b1..87f653a7386a 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -515,8 +515,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "DirectHelp" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ); + const ::rtl::OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -592,7 +592,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) if ( !m_xBrowserController.is() ) { - ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspector" ) ); + ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True ); } else diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 9e6c13d23165..fad3aa96fe14 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -133,7 +133,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - static const ::rtl::OUString sRefDevicePropName( RTL_CONSTASCII_USTRINGPARAM( "ReferenceDevice" ) ); + static const ::rtl::OUString sRefDevicePropName( "ReferenceDevice" ); if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) ) { VCLXDevice* pUnoRefDevice = new VCLXDevice; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 5d63c6ade879..e144bdbec5f3 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -328,7 +328,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate { m_bAttemptedFormCreation = true; - const ::rtl::OUString sFormsCollectionServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms") ); + const ::rtl::OUString sFormsCollectionServiceName("com.sun.star.form.Forms"); m_xForms = Reference< XNameContainer > ( ::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ), UNO_QUERY diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 2169173729b1..378e7bd664a8 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -226,7 +226,7 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const ::rtl::OUString vbaInterOp( RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ); + static const ::rtl::OUString vbaInterOp("VBAInterop"); if ( _rEvent.ScriptType.equals(vbaInterOp) ) return; // not handled here diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 82e2343d8424..e24623d04e8e 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -691,7 +691,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: we should cache all those things, else this might be too expensive. // However, this requires we're notified of changes in the value binding - static const ::rtl::OUString s_sExternalData( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ); + static const ::rtl::OUString s_sExternalData( "ExternalData" ); if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) ) { sal_Bool bExternalData = sal_True; diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index ac4be38cbc38..10b238eb8669 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -445,7 +445,7 @@ namespace svxform case FormComponentType::CHECKBOX: case FormComponentType::FIXEDTEXT: { - ::rtl::OUString sVertAlignPropertyName( RTL_CONSTASCII_USTRINGPARAM( "VerticalAlign" ) ); + ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) _rxControlModel->setPropertyValue( sVertAlignPropertyName, makeAny( VerticalAlignment_MIDDLE ) ); } @@ -454,7 +454,7 @@ namespace svxform case FormComponentType::IMAGEBUTTON: case FormComponentType::IMAGECONTROL: { - const ::rtl::OUString sScaleModeProperty( RTL_CONSTASCII_USTRINGPARAM( "ScaleMode" ) ); + const ::rtl::OUString sScaleModeProperty( "ScaleMode" ); if ( xPSI->hasPropertyByName( sScaleModeProperty ) ) _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) ); } diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 4f0c7c1b5303..3c08fa690100 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -91,7 +91,7 @@ namespace svxform else if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) pToolBarName = "formdesign"; - ::rtl::OUString aToolBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" )); + ::rtl::OUString aToolBarResStr( "private:resource/toolbar/" ); aToolBarResStr += ::rtl::OUString::createFromAscii( pToolBarName ); return aToolBarResStr; } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index a61c849981b9..7a6dcd4fd59c 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -191,7 +191,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { // set a new image, matching to this slot - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 22f2552269b3..10b95b3f0874 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1405,7 +1405,7 @@ namespace sdr { namespace contact { try { Reference< XPropertySet > xModelProperties( pUnoObject->GetUnoControlModel(), UNO_QUERY_THROW ); - static const ::rtl::OUString s_sPrintablePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Printable" ) ); + static const ::rtl::OUString s_sPrintablePropertyName( "Printable" ); OSL_VERIFY( xModelProperties->getPropertyValue( s_sPrintablePropertyName ) >>= bIsPrintable ); } catch( const Exception& ) diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 7c30defe8801..39bd6cf9b0a9 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -98,7 +98,7 @@ namespace drawinglayer rtl::OUString PrimitiveFactory2D::getImplementationName_Static() { - static rtl::OUString aRetval(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.graphic.PrimitiveFactory2D")); + static rtl::OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D"); return aRetval; } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 078108167e69..1bba0f7e9a57 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -174,7 +174,7 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" ) { rtl::OUString sShapeType; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny && ( *pAny >>= sShapeType ) ) @@ -475,7 +475,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const sal_Bool SdrObjCustomShape::IsTextPath() const { - const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); + const rtl::OUString sTextPath( "TextPath" ); sal_Bool bTextPathOn = sal_False; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath ); @@ -488,7 +488,7 @@ sal_Bool SdrObjCustomShape::UseNoFillStyle() const { sal_Bool bRet = sal_False; rtl::OUString sShapeType; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) @@ -502,7 +502,7 @@ sal_Bool SdrObjCustomShape::IsMirroredX() const { sal_Bool bMirroredX = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + const rtl::OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) *pAny >>= bMirroredX; @@ -512,7 +512,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const { sal_Bool bMirroredY = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + const rtl::OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) *pAny >>= bMirroredY; @@ -521,7 +521,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + const rtl::OUString sMirroredX( "MirroredX" ); PropertyValue aPropVal; aPropVal.Name = sMirroredX; aPropVal.Value <<= bMirrorX; @@ -531,7 +531,7 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + const rtl::OUString sMirroredY( "MirroredY" ); PropertyValue aPropVal; aPropVal.Name = sMirroredY; aPropVal.Value <<= bMirrorY; @@ -559,8 +559,8 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { const com::sun::star::uno::Any* pAny; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); - const rtl::OUString sTextPreRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextPreRotateAngle" ) ); + const rtl::OUString sTextRotateAngle( "TextRotateAngle" ); + const rtl::OUString sTextPreRotateAngle( "TextPreRotateAngle" ); pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? sTextPreRotateAngle : sTextRotateAngle ); double fExtraTextRotateAngle = 0.0; if ( pAny ) @@ -742,7 +742,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s // POSITION { - const rtl::OUString sPosition( RTL_CONSTASCII_USTRINGPARAM ( "Position" ) ); + const rtl::OUString sPosition( "Position" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false ); @@ -751,28 +751,28 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + const rtl::OUString sMirroredX( "MirroredX" ); sal_Bool bMirroredX = sal_True; rPropValues[ n ].Name = sMirroredX; rPropValues[ n++ ].Value <<= bMirroredX; } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + const rtl::OUString sMirroredY( "MirroredY" ); sal_Bool bMirroredY = sal_True; rPropValues[ n ].Name = sMirroredY; rPropValues[ n++ ].Value <<= bMirroredY; } if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) { - const rtl::OUString sSwitched( RTL_CONSTASCII_USTRINGPARAM ( "Switched" ) ); + const rtl::OUString sSwitched( "Switched" ); sal_Bool bSwitched = sal_True; rPropValues[ n ].Name = sSwitched; rPropValues[ n++ ].Value <<= bSwitched; } if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) { - const rtl::OUString sPolar( RTL_CONSTASCII_USTRINGPARAM ( "Polar" ) ); + const rtl::OUString sPolar( "Polar" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, true ); @@ -784,7 +784,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMinimum" ) ); + const rtl::OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -793,7 +793,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RadiusRangeMaximum" ) ); + const rtl::OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -806,7 +806,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMinimum" ) ); + const rtl::OUString sRangeXMinimum( "RangeXMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -815,7 +815,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeXMaximum" ) ); + const rtl::OUString sRangeXMaximum( "RangeXMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -824,7 +824,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMinimum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMinimum" ) ); + const rtl::OUString sRangeYMinimum( "RangeYMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, true ); @@ -833,7 +833,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMaximum( RTL_CONSTASCII_USTRINGPARAM ( "RangeYMaximum" ) ); + const rtl::OUString sRangeYMaximum( "RangeYMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, false ); @@ -868,7 +868,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) { PropertyValue aPropVal; rtl::OUString sShapeType; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); if ( pType && !pType->isEmpty() ) { @@ -900,7 +900,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) ////////////////////// // AdjustmentValues // ////////////////////// - const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) ); + const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; @@ -936,7 +936,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) /////////////// // Coordsize // /////////////// - const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) ); + const rtl::OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( !pViewBox || !(*pViewBox >>= aViewBox ) ) @@ -953,12 +953,12 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM ( "Path" ) ); + const rtl::OUString sPath( "Path" ); ////////////////////// // Path/Coordinates // ////////////////////// - const rtl::OUString sCoordinates( RTL_CONSTASCII_USTRINGPARAM ( "Coordinates" ) ); + const rtl::OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -977,7 +977,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/GluePoints // - const rtl::OUString sGluePoints( RTL_CONSTASCII_USTRINGPARAM ( "GluePoints" ) ); + const rtl::OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -995,7 +995,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/Segments // - const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); + const rtl::OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) { @@ -1015,7 +1015,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchX // - const rtl::OUString sStretchX( RTL_CONSTASCII_USTRINGPARAM ( "StretchX" ) ); + const rtl::OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) { @@ -1029,7 +1029,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchY // - const rtl::OUString sStretchY( RTL_CONSTASCII_USTRINGPARAM ( "StretchY" ) ); + const rtl::OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) { @@ -1043,7 +1043,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/TextFrames // - const rtl::OUString sTextFrames( RTL_CONSTASCII_USTRINGPARAM ( "TextFrames" ) ); + const rtl::OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { @@ -1112,7 +1112,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) PropertyValue aPropVal; rtl::OUString sShapeType; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any *pAny = aGeometryItem.GetPropertyValueByName( sType ); @@ -1122,12 +1122,12 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType ); const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); - const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM ( "Path" ) ); + const rtl::OUString sPath( "Path" ); switch( eDefaultType ) { case DEFAULT_VIEWBOX : { - const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) ); + const rtl::OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && ( *pViewBox >>= aViewBox ) ) @@ -1141,7 +1141,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_PATH : { - const rtl::OUString sCoordinates( RTL_CONSTASCII_USTRINGPARAM ( "Coordinates" ) ); + const rtl::OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -1166,7 +1166,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_GLUEPOINTS : { - const rtl::OUString sGluePoints( RTL_CONSTASCII_USTRINGPARAM ( "GluePoints" ) ); + const rtl::OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -1192,7 +1192,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { // Path/Segments // - const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) ); + const rtl::OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) { @@ -1236,7 +1236,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHX : { - const rtl::OUString sStretchX( RTL_CONSTASCII_USTRINGPARAM ( "StretchX" ) ); + const rtl::OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny && pDefCustomShape ) { @@ -1254,7 +1254,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHY : { - const rtl::OUString sStretchY( RTL_CONSTASCII_USTRINGPARAM ( "StretchY" ) ); + const rtl::OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny && pDefCustomShape ) { @@ -1667,7 +1667,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredX" // if ( bHorz ) { - const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) ); + const rtl::OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) { @@ -1687,7 +1687,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredY" // if ( bVert ) { - const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) ); + const rtl::OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) { @@ -2953,7 +2953,7 @@ void SdrObjCustomShape::SaveGeoData(SdrObjGeoData& rGeo) const rAGeo.bMirroredX = IsMirroredX(); rAGeo.bMirroredY = IsMirroredY(); - const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) ); + const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); Any* pAny( ( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ).GetPropertyValueByName( sAdjustmentValues ) ); if ( pAny ) *pAny >>= rAGeo.aAdjustmentSeq; @@ -2968,7 +2968,7 @@ void SdrObjCustomShape::RestGeoData(const SdrObjGeoData& rGeo) SetMirroredY( rAGeo.bMirroredY ); SdrCustomShapeGeometryItem rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) ); + const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); PropertyValue aPropVal; aPropVal.Name = sAdjustmentValues; aPropVal.Value <<= rAGeo.aAdjustmentSeq; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 3f79ca9bd030..a18f3a9ced5f 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -490,7 +490,7 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AccessibleCell")); + static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleCell"); aServiceNames[nCount] = sAdditionalServiceName; return aServiceNames; diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 7d2e5a163f52..42cd6764e59d 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -297,7 +297,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< if( nNewCols > 0 ) { - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") ); + const OUString sWidth("Width"); Reference< XTableColumns > xCols( mxTable->getColumns(), UNO_QUERY_THROW ); Reference< XPropertySet > xRefColumn( xCols->getByIndex( nCol ), UNO_QUERY_THROW ); sal_Int32 nWidth = 0; @@ -413,7 +413,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In if( nNewRows > 0 ) { - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM("Height") ); + const OUString sHeight("Height"); Reference< XTableRows > xRows( mxTable->getRows(), UNO_QUERY_THROW ); Reference< XPropertySet > xRefRow( xRows->getByIndex( nRow ), UNO_QUERY_THROW ); sal_Int32 nHeight = 0; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 97396a7f3c7e..d6f68a7f5dd9 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -330,7 +330,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) Reference< XStyleFamiliesSupplier > xSFS( pNewModel->getUnoModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW ); - const rtl::OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); + const rtl::OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW ); if( xTableFamilyAccess->hasByName( sStyleName ) ) @@ -468,7 +468,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset { if( (nEdge >= 0) && mxTable.is()) try { - const OUString sSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + const OUString sSize( "Size" ); if( mbHorizontal ) { if( (nEdge >= 0) && (nEdge <= getRowCount()) ) @@ -2505,7 +2505,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd // copy row heights Reference< XTableRows > xNewRows( xNewTable->getRows(), UNO_QUERY_THROW ); - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ); + const OUString sHeight( "Height" ); for( sal_Int32 nRow = 0; nRow < nRows; ++nRow ) { Reference< XPropertySet > xNewSet( xNewRows->getByIndex( nRow ), UNO_QUERY_THROW ); @@ -2514,7 +2514,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd // copy column widths Reference< XTableColumns > xNewColumns( xNewTable->getColumns(), UNO_QUERY_THROW ); - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ); + const OUString sWidth( "Width" ); for( sal_Int32 nCol = 0; nCol < nColumns; ++nCol ) { Reference< XPropertySet > xNewSet( xNewColumns->getByIndex( nCol ), UNO_QUERY_THROW ); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index ff6037ca77e6..1a888ba39423 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -531,7 +531,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) RemoveSelection(); - const OUString sSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + const OUString sSize( "Size" ); const bool bUndo = mpModel && mpModel->IsUndoEnabled(); @@ -848,7 +848,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) { Reference< XStyleFamiliesSupplier > xSFS( pModel->getUnoModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW ); - const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); + const OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW ); if( xTableFamilyAccess->hasByName( pArg->GetValue() ) ) diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index e97b9b661ce3..4702792127a2 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -230,7 +230,7 @@ sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw(RuntimeException) { - OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style") ); + OUString aServiceName("com.sun.star.style.Style"); Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -508,7 +508,7 @@ sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceNam Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() throw(RuntimeException) { - OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.StyleFamily") ); + OUString aServiceName("com.sun.star.style.StyleFamily"); Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 12e108f5cbd1..c00329c0d1d1 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -526,7 +526,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) MergeVector aMergedCells( nColCount ); Int32Vector aOptimalColumns; - const OUString sOptimalSize( RTL_CONSTASCII_USTRINGPARAM("OptimalSize") ); + const OUString sOptimalSize("OptimalSize"); if( sal::static_int_cast< sal_Int32 >( maColumns.size() ) != nColCount ) maColumns.resize( nColCount ); @@ -681,7 +681,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) MergeVector aMergedCells( nRowCount ); Int32Vector aOptimalRows; - const OUString sOptimalSize( RTL_CONSTASCII_USTRINGPARAM("OptimalSize") ); + const OUString sOptimalSize("OptimalSize"); // first calculate current height and initial minimum size per column, // merged cells will be counted later diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index e0c9635f6676..7e0b566dc9ca 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -1043,7 +1043,7 @@ void TableModel::optimize() { if( nCol > 0 ) try { - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") ); + const OUString sWidth("Width"); sal_Int32 nWidth1 = 0, nWidth2 = 0; Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maColumns[nCol].get() ), UNO_QUERY_THROW ); Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maColumns[nCol-1].get() ), UNO_QUERY_THROW ); @@ -1081,7 +1081,7 @@ void TableModel::optimize() { if( nRow > 0 ) try { - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM("Height") ); + const OUString sHeight("Height"); sal_Int32 nHeight1 = 0, nHeight2 = 0; Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maRows[nRow].get() ), UNO_QUERY_THROW ); Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maRows[nRow-1].get() ), UNO_QUERY_THROW ); diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 0d0392eeeb6f..ad82f00837cd 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -241,7 +241,7 @@ void SdrTableRTFParser::FillTable() nColCount = mxTable->getColumnCount(); } - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") ); + const OUString sWidth("Width"); sal_Int32 nCol, nLastEdge = 0; for( nCol = 0; nCol < nColCount; nCol++ ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index a0e64bc3c266..04b636094c54 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -465,7 +465,7 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) if ( IsInPopupMode() ) EndPopupMode(); - const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthDialog" )); + const rtl::OUString aCommand( ".uno:ExtrusionDepthDialog" ); Any a; Sequence< PropertyValue > aArgs( 2 ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 3f94d0ddcf0e..bd57fbfafafb 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -263,7 +263,7 @@ SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/fontworkshapetype" ) ); + rtl::OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 955d2847e71f..44890942f5d6 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -454,8 +454,7 @@ SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( - RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/graffilterbar" ) ); + rtl::OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 4e4cf1fc925b..d3baa05ad0d1 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -152,7 +152,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) ); + const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -702,7 +702,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) ); + const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -828,7 +828,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css if (!xLayoutManager.is()) return; - const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) ); + const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index ad440da0b047..4fed654bd1b2 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -133,13 +133,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); - static const rtl::OUString sRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "RotateAngle" ) ); - static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) ); - static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) ); - static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) ); - static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sProjectionMode( "ProjectionMode" ); + static const rtl::OUString sRotateAngle( "RotateAngle" ); + static const rtl::OUString sViewPoint( "ViewPoint" ); + static const rtl::OUString sOrigin( "Origin" ); + static const rtl::OUString sSkew( "Skew" ); + static const rtl::OUString sDepth( "Depth" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -316,7 +316,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); + static const rtl::OUString sExtrusionColor( "Color" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) { @@ -343,10 +343,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_SURFACE: { - static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) ); - static const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) ); - static const rtl::OUString sDiffusion( RTL_CONSTASCII_USTRINGPARAM ( "Diffusion" ) ); - static const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) ); + static const rtl::OUString sShadeMode( "ShadeMode" ); + static const rtl::OUString sSpecularity( "Specularity" ); + static const rtl::OUString sDiffusion( "Diffusion" ); + static const rtl::OUString sMetal( "Metal" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET) { @@ -395,12 +395,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_LIGHTING_INTENSITY: { - static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) ); - static const rtl::OUString sLightFace( RTL_CONSTASCII_USTRINGPARAM ( "LightFace" ) ); - static const rtl::OUString sFirstLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightHarsh" ) ); - static const rtl::OUString sSecondLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightHarsh" ) ); - static const rtl::OUString sFirstLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightLevel" ) ); - static const rtl::OUString sSecondLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightLevel" ) ); + static const rtl::OUString sBrightness( "Brightness" ); + static const rtl::OUString sLightFace( "LightFace" ); + static const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" ); + static const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" ); + static const rtl::OUString sFirstLightLevel( "FirstLightLevel" ); + static const rtl::OUString sSecondLightLevel( "SecondLightLevel" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) { @@ -468,8 +468,8 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem if((nDirection >= 0) && (nDirection < 9)) { - const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) ); - const rtl::OUString sSecondLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightDirection" ) ); + const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); + const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -642,11 +642,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) ); - static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) ); - static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) ); - static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sViewPoint( "ViewPoint" ); + static const rtl::OUString sOrigin( "Origin" ); + static const rtl::OUString sSkew( "Skew" ); + static const rtl::OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -793,8 +793,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -849,10 +849,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) ); - static const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) ); - static const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sShadeMode( "ShadeMode" ); + static const rtl::OUString sSpecularity( "Specularity" ); + static const rtl::OUString sMetal( "Metal" ); com::sun::star::uno::Any* pAny; @@ -937,8 +937,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sDepth( "Depth" ); com::sun::star::uno::Any* pAny; @@ -1017,9 +1017,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) ); - static const rtl::OUString sSecondLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightDirection" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); + static const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -1098,8 +1098,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sBrightness( "Brightness" ); com::sun::star::uno::Any* pAny; @@ -1166,8 +1166,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); + static const rtl::OUString sExtrusionColor( "Color" ); com::sun::star::uno::Any* pAny; @@ -1236,7 +1236,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) namespace svx { bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) { - static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); + static const rtl::OUString sExtrusion( "Extrusion" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index ddb89d86d444..a324bb9ef184 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -142,7 +142,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA( SdrObjCustomShape ) ) { - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = aGeometryItem.GetPropertyValueByName( sType ); if( pAny ) @@ -240,7 +240,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; - static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); + static const rtl::OUString sTextPath( "TextPath" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; @@ -265,8 +265,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); - static const rtl::OUString sSameLetterHeights( RTL_CONSTASCII_USTRINGPARAM ( "SameLetterHeights" ) ); + static const rtl::OUString sTextPath( "TextPath" ); + static const rtl::OUString sSameLetterHeights( "SameLetterHeights" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -341,19 +341,19 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape ) { - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sType; aPropVal.Value <<= rCustomShape; rGeometryItem.SetPropertyValue( aPropVal ); - const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) ); - const rtl::OUString sCoordinateOrigin( RTL_CONSTASCII_USTRINGPARAM ( "CoordinateOrigin" ) ); - const rtl::OUString sCoordinateSize( RTL_CONSTASCII_USTRINGPARAM ( "CoordinateSize" ) ); - const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM ( "Equations" ) ); - const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM ( "Handles" ) ); - const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM ( "Path" ) ); + const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const rtl::OUString sCoordinateOrigin( "CoordinateOrigin" ); + const rtl::OUString sCoordinateSize( "CoordinateSize" ); + const rtl::OUString sEquations( "Equations" ); + const rtl::OUString sHandles( "Handles" ); + const rtl::OUString sPath( "Path" ); rGeometryItem.ClearPropertyValue( sAdjustmentValues ); rGeometryItem.ClearPropertyValue( sCoordinateOrigin ); rGeometryItem.ClearPropertyValue( sCoordinateSize ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ce9903c53187..ac2ca4325f34 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -503,8 +503,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { try { - rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") ); - rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") ); + rtl::OUString aNameTo_Simplified("ChineseT2S"); + rtl::OUString aNameTo_Traditional("ChineseS2T"); lang::Locale aLocale; aLocale.Language = rtl::OUString("zh"); diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 21cf4d5b43fb..c7ad4f6bc0f5 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -587,7 +587,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto // putting the StatusIndicator that we got from the MediaDescriptor into our local FilterData copy if ( rSettings.mxStatusIndicator.is() ) { - rtl::OUString sStatusIndicator( RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" ) ); + rtl::OUString sStatusIndicator( "StatusIndicator" ); int i = rSettings.maFilterData.getLength(); rSettings.maFilterData.realloc( i + 1 ); rSettings.maFilterData[ i ].Name = sStatusIndicator; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 5258eb8fc86e..1eb1d74c50ac 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -314,7 +314,7 @@ OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::Runti uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ColorTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.ColorTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } @@ -388,7 +388,7 @@ OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::Run uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineEndTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.LineEndTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } @@ -470,7 +470,7 @@ OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::Runtim uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DashTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.DashTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } @@ -547,7 +547,7 @@ OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::Runti uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.HatchTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.HatchTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } @@ -636,7 +636,7 @@ OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::Ru uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GradientTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.GradientTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } @@ -704,7 +704,7 @@ OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::Runt uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.BitmapTable" ) ); + const OUString aServiceName( "com.sun.star.drawing.BitmapTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); return aServices; } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index bd51521aa30b..88ec2e8ab8ba 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -170,7 +170,7 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier ) throw( uno::Exception, uno::RuntimeException ) { - const OUString aDrawingPrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.") ); + const OUString aDrawingPrefix("com.sun.star.drawing."); if( rServiceSpecifier.startsWith( aDrawingPrefix ) ) { @@ -552,7 +552,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceNa uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException) { - OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument")); + OUString aSN("com.sun.star.drawing.DrawingDocument"); uno::Sequence< OUString > aSeq( &aSN, 1 ); return aSeq; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6a945ba9a195..76c46fc1ec80 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3185,7 +3185,7 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( OUString SAL_CALL SvxShape::getImplementationName() throw(uno::RuntimeException) { - static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("SvxShape") ); + static OUString aServiceName("SvxShape"); return aServiceName; } @@ -4059,7 +4059,7 @@ void SAL_CALL SvxShapeText::release() throw() //---------------------------------------------------------------------- OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException ) { - static OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("SvxShapeText") ); + static OUString aServiceName("SvxShapeText"); return aServiceName; } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 32506172b41b..aa3be52d9417 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -344,7 +344,7 @@ rtl::OUString XPropertyList::GetDefaultExt( XPropertyListType t ) rtl::OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t ) { - rtl::OUString aFilter( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); + rtl::OUString aFilter( "*." ); return aFilter + GetDefaultExt( t ); } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index b6755a58361a..c86eabaa25cb 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2392,7 +2392,7 @@ awt::Point SwXShape::_GetAttrPosition() text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( RTL_CONSTASCII_USTRINGPARAM( "AnchorType" ) ); + rtl::OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } @@ -2521,14 +2521,14 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( RTL_CONSTASCII_USTRINGPARAM( "AnchorType" ) ); + rtl::OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER ) { // determine current x-postion - rtl::OUString aHoriPosPropStr( RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition") ); + rtl::OUString aHoriPosPropStr("HoriOrientPosition"); uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) ); sal_Int32 dCurrX = 0; aHoriPos >>= dCurrX; @@ -2537,7 +2537,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust x-position orientation to text::HoriOrientation::NONE, if needed // Note: has to be done before setting x-position attribute - rtl::OUString aHoriOrientPropStr( RTL_CONSTASCII_USTRINGPARAM("HoriOrient") ); + rtl::OUString aHoriOrientPropStr("HoriOrient"); uno::Any aHoriOrient( getPropertyValue( aHoriOrientPropStr ) ); sal_Int16 eHoriOrient; if (aHoriOrient >>= eHoriOrient) // may be void @@ -2558,7 +2558,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) // handle y-position { // determine current y-postion - rtl::OUString aVertPosPropStr( RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition") ); + rtl::OUString aVertPosPropStr("VertOrientPosition"); uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) ); sal_Int32 dCurrY = 0; aVertPos >>= dCurrY; @@ -2567,7 +2567,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust y-position orientation to text::VertOrientation::NONE, if needed // Note: has to be done before setting y-position attribute - rtl::OUString aVertOrientPropStr( RTL_CONSTASCII_USTRINGPARAM("VertOrient") ); + rtl::OUString aVertOrientPropStr("VertOrient"); uno::Any aVertOrient( getPropertyValue( aVertOrientPropStr ) ); sal_Int16 eVertOrient; if (aVertOrient >>= eVertOrient) // may be void diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 6a4bfee16da0..130e668a810e 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2333,10 +2333,10 @@ OUString SwXTextField::getImplementationName(void) throw( uno::RuntimeException static OUString OldNameToNewName_Impl( const OUString &rOld ) { - static OUString aOldNamePart1(RTL_CONSTASCII_USTRINGPARAM(".TextField.DocInfo.")); - static OUString aOldNamePart2(RTL_CONSTASCII_USTRINGPARAM(".TextField.")); - static OUString aNewNamePart1(RTL_CONSTASCII_USTRINGPARAM(".textfield.docinfo.")); - static OUString aNewNamePart2(RTL_CONSTASCII_USTRINGPARAM(".textfield.")); + static OUString aOldNamePart1(".TextField.DocInfo."); + static OUString aOldNamePart2(".TextField."); + static OUString aNewNamePart1(".textfield.docinfo."); + static OUString aNewNamePart2(".textfield."); OUString sServiceNameCC( rOld ); sal_Int32 nIdx = sServiceNameCC.indexOf( aOldNamePart1 ); if (nIdx >= 0) diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 0db34bb5748f..2e0be45974dd 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -301,7 +301,7 @@ SwPrintUIOptions::SwPrintUIOptions( aPrintRangeOpt); // create a choice for the content to create - rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); + rtl::OUString aPrintRangeName( "PrintContent" ); uno::Sequence< rtl::OUString > aChoices( 3 ); uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); uno::Sequence< rtl::OUString > aHelpIds( 3 ); @@ -390,7 +390,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for brochure bDefaultVal = rDefaultPrintData.IsPrintProspect(); - rtl::OUString aBrochurePropertyName( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ); + rtl::OUString aBrochurePropertyName( "PrintProspect" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox", aBrochurePropertyName, diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 42e925a754e6..f224bf837bb1 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -425,7 +425,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm ) if( bHiddenOnly ) { uno::Reference< beans::XPropertySet > xPropSet( xFormComp, uno::UNO_QUERY ); - OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("ClassId")); + OUString sPropName("ClassId"); if( xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) { uno::Any aAny2 = xPropSet->getPropertyValue( sPropName ); @@ -674,7 +674,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); - OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("ClassId")); + OUString sPropName("ClassId"); if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) return 0; @@ -850,7 +850,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, GetControlSize( rSdrObject, aSz, rWrt.pDoc ); sal_Bool bMultiLine = sal_False; - OUString sMultiLine(RTL_CONSTASCII_USTRINGPARAM("MultiLine")); + OUString sMultiLine("MultiLine"); if( xPropSetInfo->hasPropertyByName( sMultiLine ) ) { aTmp = xPropSet->getPropertyValue( sMultiLine ); @@ -897,7 +897,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, else { eType = TYPE_TEXT; - OUString sEchoChar(RTL_CONSTASCII_USTRINGPARAM("EchoChar")); + OUString sEchoChar("EchoChar"); if( xPropSetInfo->hasPropertyByName( sEchoChar ) ) { aTmp = xPropSet->getPropertyValue( sEchoChar ); @@ -923,7 +923,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, *(sal_Int16*) aTmp.getValue())); } - OUString sDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText")); + OUString sDefaultText("DefaultText"); if( xPropSetInfo->hasPropertyByName( sDefaultText ) ) { aTmp = xPropSet->getPropertyValue( sDefaultText ); @@ -1087,7 +1087,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END ); - OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor")); + OUString sPropName("BackgroundColor"); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index d5d46ac144f6..9474dd1772c3 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -350,7 +350,7 @@ sal_Int32 ReadThroughComponent( OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, makeAny( sStreamName ) ); } @@ -660,7 +660,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con if( xParentSet.is() ) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xParentSet->getPropertySetInfo() ); - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sPropName("BuildId" ); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(sPropName) ) { xInfoSet->setPropertyValue( sPropName, xParentSet->getPropertyValue(sPropName) ); @@ -694,7 +694,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con } uno::Any aProgRange; aProgRange <<= nProgressRange; - OUString sProgressRange(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")); + OUString sProgressRange("ProgressRange"); xInfoSet->setPropertyValue(sProgressRange, aProgRange); Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW ); @@ -746,13 +746,11 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con // SFX_STYLE_FAMILY_PSEUDO; *pSeq++ = OUString("NumberingStyles"); - OUString sStyleInsertModeFamilies( - RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeFamilies")); + OUString sStyleInsertModeFamilies("StyleInsertModeFamilies"); xInfoSet->setPropertyValue( sStyleInsertModeFamilies, makeAny(aFamiliesSeq) ); - OUString sStyleInsertModeOverwrite( - RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeOverwrite")); + OUString sStyleInsertModeOverwrite("StyleInsertModeOverwrite"); sal_Bool bTmp = !aOpt.IsMerge(); Any aAny; aAny.setValue( &bTmp, ::getBooleanCppuType() ); @@ -762,8 +760,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con { const uno::Reference<text::XTextRange> xInsertTextRange = SwXTextRange::CreateXTextRange(rDoc, *rPaM.GetPoint(), 0); - OUString sTextInsertModeRange( - RTL_CONSTASCII_USTRINGPARAM("TextInsertModeRange")); + OUString sTextInsertModeRange("TextInsertModeRange"); xInfoSet->setPropertyValue( sTextInsertModeRange, makeAny(xInsertTextRange) ); } @@ -775,8 +772,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con if( IsBlockMode() ) { - OUString sAutoTextMode( - RTL_CONSTASCII_USTRINGPARAM("AutoTextMode")); + OUString sAutoTextMode("AutoTextMode"); sal_Bool bTmp = sal_True; Any aAny; aAny.setValue( &bTmp, ::getBooleanCppuType() ); @@ -784,8 +780,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con } if( IsOrganizerMode() ) { - OUString sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + OUString sOrganizerMode("OrganizerMode"); sal_Bool bTmp = sal_True; Any aAny; aAny.setValue( &bTmp, ::getBooleanCppuType() ); @@ -799,7 +794,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL( rBaseURL ); - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, makeAny( aBaseURL ) ); // TODO/LATER: separate links from usual embedded objects @@ -831,15 +826,15 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con // save redline mode into import info property set Any aAny; sal_Bool bTmp; - OUString sShowChanges( RTL_CONSTASCII_USTRINGPARAM("ShowChanges") ); + OUString sShowChanges("ShowChanges"); bTmp = IDocumentRedlineAccess::IsShowChanges( rDoc.GetRedlineMode() ); aAny.setValue( &bTmp, ::getBooleanCppuType() ); xInfoSet->setPropertyValue( sShowChanges, aAny ); - OUString sRecordChanges( RTL_CONSTASCII_USTRINGPARAM("RecordChanges") ); + OUString sRecordChanges("RecordChanges"); bTmp = IDocumentRedlineAccess::IsRedlineOn(rDoc.GetRedlineMode()); aAny.setValue( &bTmp, ::getBooleanCppuType() ); xInfoSet->setPropertyValue( sRecordChanges, aAny ); - OUString sRedlineProtectionKey( RTL_CONSTASCII_USTRINGPARAM("RedlineProtectionKey") ); + OUString sRedlineProtectionKey("RedlineProtectionKey"); aAny <<= rDoc.GetRedlinePassword(); xInfoSet->setPropertyValue( sRedlineProtectionKey, aAny ); @@ -933,7 +928,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode || aOpt.IsFmtsOnly() ) ) { - OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") ); + OUString sStreamName("layout-cache"); try { uno::Reference < io::XStream > xStm = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); @@ -1029,7 +1024,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con if( xModelSet.is() ) { uno::Reference< beans::XPropertySetInfo > xModelSetInfo( xModelSet->getPropertySetInfo() ); - OUString sName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sName("BuildId" ); if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sName) ) { xModelSet->setPropertyValue( sName, xInfoSet->getPropertyValue(sName) ); @@ -1060,7 +1055,7 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium, { xml::sax::InputSource aParserInput; - OUString sDocName( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ) ); + OUString sDocName( "content.xml" ); aParserInput.sSystemId = sDocName; uno::Reference < io::XStream > xStm = xStg2->openStreamElement( sDocName, embed::ElementModes::READ ); diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index adb314ea82ed..6cf84811940d 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -172,7 +172,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aInfoMap ) ) ); - const OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") ); + const OUString sTargetStorage("TargetStorage"); xInfoSet->setPropertyValue( sTargetStorage, Any( xStg ) ); uno::Any aAny; @@ -186,22 +186,22 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, nProgressRange); } aAny <<= nProgressRange; - OUString sProgressRange(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")); + OUString sProgressRange("ProgressRange"); xInfoSet->setPropertyValue(sProgressRange, aAny); aAny <<= static_cast < sal_Int32 >( -1 ); - OUString sProgressMax(RTL_CONSTASCII_USTRINGPARAM("ProgressMax")); + OUString sProgressMax("ProgressMax"); xInfoSet->setPropertyValue(sProgressMax, aAny); } SvtSaveOptions aSaveOpt; - OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); + OUString sUsePrettyPrinting("UsePrettyPrinting"); sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() ); xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny ); // save show redline mode ... - OUString sShowChanges(RTL_CONSTASCII_USTRINGPARAM("ShowChanges")); + OUString sShowChanges("ShowChanges"); sal_uInt16 nRedlineMode = pDoc->GetRedlineMode(); sal_Bool bShowChanges( IDocumentRedlineAccess::IsShowChanges( nRedlineMode ) ); aAny.setValue( &bShowChanges, ::getBooleanCppuType() ); @@ -212,7 +212,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, pDoc->SetRedlineMode((RedlineMode_t)( nRedlineMode )); // Set base URI - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( GetBaseURL() ) ) ); if( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocShell()->GetCreateMode() ) @@ -229,8 +229,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( bBlock ) { - OUString sAutoTextMode( - RTL_CONSTASCII_USTRINGPARAM("AutoTextMode")); + OUString sAutoTextMode("AutoTextMode"); sal_Bool bTmp = sal_True; Any aAny2; aAny2.setValue( &bTmp, ::getBooleanCppuType() ); @@ -242,8 +241,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if ( bOASIS && docfunc::HasOutlineStyleToBeWrittenAsNormalListStyle( *pDoc ) ) { - OUString sOutlineStyleAsNormalListStyle( - RTL_CONSTASCII_USTRINGPARAM("OutlineStyleAsNormalListStyle") ); + OUString sOutlineStyleAsNormalListStyle("OutlineStyleAsNormalListStyle"); xInfoSet->setPropertyValue( sOutlineStyleAsNormalListStyle, makeAny( sal_True ) ); } @@ -306,7 +304,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, { const uno::Reference<beans::XPropertySet> xPropSet(xStg, uno::UNO_QUERY_THROW); - const ::rtl::OUString VersionProp(RTL_CONSTASCII_USTRINGPARAM("Version")); + const ::rtl::OUString VersionProp("Version"); try { ::rtl::OUString Version; @@ -407,7 +405,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( pDoc->GetCurrentViewShell() && pDoc->GetDocStat().nPage > 1 && //swmod 071108//swmod 071225 !(bOrganizerMode || bBlock || bErr) ) { - OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") ); + OUString sStreamName("layout-cache"); try { uno::Reference < io::XStream > xStm = xStg->openStreamElement( sStreamName, embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); @@ -415,7 +413,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( !pStream->GetError() ) { uno::Reference < beans::XPropertySet > xSet( xStm, UNO_QUERY ); - OUString aMime( RTL_CONSTASCII_USTRINGPARAM("application/binary") ); + OUString aMime("application/binary"); uno::Any aAny2; aAny2 <<= aMime; xSet->setPropertyValue( rtl::OUString("MediaType"), aAny2 ); @@ -529,12 +527,12 @@ bool SwXMLWriter::WriteThroughComponent( if( !xSet.is() ) return false; - OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") ); + OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; xSet->setPropertyValue( rtl::OUString("MediaType"), aAny ); - OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); + OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // even plain stream should be encrypted in encrypted documents sal_Bool bTrue = sal_True; @@ -551,7 +549,7 @@ bool SwXMLWriter::WriteThroughComponent( OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, makeAny( sStreamName ) ); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 3cb4fb7e0a80..ea2bbec578ce 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -116,8 +116,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) Reference<XPropertySet> rInfoSet = getExportInfo(); if( rInfoSet.is() ) { - OUString sAutoTextMode( - RTL_CONSTASCII_USTRINGPARAM("AutoTextMode")); + OUString sAutoTextMode("AutoTextMode"); if( rInfoSet->getPropertySetInfo()->hasPropertyByName( sAutoTextMode ) ) { @@ -288,7 +287,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) Reference<XPropertySet> rInfoSet = getExportInfo(); if( rInfoSet.is() ) { - OUString sShowChanges( RTL_CONSTASCII_USTRINGPARAM("ShowChanges")); + OUString sShowChanges("ShowChanges"); bSaveRedline = ! rInfoSet->getPropertySetInfo()->hasPropertyByName( sShowChanges ); } @@ -391,7 +390,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) Reference<XPropertySet> xInfoSet( getExportInfo() ); if ( xInfoSet.is() ) { - OUString sShowChanges( RTL_CONSTASCII_USTRINGPARAM( "ShowChanges" )); + OUString sShowChanges( "ShowChanges" ); if( xInfoSet->getPropertySetInfo()->hasPropertyByName( sShowChanges ) ) { bShowRedlineChanges = *(sal_Bool*) xInfoSet-> @@ -486,7 +485,7 @@ void SwXMLExport::_ExportContent() Reference<XPropertySet> xPropSet(GetModel(), UNO_QUERY); if (xPropSet.is()) { - OUString sTwoDigitYear(RTL_CONSTASCII_USTRINGPARAM("TwoDigitYear")); + OUString sTwoDigitYear("TwoDigitYear"); Any aAny = xPropSet->getPropertyValue( sTwoDigitYear ); aAny <<= (sal_Int16)1930; diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 07d81cf9b336..8eae79fb2586 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -304,8 +304,8 @@ uno::Reference < style::XStyle > SwXMLTextStyleContext_Impl::Create() uno::UNO_QUERY ); if( xFactory.is() ) { - OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.style.ConditionalParagraphStyle" ) ); + OUString sServiceName( + "com.sun.star.style.ConditionalParagraphStyle" ); uno::Reference < uno::XInterface > xIfc = xFactory->createInstance( sServiceName ); if( xIfc.is() ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 3adac9ab2faa..8b79d6bd2327 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -526,19 +526,18 @@ void SwXMLImport::startDocument( void ) { Any aAny; // insert style mode? - OUString sStyleInsertModeFamilies( - RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeFamilies")); + OUString sStyleInsertModeFamilies("StyleInsertModeFamilies"); if( xPropertySetInfo->hasPropertyByName(sStyleInsertModeFamilies) ) { aAny = xImportInfo->getPropertyValue(sStyleInsertModeFamilies); Sequence< OUString> aFamiliesSeq; if( aAny >>= aFamiliesSeq ) { - OUString sFrameStyles( RTL_CONSTASCII_USTRINGPARAM ( "FrameStyles" ) ); - OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM ( "PageStyles" ) ); - OUString sCharacterStyles( RTL_CONSTASCII_USTRINGPARAM ( "CharacterStyles" ) ); - OUString sParagraphStyles( RTL_CONSTASCII_USTRINGPARAM ( "ParagraphStyles" ) ); - OUString sNumberingStyles( RTL_CONSTASCII_USTRINGPARAM ( "NumberingStyles" ) ); + OUString sFrameStyles( "FrameStyles" ); + OUString sPageStyles( "PageStyles" ); + OUString sCharacterStyles( "CharacterStyles" ); + OUString sParagraphStyles( "ParagraphStyles" ); + OUString sNumberingStyles( "NumberingStyles" ); sal_uInt16 nFamilyMask = 0U; sal_Int32 nCount = aFamiliesSeq.getLength(); const OUString *pSeq = aFamiliesSeq.getConstArray(); @@ -558,8 +557,7 @@ void SwXMLImport::startDocument( void ) } sal_Bool bOverwrite = sal_False; - OUString sStyleInsertModeOverwrite( - RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeOverwrite")); + OUString sStyleInsertModeOverwrite("StyleInsertModeOverwrite"); if( xPropertySetInfo->hasPropertyByName(sStyleInsertModeOverwrite) ) { aAny = xImportInfo->getPropertyValue(sStyleInsertModeOverwrite); @@ -573,8 +571,7 @@ void SwXMLImport::startDocument( void ) } // text insert mode? - OUString sTextInsertModeRange( - RTL_CONSTASCII_USTRINGPARAM("TextInsertModeRange")); + OUString sTextInsertModeRange("TextInsertModeRange"); if( xPropertySetInfo->hasPropertyByName(sTextInsertModeRange) ) { aAny = xImportInfo->getPropertyValue(sTextInsertModeRange); @@ -584,8 +581,7 @@ void SwXMLImport::startDocument( void ) } // auto text mode - OUString sAutoTextMode( - RTL_CONSTASCII_USTRINGPARAM("AutoTextMode")); + OUString sAutoTextMode("AutoTextMode"); if( xPropertySetInfo->hasPropertyByName(sAutoTextMode) ) { aAny = xImportInfo->getPropertyValue(sAutoTextMode); @@ -595,8 +591,7 @@ void SwXMLImport::startDocument( void ) } // organizer mode - OUString sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + OUString sOrganizerMode("OrganizerMode"); if( xPropertySetInfo->hasPropertyByName(sOrganizerMode) ) { aAny = xImportInfo->getPropertyValue(sOrganizerMode); @@ -1169,14 +1164,14 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC bool bBackgroundParaOverDrawings = false; bool bTabOverMargin = false; - OUString sRedlineProtectionKey( RTL_CONSTASCII_USTRINGPARAM( "RedlineProtectionKey" ) ); + OUString sRedlineProtectionKey( "RedlineProtectionKey" ); const PropertyValue* currentDatabaseDataSource = NULL; const PropertyValue* currentDatabaseCommand = NULL; const PropertyValue* currentDatabaseCommandType = NULL; - OUString currentDatabaseDataSourceKey( RTL_CONSTASCII_USTRINGPARAM( "CurrentDatabaseDataSource" )); - OUString currentDatabaseCommandKey( RTL_CONSTASCII_USTRINGPARAM( "CurrentDatabaseCommand" )); - OUString currentDatabaseCommandTypeKey( RTL_CONSTASCII_USTRINGPARAM( "CurrentDatabaseCommandType" )); + OUString currentDatabaseDataSourceKey( "CurrentDatabaseDataSource" ); + OUString currentDatabaseCommandKey( "CurrentDatabaseCommand" ); + OUString currentDatabaseCommandTypeKey( "CurrentDatabaseCommandType" ); while( nCount-- ) { diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 26d2d60eb506..d33edb61ccee 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -697,7 +697,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, { Reference<XPropertySet> xCellPropertySet( xCell, UNO_QUERY ); - OUString sTextSection( RTL_CONSTASCII_USTRINGPARAM("TextSection") ); + OUString sTextSection("TextSection"); Any aAny = xCellPropertySet->getPropertyValue(sTextSection); Reference < XTextSection > xTextSection; aAny >>= xTextSection; @@ -872,7 +872,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox, if( !rTblInfo.IsBaseSectionValid() ) { - OUString sTextSection( RTL_CONSTASCII_USTRINGPARAM("TextSection") ); + OUString sTextSection("TextSection"); aAny = xCellPropertySet->getPropertyValue(sTextSection); Reference < XTextSection > xTextSection; aAny >>= xTextSection; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 17c82d3a3992..cc273a7eea7a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1388,8 +1388,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, OSL_ENSURE( xFactory.is(), "factory missing" ); if( xFactory.is() ) { - OUString sService( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextTable" ) ); + OUString sService( "com.sun.star.text.TextTable" ); Reference<XInterface> xIfc = xFactory->createInstance( sService ); OSL_ENSURE( xIfc.is(), "Couldn't create a table" ); @@ -2904,7 +2903,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( // The Cursor already is in the first section pStNd = pTxtCrsr->GetPaM()->GetNode()->FindTableBoxStartNode(); bFirstSection = false; - OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("Standard") ); + OUString sStyleName("Standard"); GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(), GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True ); } diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index e2f5b0d0e74c..62665b2c43a0 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -278,7 +278,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( { // create object with desired ClassId sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DummyName")); + ::rtl::OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( aClassName.GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = @@ -567,7 +567,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( try { // create object with desired ClassId - ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DummyName")); + ::rtl::OUString aName("DummyName"); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext()); @@ -698,7 +698,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( try { // create object with desired ClassId - ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DummyName")); + ::rtl::OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = @@ -829,7 +829,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra try { // create object with desired ClassId - ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DummyName")); + ::rtl::OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = @@ -935,7 +935,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin( } // unfortunately the names of the properties are depending on the object - ::rtl::OUString aParaName(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")); + ::rtl::OUString aParaName("AppletCommands"); try { xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 9ea1aa725171..483e647e5217 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -986,7 +986,7 @@ void SwDocShell::Execute(SfxRequest& rReq) uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM("SendOutlineToImpress")); + ::rtl::OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); *pStrm << '\0'; @@ -1053,7 +1053,7 @@ void SwDocShell::Execute(SfxRequest& rReq) uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM("SendOutlineToImpress")); + ::rtl::OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); *pStrm << '\0'; @@ -1702,7 +1702,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, try { uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY_THROW ); - const ::rtl::OUString aMediaTypePropName( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ); + const ::rtl::OUString aMediaTypePropName( "MediaType" ); xProps->getPropertyValue( aMediaTypePropName ); bImport = true; } diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index fcb6728c2903..4a9e97b168d0 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -113,7 +113,7 @@ void SwDbtoolsClient::registerClient() if (NULL != getDbToolsClientModule()) { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc(RTL_CONSTASCII_USTRINGPARAM("createDataAccessToolsFactory")); + const ::rtl::OUString sFactoryCreationFunc("createDataAccessToolsFactory"); // reinterpret_cast<createDataAccessToolsFactoryFunction> removed for gcc permissive getDbToolsClientFactoryFunction() = reinterpret_cast< createDataAccessToolsFactoryFunction >( osl_getFunctionSymbol(getDbToolsClientModule(), sFactoryCreationFunc.pData)); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 63e46bcce5b7..226fd98613b4 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5017,7 +5017,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) aEvent.ExecutePosition.X = aPixPos.X(); aEvent.ExecutePosition.Y = aPixPos.Y(); Menu* pMenu = 0; - ::rtl::OUString sMenuName(RTL_CONSTASCII_USTRINGPARAM("private:resource/ReadonlyContextMenu")); + ::rtl::OUString sMenuName("private:resource/ReadonlyContextMenu"); if( GetView().TryContextMenuInterception( *pROPopup, sMenuName, pMenu, aEvent ) ) { if ( pMenu ) diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 7880452389ce..c7dba1a214f6 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -416,7 +416,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG); sCommand += ":default_first"; uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand); - const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name")); + const ::rtl::OUString sName("Name"); sal_uInt16 nODT = USHRT_MAX; while(xList->hasMoreElements()) { diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 018182f80159..cb8fbe4996e3 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -77,7 +77,7 @@ SwTbxInsertCtrl::~SwTbxInsertCtrl() void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException) { ToolBox& rTbx = GetToolBox(); - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); @@ -103,7 +103,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/, if( nLastSlotId ) nId = nLastSlotId; - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nId )); ToolBox& rBox = GetToolBox(); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); @@ -120,12 +120,12 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow() { if(GetSlotId() == FN_INSERT_CTRL) { - OUString aToolBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" )); + OUString aToolBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aToolBarResStr ); } else /* FN_INSERT_OBJ_CTRL */ { - OUString aToolBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" )); + OUString aToolBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aToolBarResStr ); } return NULL; diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index ae971d0692c6..11e38933c003 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -66,7 +66,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance( uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw() { - OUString sService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AutoTextContainer")); + OUString sService("com.sun.star.text.AutoTextContainer"); const uno::Sequence< OUString > aSeq( &sService, 1 ); return aSeq; } diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 018c9214a11e..918b11efe1d4 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -70,7 +70,7 @@ SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XMod rtl::OUString SAL_CALL SwVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Word" ) ); + static rtl::OUString appName("Microsoft Word" ); return appName; } diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index c6b89b38fa4d..293b56189f20 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -39,7 +39,7 @@ typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical }; -const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") ); +const static rtl::OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 5839100993a8..ac74b19eebad 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -76,7 +76,7 @@ private: public: static rtl::OUString propName() { - static rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("CharUnderline") ); + static rtl::OUString sPropName("CharUnderline"); return sPropName; } diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index b9387680469f..3088dd116542 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext") ); +rtl::OUString sDocCtxName("WordDocumentContext"); // ============================================================================= // SwVbaGlobals diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index 8f9b24fa86cf..8a01bc26dfdb 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -89,7 +89,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep 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") ); + rtl::OUString sGroup("Normal"); rtl::OUString sName = getName(); sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') ); if( nIndex > 0 ) diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx index 5f30c11f7fbe..fe43439f7b3d 100644 --- a/sw/source/ui/wrtsh/navmgr.cxx +++ b/sw/source/ui/wrtsh/navmgr.cxx @@ -232,7 +232,7 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) { aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/navigationobjectbar" ) ); + const ::rtl::OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx index 32ee7b886a6e..fd6eef008d4a 100644 --- a/test/source/container/xnamed.cxx +++ b/test/source/container/xnamed.cxx @@ -43,7 +43,7 @@ void XNamed::testGetName() void XNamed::testSetName() { uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); - rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("NewName")); + rtl::OUString aName("NewName"); xNamed->setName(aName); CPPUNIT_ASSERT( aName == xNamed->getName() ); diff --git a/test/source/sheet/cellproperties.cxx b/test/source/sheet/cellproperties.cxx index d9d5fc00891b..ae569a9b908f 100644 --- a/test/source/sheet/cellproperties.cxx +++ b/test/source/sheet/cellproperties.cxx @@ -41,7 +41,7 @@ namespace apitest { void CellProperties::testVertJustify() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aVertJustify(RTL_CONSTASCII_USTRINGPARAM("VertJustify")); + rtl::OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xCellRangeBase->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); @@ -59,7 +59,7 @@ void CellProperties::testVertJustify() void CellProperties::testRotateReference() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aRotateReference(RTL_CONSTASCII_USTRINGPARAM("RotateReference")); + rtl::OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xCellRangeBase->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index c922b9899280..270ad590675d 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -53,7 +53,7 @@ void DataPilotField::testSortInfo() { uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldSortInfo aSortInfoValue; - rtl::OUString aSortInfo(RTL_CONSTASCII_USTRINGPARAM("SortInfo")); + rtl::OUString aSortInfo("SortInfo"); aSortInfoValue.Field = rtl::OUString("Col1"); aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; @@ -69,7 +69,7 @@ void DataPilotField::testSortInfo() //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing sal_Bool bHasSortInfo; - rtl::OUString aHasSortInfo(RTL_CONSTASCII_USTRINGPARAM("HasSortInfo")); + rtl::OUString aHasSortInfo("HasSortInfo"); xValue = xPropSet->getPropertyValue(aHasSortInfo); CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); CPPUNIT_ASSERT_MESSAGE("should have sort info", bHasSortInfo); @@ -87,7 +87,7 @@ void DataPilotField::testLayoutInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldLayoutInfo aLayoutInfoValue; - rtl::OUString aLayoutInfo(RTL_CONSTASCII_USTRINGPARAM("LayoutInfo")); + rtl::OUString aLayoutInfo("LayoutInfo"); aLayoutInfoValue.AddEmptyLines = false; aLayoutInfoValue.LayoutMode = sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM; uno::Any xValue; @@ -102,7 +102,7 @@ void DataPilotField::testLayoutInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasLayoutInfo; - rtl::OUString aHasLayoutInfo(RTL_CONSTASCII_USTRINGPARAM("HasLayoutInfo")); + rtl::OUString aHasLayoutInfo("HasLayoutInfo"); xValue = xPropSet->getPropertyValue(aHasLayoutInfo); CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo); @@ -122,7 +122,7 @@ void DataPilotField::testAutoShowInfo() sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue; aAutoShowInfoValue.DataField = rtl::OUString("Col1"); aAutoShowInfoValue.IsEnabled = true; - rtl::OUString aAutoShowInfo(RTL_CONSTASCII_USTRINGPARAM("AutoShowInfo")); + rtl::OUString aAutoShowInfo("AutoShowInfo"); uno::Any xValue; xValue <<= aAutoShowInfoValue; xPropSet->setPropertyValue(aAutoShowInfo, xValue); @@ -135,7 +135,7 @@ void DataPilotField::testAutoShowInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasAutoShowInfo; - rtl::OUString aHasAutoShowInfo(RTL_CONSTASCII_USTRINGPARAM("HasAutoShowInfo")); + rtl::OUString aHasAutoShowInfo("HasAutoShowInfo"); xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo); @@ -155,7 +155,7 @@ void DataPilotField::testReference() sheet::DataPilotFieldReference aReferenceValue; aReferenceValue.ReferenceField = rtl::OUString("Col1"); aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; - rtl::OUString aReference(RTL_CONSTASCII_USTRINGPARAM("Reference")); + rtl::OUString aReference("Reference"); uno::Any xValue; xValue <<= aReferenceValue; xPropSet->setPropertyValue(aReference, xValue); @@ -168,7 +168,7 @@ void DataPilotField::testReference() //setting HasReference only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasReference; - rtl::OUString aHasReference(RTL_CONSTASCII_USTRINGPARAM("HasReference")); + rtl::OUString aHasReference("HasReference"); xValue = xPropSet->getPropertyValue(aHasReference); CPPUNIT_ASSERT( xValue >>= bHasReference ); CPPUNIT_ASSERT_MESSAGE("should have Reference information", bHasReference); @@ -186,7 +186,7 @@ void DataPilotField::testIsGroupField() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); uno::Any xValue; - rtl::OUString aIsGroupField(RTL_CONSTASCII_USTRINGPARAM("IsGroupField")); + rtl::OUString aIsGroupField("IsGroupField"); sal_Bool bIsGroupField; xValue = xPropSet->getPropertyValue(aIsGroupField); diff --git a/test/source/sheet/tableautoformatfield.cxx b/test/source/sheet/tableautoformatfield.cxx index 540dcd7a1d6a..846ae009de2c 100644 --- a/test/source/sheet/tableautoformatfield.cxx +++ b/test/source/sheet/tableautoformatfield.cxx @@ -49,7 +49,7 @@ uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() void TableAutoFormatField::testRotateReference() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aRotateReference(RTL_CONSTASCII_USTRINGPARAM("RotateReference")); + rtl::OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xTableAutoFormatField->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); @@ -67,7 +67,7 @@ void TableAutoFormatField::testRotateReference() void TableAutoFormatField::testVertJustify() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aVertJustify(RTL_CONSTASCII_USTRINGPARAM("VertJustify")); + rtl::OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xTableAutoFormatField->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index 68634b1ff4a7..cd6b0c1b548f 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -162,7 +162,7 @@ void XDatabaseRange::testRefresh() uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("Refresh")), UNO_QUERY_THROW); const sal_Int32 nCol = 0; - rtl::OUString aHidden(RTL_CONSTASCII_USTRINGPARAM("IsVisible")); + rtl::OUString aHidden("IsVisible"); uno::Reference< sheet::XCellRangeReferrer > xCellRangeReferrer(xDBRange, UNO_QUERY_THROW); uno::Reference< table::XCellRange > xCellRange = xCellRangeReferrer->getReferredCells(); diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index d6bb683511a3..5a3324eda737 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -45,7 +45,7 @@ std::vector< rtl::OUString > XDataPilotDescriptor::maFieldNames; void XDataPilotDescriptor::testTag() { - rtl::OUString aTag(RTL_CONSTASCII_USTRINGPARAM("DataPilotDescriptor_Tag")); + rtl::OUString aTag("DataPilotDescriptor_Tag"); uno::Reference< sheet::XDataPilotDescriptor > xDescr(init(), UNO_QUERY_THROW); xDescr->setTag(aTag); rtl::OUString aNewTag = xDescr->getTag(); @@ -99,7 +99,7 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X sal_Int32 nCount = xIndex->getCount(); - rtl::OUString aOrientation(RTL_CONSTASCII_USTRINGPARAM("Orientation")); + rtl::OUString aOrientation("Orientation"); for (sal_Int32 i = 0; i < nCount && i < 5; ++i) { uno::Reference< container::XNamed > xNamed( xIndex->getByIndex( i ), UNO_QUERY_THROW); diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index bd4615018494..6adeb8bb28c5 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -53,16 +53,16 @@ namespace apitest { void XNamedRange::testGetContent() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - rtl::OUString aExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1")); + rtl::OUString aExpectedContent("$Sheet1.$B$1"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 on GetContent", xNamedRange->getContent().equals(aExpectedContent)); } void XNamedRange::testSetContent() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); rtl::OUString aExpectedContent; @@ -87,14 +87,14 @@ void XNamedRange::testSetContent() void XNamedRange::testGetType() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); CPPUNIT_ASSERT_MESSAGE("Wrong expected Type", xNamedRange->getType() == 0); } void XNamedRange::testSetType() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); sal_Int32 nType = ::sheet::NamedRangeFlag::ROW_HEADER;; @@ -120,7 +120,7 @@ void XNamedRange::testSetType() void XNamedRange::testGetReferencePosition() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial2")); + rtl::OUString aTestedNamedRangeString("initial2"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress xCellAddress = xNamedRange->getReferencePosition(); @@ -132,7 +132,7 @@ void XNamedRange::testGetReferencePosition() void XNamedRange::testSetReferencePosition() { - rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress aBaseAddress = table::CellAddress(1,2,3); diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index 4fd7e9f124b8..33dbf2c4bc54 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -77,32 +77,32 @@ void XNamedRanges::testAddNewByName() table::CellAddress aBaseAddress = table::CellAddress(0,0,0); sal_Int32 nType = 0; - rtl::OUString aContent1(RTL_CONSTASCII_USTRINGPARAM("D1")); - rtl::OUString aName1(RTL_CONSTASCII_USTRINGPARAM("type_0")); + rtl::OUString aContent1("D1"); + rtl::OUString aName1("type_0"); xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type 0 - Normal case", xNamedRanges->hasByName(aName1)); nType = ::sheet::NamedRangeFlag::COLUMN_HEADER; - rtl::OUString aContent2(RTL_CONSTASCII_USTRINGPARAM("D2")); - rtl::OUString aName2(RTL_CONSTASCII_USTRINGPARAM("type_COLUMN_HEADER")); + rtl::OUString aContent2("D2"); + rtl::OUString aName2("type_COLUMN_HEADER"); xNamedRanges->addNewByName(aName2, aContent2, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type COLUMN_HEADER", xNamedRanges->hasByName(aName2)); nType = ::sheet::NamedRangeFlag::FILTER_CRITERIA; - rtl::OUString aContent3(RTL_CONSTASCII_USTRINGPARAM("D3")); - rtl::OUString aName3(RTL_CONSTASCII_USTRINGPARAM("type_FILTER_CRITERIA")); + rtl::OUString aContent3("D3"); + rtl::OUString aName3("type_FILTER_CRITERIA"); xNamedRanges->addNewByName(aName3, aContent3, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type FILTER_CRITERIA", xNamedRanges->hasByName(aName3)); nType = ::sheet::NamedRangeFlag::PRINT_AREA; - rtl::OUString aContent4(RTL_CONSTASCII_USTRINGPARAM("D4")); - rtl::OUString aName4(RTL_CONSTASCII_USTRINGPARAM("type_PRINT_AREA")); + rtl::OUString aContent4("D4"); + rtl::OUString aName4("type_PRINT_AREA"); xNamedRanges->addNewByName(aName4, aContent4, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type PRINT_AREA", xNamedRanges->hasByName(aName4)); nType = ::sheet::NamedRangeFlag::ROW_HEADER; - rtl::OUString aContent5(RTL_CONSTASCII_USTRINGPARAM("D5")); - rtl::OUString aName5(RTL_CONSTASCII_USTRINGPARAM("type_ROW_HEADER")); + rtl::OUString aContent5("D5"); + rtl::OUString aName5("type_ROW_HEADER"); xNamedRanges->addNewByName(aName5, aContent5, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type ROW_HEADER", xNamedRanges->hasByName(aName5)); @@ -187,7 +187,7 @@ void XNamedRanges::testRemoveByName() CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, nInitialCount - 1); CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", !xNamedRanges->hasByName(maNameToRemove)); // try to remove non existing - rtl::OUString aNr2(RTL_CONSTASCII_USTRINGPARAM("dummyNonExistingNamedRange")); + rtl::OUString aNr2("dummyNonExistingNamedRange"); xNamedRanges->removeByName(aNr2);// an exception should be raised here } } diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index 181c7e0af42e..f72e7ae5c667 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -160,14 +160,14 @@ void XSpreadsheets2::testImportOverExistingNamedRange() */ importSheetToCopy(); - rtl::OUString aNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1")); + rtl::OUString aNamedRangeString("initial1"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); uno::Any aNr = xDestNamedRangesNameAccess->getByName(aNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNamedRange(aNr, UNO_QUERY_THROW); rtl::OUString aNrDestContent = xDestNamedRange->getContent(); - rtl::OUString aExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1")); + rtl::OUString aExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : initial1 aNrDestContent " << aNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for initial1", aNrDestContent, aExpectedContent); @@ -184,14 +184,14 @@ void XSpreadsheets2::testImportNamedRangeDefinedInSource() importSheetToCopy(); // New range name defined in imported sheet $SheetToCopy.$A$7 - rtl::OUString aNewInSheetNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("InSheetRangeName")); + rtl::OUString aNewInSheetNamedRangeString("InSheetRangeName"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("InSheetRangeName", xDestNamedRangesNameAccess->hasByName(aNewInSheetNamedRangeString)); uno::Any aNewInSheetNr = xDestNamedRangesNameAccess->getByName(aNewInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNewInSheetNamedRange(aNewInSheetNr, UNO_QUERY_THROW); rtl::OUString aNewInSheetNrDestContent = xDestNewInSheetNamedRange->getContent(); - rtl::OUString aNewInSheetExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$SheetToCopy.$A$7")); + rtl::OUString aNewInSheetExpectedContent("$SheetToCopy.$A$7"); std::cout << "testImportSheet : InSheetRangeName content " << aNewInSheetNrDestContent << std::endl; std::cout << "testImportSheet : InSheetRangeName expected " << aNewInSheetExpectedContent << std::endl; @@ -208,14 +208,14 @@ void XSpreadsheets2::testImportNamedRangeRedefinedInSource() importSheetToCopy(); // the source file redefines an existing named range in the imported sheet --> the target should not be changed - rtl::OUString aRedefinedInSheetNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial2")); + rtl::OUString aRedefinedInSheetNamedRangeString("initial2"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("aRedefinedInSheetNamedRangeString", xDestNamedRangesNameAccess->hasByName(aRedefinedInSheetNamedRangeString)); uno::Any aRedefinedInSheetNr = xDestNamedRangesNameAccess->getByName(aRedefinedInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestRedefinedInSheetNamedRange(aRedefinedInSheetNr, UNO_QUERY_THROW); rtl::OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent(); - rtl::OUString aRedefinedInSheetExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$2")); + rtl::OUString aRedefinedInSheetExpectedContent("$Sheet1.$B$2"); std::cout << "testImportSheet : initial2 content " << aRedefinedInSheetNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for Redefined InSheet named range", aRedefinedInSheetNrDestContent, aRedefinedInSheetExpectedContent); } @@ -230,7 +230,7 @@ void XSpreadsheets2::testImportNewNamedRange() importSheetToCopy(); //formula with a non-existant named range in dest - new_rangename - rtl::OUString aNewNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("new_rangename")); + rtl::OUString aNewNamedRangeString("new_rangename"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("New NamedRange not created", xDestNamedRangesNameAccess->hasByName(aNewNamedRangeString)); @@ -240,7 +240,7 @@ void XSpreadsheets2::testImportNewNamedRange() uno::Reference< sheet::XNamedRange > xDestNewNamedRange(aNewNr, UNO_QUERY_THROW); rtl::OUString aNewNrDestContent = xDestNewNamedRange->getContent(); - rtl::OUString aNewExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1")); + rtl::OUString aNewExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : new_rangename aNewExpectedContent " << aNewExpectedContent << std::endl; std::cout << "testImportSheet : new_rangename aNewNrDestContent " << aNewNrDestContent << std::endl; @@ -263,7 +263,7 @@ void XSpreadsheets2::testImportCellStyle() //new style created in dest uno::Reference< beans::XPropertySet > xSrcCellPropSet (xSrcCell, UNO_QUERY_THROW); - const rtl::OUString aCellProperty(RTL_CONSTASCII_USTRINGPARAM("CellStyle")); + const rtl::OUString aCellProperty("CellStyle"); rtl::OUString aSrcStyleName; CPPUNIT_ASSERT(xSrcCellPropSet->getPropertyValue(aCellProperty) >>= aSrcStyleName); @@ -275,7 +275,7 @@ void XSpreadsheets2::testImportCellStyle() uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW); - rtl::OUString aCellFamilyName(RTL_CONSTASCII_USTRINGPARAM("CellStyles")); + rtl::OUString aCellFamilyName("CellStyles"); uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName); uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW); @@ -283,7 +283,7 @@ void XSpreadsheets2::testImportCellStyle() uno::Any aCellStyle = xCellStylesFamilyNameAccess->getByName(aDestStyleName); uno::Reference< beans::XPropertySet > xCellStyleProp (aCellStyle, UNO_QUERY_THROW); - rtl::OUString aProperty(RTL_CONSTASCII_USTRINGPARAM("VertJustify")); + rtl::OUString aProperty("VertJustify"); sal_Int32 aVertJustify = 0; CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify); @@ -308,7 +308,7 @@ uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::O uno::Reference< sheet::XNamedRanges> XSpreadsheets2::getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument> xDoc) { uno::Reference< beans::XPropertySet > xPropSet (xDoc, UNO_QUERY_THROW); - rtl::OUString NamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString NamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(NamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); @@ -343,7 +343,7 @@ void XSpreadsheets2::importSheetToCopy() bool XSpreadsheets2::isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent ) { - rtl::OUString aStart(RTL_CONSTASCII_USTRINGPARAM("'file://")); + rtl::OUString aStart("'file://"); const sal_Char* sSrcContent = rtl::OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr(); return (aDestContent.endsWithIgnoreAsciiCaseAsciiL(sSrcContent, aSrcContent.getLength()) // same cell address diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx index 95c54a097693..c107f2aa7b44 100644 --- a/testtools/source/performance/pseudo.cxx +++ b/testtools/source/performance/pseudo.cxx @@ -191,7 +191,7 @@ static void SAL_CALL pseudo_Mapping_acquire( uno_Mapping * pMapping ) { if (1 == osl_atomic_increment( & static_cast< pseudo_Mapping * >( pMapping )->nRef )) { - OUString aMappingPurpose( RTL_CONSTASCII_USTRINGPARAM("pseudo") ); + OUString aMappingPurpose("pseudo"); uno_registerMapping( &pMapping, pseudo_Mapping_free, (uno_Environment *)((pseudo_Mapping *)pMapping)->pFrom, @@ -247,7 +247,7 @@ extern "C" void SAL_CALL uno_ext_getMapping( if (0 == rtl_ustr_ascii_compare( pFrom->pTypeName->buffer, UNO_LB_UNO ) && 0 == rtl_ustr_ascii_compare( pTo->pTypeName->buffer, UNO_LB_UNO )) { - OUString aMappingPurpose( RTL_CONSTASCII_USTRINGPARAM("pseudo") ); + OUString aMappingPurpose("pseudo"); // ref count is initially 1 pMapping = new pseudo_uno::pseudo_Mapping( pFrom->pExtEnv, pTo->pExtEnv ); uno_registerMapping( &pMapping, pseudo_uno::pseudo_Mapping_free, diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 5550547e52b2..5d02eeee0d60 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -965,7 +965,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) // defaults FILE * stream = stderr; sal_Int64 nLoop = NLOOP; - OUString aArg( RTL_CONSTASCII_USTRINGPARAM("dms") ); + OUString aArg("dms"); try { @@ -1123,8 +1123,8 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) out( "\" ..." ); oslProcess hProcess = 0; - OUString aUnoExe( RTL_CONSTASCII_USTRINGPARAM("uno") ); - OUString aWorkingDir( RTL_CONSTASCII_USTRINGPARAM(".") ); + OUString aUnoExe("uno"); + OUString aWorkingDir("."); osl_executeProcess( aUnoExe.pData, pArgs, sizeof(aArgs) / sizeof(OUString), osl_Process_SEARCHPATH | osl_Process_DETACHED | osl_Process_NORMAL, diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 0f5d3ea3bd8d..7ba7f420b055 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -152,7 +152,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument Reference<XPropertySet> xDialogProp(xDialogModel,UNO_QUERY); if ( xDialogProp.is() ) { - static const ::rtl::OUString s_sResourceResolver(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver")); + static const ::rtl::OUString s_sResourceResolver("ResourceResolver"); Reference<XPropertySet> xThis(*this,UNO_QUERY); xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver)); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE))); @@ -175,7 +175,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel")); + const ::rtl::OUString sServiceName("com.sun.star.awt.tab.UnoControlTabPageModel"); return Sequence<rtl::OUString>(&sServiceName, 1); } //============================================================================= diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 3b03d1a44008..43e26c4dc127 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -284,7 +284,7 @@ void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEvent OUString SAL_CALL MutableTreeDataModel::getImplementationName( ) throw (RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.MutableTreeDataModel" ) ); + static const OUString aImplName( "toolkit.MutableTreeDataModel" ); return aImplName; } @@ -633,7 +633,7 @@ OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( ) throw (RuntimeExce OUString SAL_CALL MutableTreeNode::getImplementationName( ) throw (RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.MutableTreeNode" ) ); + static const OUString aImplName( "toolkit.MutableTreeNode" ); return aImplName; } @@ -650,7 +650,7 @@ sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) throw (RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); - static const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.tree.MutableTreeNode" ) ); + static const OUString aServiceName( "com.sun.star.awt.tree.MutableTreeNode" ); static const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 5e6c64b056cc..97fe8dce2380 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -295,7 +295,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti //------------------------------------------------------------------------ ::rtl::OUString UnoControlHolderList::impl_getFreeName_throw() { - ::rtl::OUString name( RTL_CONSTASCII_USTRINGPARAM( "control_" ) ); + ::rtl::OUString name( "control_" ); for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId ) { ::rtl::OUString candidateName( name + ::rtl::OUString::valueOf( candidateId ) ); @@ -337,7 +337,7 @@ void implUpdateVisibility ( xModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM( "Step" ) ); + ::rtl::OUString aPropName( "Step" ); sal_Int32 nControlStep = 0; if ( xInfo->hasPropertyByName( aPropName ) ) { @@ -776,7 +776,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT ( xModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM( "Step" ) ); + ::rtl::OUString aPropName( "Step" ); if ( xInfo->hasPropertyByName( aPropName ) ) { ::com::sun::star::uno::Any aVal = xPSet->getPropertyValue( aPropName ); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 6e35c664e465..2def6aef5d80 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1014,7 +1014,7 @@ sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) ::com::sun::star::uno::Sequence< ::rtl::OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlModel" ) ); + ::rtl::OUString sName( "com.sun.star.awt.UnoControlModel" ); return Sequence< ::rtl::OUString >( &sName, 1 ); } diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 70a29ffc9bde..98b509be625f 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -63,7 +63,7 @@ namespace toolkitform */ sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel ) SAL_THROW(( Exception )) { - static const ::rtl::OUString FM_PROP_CLASSID(RTL_CONSTASCII_USTRINGPARAM("ClassId")); + static const ::rtl::OUString FM_PROP_CLASSID("ClassId"); sal_Int16 nControlType = FormComponentType::CONTROL; Reference< XPropertySetInfo > xPSI; @@ -243,7 +243,7 @@ namespace toolkitform */ void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< ::rtl::OUString >& _rVector ) { - static const ::rtl::OUString FM_PROP_STRINGITEMLIST(RTL_CONSTASCII_USTRINGPARAM("StringItemList")); + static const ::rtl::OUString FM_PROP_STRINGITEMLIST("StringItemList"); Sequence< ::rtl::OUString > aListEntries; OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_STRINGITEMLIST ) >>= aListEntries ); ::std::copy( aListEntries.getConstArray(), aListEntries.getConstArray() + aListEntries.getLength(), @@ -283,11 +283,11 @@ namespace toolkitform // -------------------------------- // Name, Description, Text OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString(FM_PROP_NAME) ) >>= _rpDescriptor->Name ); - static const ::rtl::OUString FM_PROP_HELPTEXT(RTL_CONSTASCII_USTRINGPARAM("HelpText")); + static const ::rtl::OUString FM_PROP_HELPTEXT("HelpText"); OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_HELPTEXT ) >>= _rpDescriptor->Description ); Any aText; - static const ::rtl::OUString FM_PROP_TEXT(RTL_CONSTASCII_USTRINGPARAM("Text")); - static const ::rtl::OUString FM_PROP_LABEL(RTL_CONSTASCII_USTRINGPARAM("Label")); + static const ::rtl::OUString FM_PROP_TEXT("Text"); + static const ::rtl::OUString FM_PROP_LABEL("Label"); if ( xPSI->hasPropertyByName( FM_PROP_TEXT ) ) aText = xModelProps->getPropertyValue( FM_PROP_TEXT ); else if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) ) @@ -297,21 +297,21 @@ namespace toolkitform // -------------------------------- // readonly - static const ::rtl::OUString FM_PROP_READONLY(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + static const ::rtl::OUString FM_PROP_READONLY("ReadOnly"); if ( xPSI->hasPropertyByName( FM_PROP_READONLY ) ) OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_READONLY ) >>= _rpDescriptor->ReadOnly ); // -------------------------------- // border { - static const ::rtl::OUString FM_PROP_BORDER(RTL_CONSTASCII_USTRINGPARAM("Border")); + static const ::rtl::OUString FM_PROP_BORDER("Border"); if ( xPSI->hasPropertyByName( FM_PROP_BORDER ) ) { sal_Int16 nBorderType = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_BORDER ) >>= nBorderType ); _rpDescriptor->Border = ( nBorderType != 0 ); - ::rtl::OUString sBorderColorPropertyName( RTL_CONSTASCII_USTRINGPARAM( "BorderColor" ) ); + ::rtl::OUString sBorderColorPropertyName( "BorderColor" ); if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) ) { sal_Int32 nBoderColor = COL_TRANSPARENT; @@ -325,7 +325,7 @@ namespace toolkitform // -------------------------------- // background color - static const ::rtl::OUString FM_PROP_BACKGROUNDCOLOR(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor")); + static const ::rtl::OUString FM_PROP_BACKGROUNDCOLOR("BackgroundColor"); if ( xPSI->hasPropertyByName( FM_PROP_BACKGROUNDCOLOR ) ) { sal_Int32 nBackColor = COL_TRANSPARENT; @@ -336,7 +336,7 @@ namespace toolkitform // -------------------------------- // text color - static const ::rtl::OUString FM_PROP_TEXTCOLOR(RTL_CONSTASCII_USTRINGPARAM("TextColor")); + static const ::rtl::OUString FM_PROP_TEXTCOLOR("TextColor"); if ( xPSI->hasPropertyByName( FM_PROP_TEXTCOLOR ) ) { sal_Int32 nTextColor = COL_TRANSPARENT; @@ -351,7 +351,7 @@ namespace toolkitform // multi line and word break // The MultiLine property of the control is mapped to both the "MULTILINE" and // "WORDBREAK" style flags - static const ::rtl::OUString FM_PROP_MULTILINE(RTL_CONSTASCII_USTRINGPARAM("MultiLine")); + static const ::rtl::OUString FM_PROP_MULTILINE("MultiLine"); if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) ) { sal_Bool bMultiLine = sal_False; @@ -361,7 +361,7 @@ namespace toolkitform } // ............................ // horizontal alignment - static const ::rtl::OUString FM_PROP_ALIGN(RTL_CONSTASCII_USTRINGPARAM("Align")); + static const ::rtl::OUString FM_PROP_ALIGN("Align"); if ( xPSI->hasPropertyByName( FM_PROP_ALIGN ) ) { sal_Int16 nAlign = awt::TextAlign::LEFT; @@ -380,7 +380,7 @@ namespace toolkitform // ............................ // vertical alignment { - ::rtl::OUString sVertAlignPropertyName( RTL_CONSTASCII_USTRINGPARAM( "VerticalAlign" ) ); + ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) { sal_Int16 nAlign = VerticalAlignment_MIDDLE; @@ -397,7 +397,7 @@ namespace toolkitform } // font - static const ::rtl::OUString FM_PROP_FONT(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor")); + static const ::rtl::OUString FM_PROP_FONT("FontDescriptor"); if ( xPSI->hasPropertyByName( FM_PROP_FONT ) ) { FontDescriptor aUNOFont; @@ -406,7 +406,7 @@ namespace toolkitform } // tab order - rtl::OUString aTabIndexString( RTL_CONSTASCII_USTRINGPARAM( "TabIndex" ) ); + rtl::OUString aTabIndexString( "TabIndex" ); if ( xPSI->hasPropertyByName( aTabIndexString ) ) { sal_Int16 nIndex = -1; @@ -426,7 +426,7 @@ namespace toolkitform pEditWidget->MultiLine = ( _rpDescriptor->TextStyle & TEXT_DRAW_MULTILINE ) != 0; // ............................ // password input - ::rtl::OUString sEchoCharPropName( RTL_CONSTASCII_USTRINGPARAM( "EchoChar" ) ); + ::rtl::OUString sEchoCharPropName( "EchoChar" ); if ( xPSI->hasPropertyByName( sEchoCharPropName ) ) { sal_Int16 nEchoChar = 0; @@ -435,12 +435,12 @@ namespace toolkitform } // ............................ // file select - static const ::rtl::OUString FM_SUN_COMPONENT_FILECONTROL(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FileControl")); + static const ::rtl::OUString FM_SUN_COMPONENT_FILECONTROL("com.sun.star.form.component.FileControl"); if ( xSI->supportsService( FM_SUN_COMPONENT_FILECONTROL ) ) pEditWidget->FileSelect = true; // ............................ // maximum text length - static const ::rtl::OUString FM_PROP_MAXTEXTLEN(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")); + static const ::rtl::OUString FM_PROP_MAXTEXTLEN("MaxTextLen"); if ( xPSI->hasPropertyByName( FM_PROP_MAXTEXTLEN ) ) { sal_Int16 nMaxTextLength = 0; @@ -459,7 +459,7 @@ namespace toolkitform ::vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< ::vcl::PDFWriter::PushButtonWidget* >( _rpDescriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "ButtonType" ) ) >>= eButtonType ); - static const ::rtl::OUString FM_PROP_TARGET_URL(RTL_CONSTASCII_USTRINGPARAM("TargetURL")); + static const ::rtl::OUString FM_PROP_TARGET_URL("TargetURL"); if ( eButtonType == FormButtonType_SUBMIT ) { // if a button is a submit button, then it uses the URL at it's parent form @@ -518,7 +518,7 @@ namespace toolkitform // -------------------------------- // check boxes - static const ::rtl::OUString FM_PROP_STATE(RTL_CONSTASCII_USTRINGPARAM("State")); + static const ::rtl::OUString FM_PROP_STATE("State"); if ( _rpDescriptor->getType() == ::vcl::PDFWriter::CheckBox ) { ::vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< ::vcl::PDFWriter::CheckBoxWidget* >( _rpDescriptor.get() ); @@ -538,7 +538,7 @@ namespace toolkitform pRadioWidget->RadioGroup = determineRadioGroupId( xModelProps ); try { - static const ::rtl::OUString FM_PROP_REFVALUE(RTL_CONSTASCII_USTRINGPARAM("RefValue")); + static const ::rtl::OUString FM_PROP_REFVALUE("RefValue"); xModelProps->getPropertyValue( FM_PROP_REFVALUE ) >>= pRadioWidget->OnValue; } catch(...) @@ -554,7 +554,7 @@ namespace toolkitform ::vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< ::vcl::PDFWriter::ListBoxWidget* >( _rpDescriptor.get() ); // ............................ // drop down - static const ::rtl::OUString FM_PROP_DROPDOWN(RTL_CONSTASCII_USTRINGPARAM("Dropdown")); + static const ::rtl::OUString FM_PROP_DROPDOWN("Dropdown"); OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_DROPDOWN ) >>= pListWidget->DropDown ); // ............................ // multi selection diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx index 477be2673568..336e8ae5dfeb 100644 --- a/ucb/workben/cachemap/cachemaptest.cxx +++ b/ucb/workben/cachemap/cachemaptest.cxx @@ -44,7 +44,7 @@ template< typename Cont, typename ContRef, typename Obj > sal_uInt32 test(Obj *) { ContRef xCont(new Cont); - rtl::OUString aPrefix(RTL_CONSTASCII_USTRINGPARAM("key")); + rtl::OUString aPrefix("key"); sal_uInt32 nTimer = osl_getGlobalTimer(); for (int i = 0; i < 100000; i += 5) { diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index db4e94e6dc93..9ac7876bf98a 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -124,18 +124,18 @@ using namespace ::rtl; +(void)applyAttributesFrom:(Sequence < PropertyValue >)attributes toString:(NSMutableAttributedString *)string forRange:(NSRange)range storeDefaultsTo:(AquaA11yWrapper *)wrapperStore getDefaultsFrom:(AquaA11yWrapper *)wrapper { NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; // constants - static const OUString attrUnderline(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")); - static const OUString attrBold(RTL_CONSTASCII_USTRINGPARAM("CharWeight")); - static const OUString attrFontname(RTL_CONSTASCII_USTRINGPARAM("CharFontName")); - static const OUString attrItalic(RTL_CONSTASCII_USTRINGPARAM("CharPosture")); - static const OUString attrHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight")); - static const OUString attrStrikethrough(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout")); - static const OUString attrShadow(RTL_CONSTASCII_USTRINGPARAM("CharShadowed")); - static const OUString attrUnderlineColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor")); - static const OUString attrUnderlineHasColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor")); - static const OUString attrForegroundColor(RTL_CONSTASCII_USTRINGPARAM("CharColor")); - static const OUString attrBackgroundColor(RTL_CONSTASCII_USTRINGPARAM("CharBackColor")); - static const OUString attrSuperscript(RTL_CONSTASCII_USTRINGPARAM("CharEscapement")); + static const OUString attrUnderline("CharUnderline"); + static const OUString attrBold("CharWeight"); + static const OUString attrFontname("CharFontName"); + static const OUString attrItalic("CharPosture"); + static const OUString attrHeight("CharHeight"); + static const OUString attrStrikethrough("CharStrikeout"); + static const OUString attrShadow("CharShadowed"); + static const OUString attrUnderlineColor("CharUnderlineColor"); + static const OUString attrUnderlineHasColor("CharUnderlineHasColor"); + static const OUString attrForegroundColor("CharColor"); + static const OUString attrBackgroundColor("CharBackColor"); + static const OUString attrSuperscript("CharEscapement"); // vars OUString fontname; int fonttraits = 0; diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index c0bc111e947f..40a0e5579062 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -265,7 +265,7 @@ void InitSalData() const ::rtl::OUString& SalGetDesktopEnvironment() { - static OUString aDesktopEnvironment(RTL_CONSTASCII_USTRINGPARAM( "MacOSX" )); + static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; } diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 904ba91024aa..af86b28644a8 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -487,7 +487,7 @@ static bool AddLocalTempFontDirs( void ) // add private font files - rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ); + rtl::OUString aBrandStr( "$BRAND_BASE_DIR" ); rtl_bootstrap_expandMacros( &aBrandStr.pData ); rtl::OUString aBrandSysPath; OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx index d99a18f59f14..91dd16077d18 100644 --- a/vcl/ios/source/app/salinst.cxx +++ b/vcl/ios/source/app/salinst.cxx @@ -156,7 +156,7 @@ void InitSalData() const ::rtl::OUString& SalGetDesktopEnvironment() { - static OUString aDesktopEnvironment(RTL_CONSTASCII_USTRINGPARAM( "CocoaTouch" )); + static OUString aDesktopEnvironment( "CocoaTouch" ); return aDesktopEnvironment; } diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 8b7714dc030c..e98dfc2dce8f 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -246,7 +246,7 @@ static bool is_kde_desktop( Display* pDisplay ) return true; // does not exist => KDE3 } - rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "3" ) ); + rtl::OUString aVer( "3" ); if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) { return true; @@ -263,7 +263,7 @@ static bool is_kde4_desktop( Display* pDisplay ) { if ( NULL != getenv( "KDE_FULL_SESSION" ) ) { - rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "4" ) ); + rtl::OUString aVer( "4" ); const char *pVer = getenv( "KDE_SESSION_VERSION" ); if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 290020883ee1..40c78c997f14 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -836,7 +836,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length { - static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." )); + static const OUString aStarDot( "*." ); ::rtl::OUString aNewFilter; ::rtl::OUString aOldFilter = getCurrentFilter(); @@ -1837,7 +1837,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName.getStr() ); - static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." )); + static const OUString aStarDot( "*." ); OUString aTokens; bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 3f8b67bbacd3..236a0dfa7354 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -189,7 +189,7 @@ void SalGtkPicker::setGtkLanguage() if (aBuffer.getLength() > 8) { - rtl::OUString envVar( RTL_CONSTASCII_USTRINGPARAM( "LANGUAGE" ) ); + rtl::OUString envVar( "LANGUAGE" ); osl_setEnvironment( envVar.pData, aBuffer.makeStringAndClear().pData ); } bSet = true; diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 3a8819382cf4..c97e16e01212 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -1133,7 +1133,7 @@ GtkPrintDialog::impl_readFromSettings() vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); + const rtl::OUString aPrintDialogStr("PrintDialog"); const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr, rtl::OUString("CopyCount"))); const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr, @@ -1171,7 +1171,7 @@ const vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); + const rtl::OUString aPrintDialogStr("PrintDialog"); pItem->setValue(aPrintDialogStr, rtl::OUString("CopyCount"), rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index d9cf2f0c6e01..914768a3852b 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -704,9 +704,9 @@ void UnxFilePicker::initFilePicker() // The executable name #ifdef ENABLE_TDE - rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/tdefilepicker")); + rtl::OUString helperurl("${ORIGIN}/tdefilepicker"); #else // ENABLE_TDE - rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/kdefilepicker")); + rtl::OUString helperurl("${ORIGIN}/kdefilepicker"); #endif // ENABLE_TDE rtl::Bootstrap::expandMacros( helperurl ); rtl::OUString helperpath; @@ -827,12 +827,12 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rT sal_Int32 nTitle; } ElementToName; - const ::rtl::OUString aCheckBox( RTL_CONSTASCII_USTRINGPARAM( "checkbox" ) ); - const ::rtl::OUString aControl( RTL_CONSTASCII_USTRINGPARAM( "control" ) ); - const ::rtl::OUString aEdit( RTL_CONSTASCII_USTRINGPARAM( "edit" ) ); - const ::rtl::OUString aLabel( RTL_CONSTASCII_USTRINGPARAM( "label" ) ); - const ::rtl::OUString aListBox( RTL_CONSTASCII_USTRINGPARAM( "listbox" ) ); - const ::rtl::OUString aPushButton( RTL_CONSTASCII_USTRINGPARAM( "pushbutton" ) ); + const ::rtl::OUString aCheckBox( "checkbox" ); + const ::rtl::OUString aControl( "control" ); + const ::rtl::OUString aEdit( "edit" ); + const ::rtl::OUString aLabel( "label" ); + const ::rtl::OUString aListBox( "listbox" ); + const ::rtl::OUString aPushButton( "pushbutton" ); const ElementToName *pPtr; const ElementToName pArray[] = diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 276c427e1136..9f301394bf9b 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -1062,7 +1062,7 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() const ::rtl::OUString& SalGetDesktopEnvironment() { - static ::rtl::OUString aDesktopEnvironment( RTL_CONSTASCII_USTRINGPARAM( "Windows" ) ); + static ::rtl::OUString aDesktopEnvironment( "Windows" ); return aDesktopEnvironment; } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f70965f9b6d7..3adc177db5c3 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -90,7 +90,7 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString > SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString( "Office.Common/Save")), m_nODF(0) { - OUString sDef(RTL_CONSTASCII_USTRINGPARAM("ODF/DefaultVersion")); + OUString sDef("ODF/DefaultVersion"); Sequence< css::uno::Any > aValues = GetProperties( Sequence<OUString>(&sDef,1) ); if ( aValues.getLength() == 1) { @@ -121,9 +121,9 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) bool bIsXML = false; bool bPropsAvailable = false; - const OUString sPropFullPath(RTL_CONSTASCII_USTRINGPARAM("FullPath")); - const OUString sPropMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); - const OUString sPropDigest(RTL_CONSTASCII_USTRINGPARAM("Digest")); + const OUString sPropFullPath("FullPath"); + const OUString sPropMediaType("MediaType"); + const OUString sPropDigest("Digest"); for (int i = 0; i < m_manifest.getLength(); i++) { @@ -156,7 +156,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) //Files can only be encrypted if they are in the manifest.xml. //That is, the current file cannot be encrypted, otherwise bPropsAvailable //would be true. - OUString aXMLExt( RTL_CONSTASCII_USTRINGPARAM( "XML" ) ); + OUString aXMLExt( "XML" ); sal_Int32 nSep = rURI.lastIndexOf( '.' ); if ( nSep != (-1) ) { diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index ab85dca66dea..817ec2be3712 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -85,7 +85,7 @@ namespace XmlSec { vector< pair< OUString, OUString > > vecAttrValueOfDN = parseDN(rRawString); ::rtl::OUStringBuffer s1, s2; - OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = ")); + OUString sEqual(" = "); typedef vector< pair < OUString, OUString > >::const_iterator CIT; for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i) { |