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>

7 files changed, 26 insertions, 27 deletions

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