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, 16 insertions, 16 deletions

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