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>

9 files changed, 20 insertions, 20 deletions

diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 59efcf79c225..e4367dabd1f9 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -421,7 +421,7 @@ void aqua_init_systray()
             std::set< rtl::OUString > aFileNewAppsAvailable;
             SvtDynamicMenuOptions aOpt;
             Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU );
-            const rtl::OUString sURLKey( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+            const rtl::OUString sURLKey( "URL" );
         
             const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray();
             const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 87a20873131c..9c126122f7c9 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -130,7 +130,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
                     : SfxChildWindow( pParentWnd , nId )
 {
     uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
-    const rtl::OUString aDockWindowResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ));
+    const rtl::OUString aDockWindowResourceURL( "private:resource/dockingwindow/" );
 
     SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd,
         WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index b63e28a53006..173d44f3bb89 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -114,13 +114,13 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl
         xFrame, ::com::sun::star::uno::UNO_QUERY );
     try
     {
-        const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ));
+        const ::rtl::OUString aLayoutManager( "LayoutManager" );
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet;
 
         ::com::sun::star::uno::Any a = xPropSet->getPropertyValue( aLayoutManager );
         if ( a >>= xLMPropSet )
         {
-            const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" ));
+            const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" );
             xLMPropSet->setPropertyValue( aAutomaticToolbars, ::com::sun::star::uno::Any( sal_False ));
         }
     }
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index e1b1dad6980b..ec10f80824b9 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -172,7 +172,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
 {
     // Retrieve label from helper function
     uno::Reference< frame::XFrame > xFrame = GetBindings().GetActiveFrame();
-    rtl::OUString aCommandStr( RTL_CONSTASCII_USTRINGPARAM( ".uno:StopRecording" ));
+    rtl::OUString aCommandStr( ".uno:StopRecording" );
     aTbx.SetItemText( SID_STOP_RECORDING, GetLabelFromCommandURL( aCommandStr, xFrame ));
 
     // Determine size of toolbar
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 5b29d130ddc9..f84def52eb8d 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -332,7 +332,7 @@ namespace sfx2
                     bHasMacroLib = sal_False;
                 else
                 {
-                    ::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+                    ::rtl::OUString aStdLibName( "Standard" );
                     Sequence< ::rtl::OUString > aElements = xContainer->getElementNames();
                     if ( aElements.getLength() )
                     {
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index e23229e1e491..770625aa2900 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -52,12 +52,12 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R
 
     xWriterHandler->setOutputStream( xOutStream );
 
-    ::rtl::OUString aGroupListElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group-list" ) );
-    ::rtl::OUString aGroupElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group" ) );
-    ::rtl::OUString aNameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:name" ) );
-    ::rtl::OUString aUINameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:default-ui-name" ) );
-    ::rtl::OUString aCDATAString( RTL_CONSTASCII_USTRINGPARAM ( "CDATA" ) );
-    ::rtl::OUString aWhiteSpace( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+    ::rtl::OUString aGroupListElement( "groupuinames:template-group-list" );
+    ::rtl::OUString aGroupElement( "groupuinames:template-group" );
+    ::rtl::OUString aNameAttr( "groupuinames:name" );
+    ::rtl::OUString aUINameAttr( "groupuinames:default-ui-name" );
+    ::rtl::OUString aCDATAString( "CDATA" );
+    ::rtl::OUString aWhiteSpace( " " );
 
     // write the namespace
     ::comphelper::AttributeList* pRootAttrList = new ::comphelper::AttributeList;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index bd3910ac7716..c873e46d7574 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -197,7 +197,7 @@ public:
                     ::rtl::OUString( "com.sun.star.document.Settings" ) ),
                 uno::UNO_QUERY_THROW );
 
-            ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) );
+            ::rtl::OUString aLoadReadonlyString( "LoadReadonly" );
 
             try
             {
@@ -219,7 +219,7 @@ public:
     {
         if ( m_bRestoreSettings )
         {
-            ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) );
+            ::rtl::OUString aLoadReadonlyString( "LoadReadonly" );
 
             try
             {
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 87b3a88a3294..d052c39240d1 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -391,7 +391,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
                 if (  Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
                 {
-                    rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                    rtl::OUString aSlotURL( "slot:" );
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
                     Image aImage = GetImage( xFrame, aSlotURL, false );
                     pSVMenu->SetItemImage( nSlotId, aImage );
@@ -467,7 +467,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                         }
                         else
                         {
-                            rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                            rtl::OUString aSlotURL( "slot:" );
                             aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
                             aImage = GetImage( xFrame, aSlotURL, false );
                         }
@@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
                 }
                 else
                 {
-                    rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                    rtl::OUString aSlotURL( "slot:" );
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
                     pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
                 }
@@ -790,7 +790,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 
         if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
         {
-               rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+               rtl::OUString aSlotURL( "slot:" );
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
          pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false ));
         }
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index abb67f5c672c..dbcafa187056 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -268,7 +268,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nV
         aLoadArgs = aArgs.getPropertyValues();
 
         // load the doc into that frame
-        ::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
+        ::rtl::OUString sLoaderURL( "private:object" );
         Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW );
         xLoader->loadComponentFromURL(
             sLoaderURL,
@@ -397,7 +397,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
 
     if ( xLayoutManager.is() )
     {
-        rtl::OUString aMenuBarURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ));
+        rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" );
 
         if ( bOn )
             xLayoutManager->showElement( aMenuBarURL );