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>

2 files changed, 24 insertions, 24 deletions

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