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/2835Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>

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/2835Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
39d45390 · Thomas Arnhold · 5c908d04 · 39d45390 · 39d45390 · 39d45390
Kaydet (Commit) 39d45390 authored Mar 19, 2013 tarafından Thomas Arnhold
348 changed files
--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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 );


--- 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;

--- 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;

--- 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" );
        }
    }


--- 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 );


--- 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 ];

--- 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 )

--- 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();

--- 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);

--- 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);
        }


--- 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;

--- 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(  );


--- 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)

--- 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;

--- 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

--- 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;
    }


--- 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());
                }

--- 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"));