automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 13 insertions, 13 deletions

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index a9e3e4dd9060..51b93e538db8 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -391,7 +391,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG  )
     // Get the Content
     ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() );
     Sequence< rtl::OUString > aProps( 1 );
-    aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+    aProps[0] = rtl::OUString( "Title" );
 
     try
     {
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 3df3fbff76d0..639ddfe8dca9 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -321,9 +321,9 @@ void AssignmentPersistentData::Commit()
 
     // -------------------------------------------------------------------
     AssignmentPersistentData::AssignmentPersistentData()
-        :ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.DataAccess/AddressBook" )))
+        :ConfigItem( ::rtl::OUString( "Office.DataAccess/AddressBook" ))
     {
-        Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fields")));
+        Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString("Fields"));
         const ::rtl::OUString* pStoredNames = aStoredNames.getConstArray();
         for (sal_Int32 i=0; i<aStoredNames.getLength(); ++i, ++pStoredNames)
             m_aStoredFields.insert(*pStoredNames);
@@ -348,7 +348,7 @@ void AssignmentPersistentData::Commit()
         {
             ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/"));
             sFieldPath += _rLogicalName;
-            sFieldPath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName"));
+            sFieldPath += ::rtl::OUString("/AssignedFieldName");
             sAssignment = getStringProperty(sFieldPath);
         }
         return sAssignment;
@@ -421,17 +421,17 @@ void AssignmentPersistentData::Commit()
 
         // Fields/<field>
         ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath);
-        sFieldElementNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        sFieldElementNodePath += ::rtl::OUString("/");
         sFieldElementNodePath += _rLogicalName;
 
         Sequence< PropertyValue > aNewFieldDescription(2);
         // Fields/<field>/ProgrammaticFieldName
         aNewFieldDescription[0].Name = sFieldElementNodePath;
-        aNewFieldDescription[0].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/ProgrammaticFieldName"));
+        aNewFieldDescription[0].Name += ::rtl::OUString("/ProgrammaticFieldName");
         aNewFieldDescription[0].Value <<= _rLogicalName;
         // Fields/<field>/AssignedFieldName
         aNewFieldDescription[1].Name = sFieldElementNodePath;
-        aNewFieldDescription[1].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/AssignedFieldName"));
+        aNewFieldDescription[1].Name += ::rtl::OUString("/AssignedFieldName");
         aNewFieldDescription[1].Value <<= _rAssignment;
 
         // just set the new value
@@ -1236,7 +1236,7 @@ void AssignmentPersistentData::Commit()
                 if ( xProp.is() )
                 {
                     ::rtl::OUString sName;
-                    xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName;
+                    xProp->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sName;
 
                     INetURLObject aURL( sName );
                     if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 0b7cfbcd78a0..92c64ff6f177 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -87,7 +87,7 @@ short SvColorDialog::Execute()
         Sequence< PropertyValue > props( 2 );
         props[0].Name = sColor;
         props[0].Value <<= (sal_Int32) maColor.GetColor();
-        props[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) );
+        props[1].Name = OUString( "Mode" );
         props[1].Value <<= (sal_Int16) meMode;
 
         xPropertyAccess->setPropertyValues( props );
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index af30375a2bee..29078cc949dd 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -108,8 +108,8 @@ void SvObjectServerList::FillInsertObjects()
         ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
         uno::Sequence< uno::Any > aArguments( 1 );
         beans::PropertyValue aPathProp;
-        aPathProp.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPathProp.Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/ObjectNames" ));
+        aPathProp.Name = ::rtl::OUString( "nodepath" );
+        aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Office.Embedding/ObjectNames" );
         aArguments[0] <<= aPathProp;
 
         uno::Reference< container::XNameAccess > xNameAccess(
@@ -135,8 +135,8 @@ void SvObjectServerList::FillInsertObjects()
                 {
                     ::rtl::OUString aUIName;
                     ::rtl::OUString aClassID;
-                    xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectUIName" )) ) >>= aUIName;
-                    xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" )) ) >>= aClassID;
+                    xEntry->getByName( ::rtl::OUString( "ObjectUIName" ) ) >>= aUIName;
+                    xEntry->getByName( ::rtl::OUString( "ClassID" ) ) >>= aClassID;
 
                     if ( !aUIName.isEmpty() )
                     {