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

diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 766221a5badc..16fd91535a54 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -159,18 +159,18 @@ namespace svt
             Reference< XResultSet > xResultSet;
             Sequence< OUString > aProps(12);
 
-            aProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
-            aProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ));
-            aProps[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
-            aProps[3] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
-            aProps[4] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
-            aProps[5] = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
-            aProps[6] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ));
-            aProps[7] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVolume" ));
-            aProps[8] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemote" ));
-            aProps[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" ));
-            aProps[10] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFloppy" ));
-            aProps[11] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCompactDisc" ));
+            aProps[0] = OUString( "Title" );
+            aProps[1] = OUString( "Size" );
+            aProps[2] = OUString( "DateModified" );
+            aProps[3] = OUString( "DateCreated" );
+            aProps[4] = OUString( "IsFolder" );
+            aProps[5] = OUString( "TargetURL" );
+            aProps[6] = OUString( "IsHidden" );
+            aProps[7] = OUString( "IsVolume" );
+            aProps[8] = OUString( "IsRemote" );
+            aProps[9] = OUString( "IsRemoveable" );
+            aProps[10] = OUString( "IsFloppy" );
+            aProps[11] = OUString( "IsCompactDisc" );
 
             Reference< XCommandEnvironment > xEnvironment;
             try
@@ -266,8 +266,8 @@ namespace svt
                                 ::ucbhelper::Content aCnt( aTargetURL, xEnvironment, comphelper::getProcessComponentContext() );
                                 try
                                 {
-                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= pData->maSize;
-                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDT;
+                                aCnt.getPropertyValue( OUString( "Size" ) ) >>= pData->maSize;
+                                aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDT;
                                 }
                                 catch (...) {}
                             }
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 5b021fb8341b..25b1269270fa 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -823,7 +823,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     if ( aCommands.is() )
                         bEnableDelete
                             = aCommands->hasCommandByName(
-                                OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
+                                OUString( "delete" ) );
                     else
                         bEnableDelete = false;
                 }
@@ -842,7 +842,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     {
                         Property aProp
                             = aProps->getPropertyByName(
-                                OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) );
+                                OUString( "Title" ) );
                         bEnableRename
                             = !( aProp.Attributes & PropertyAttribute::READONLY );
                     }
@@ -926,7 +926,7 @@ void ViewTabListBox_Impl::DeleteEntries()
             if ( aCommands.is() )
                 canDelete
                     = aCommands->hasCommandByName(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
+                        OUString( "delete" ) );
             else
                 canDelete = false;
         }
@@ -1118,7 +1118,7 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
     try
     {
         ::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() );
-        aCnt.executeCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString( "delete" ), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException const & )
     {
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index d52382c87077..c433ef97a78a 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1089,7 +1089,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin
 
         case ::svt::BBTYPE_ROWHEADERBAR:
         case ::svt::BBTYPE_ROWHEADERCELL:
-            aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "error" ) );
+            aRetText = ::rtl::OUString( "error" );
             break;
 
         default:
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index f8547c2c12b8..e499cfd93e1e 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -665,7 +665,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL )
         uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
             task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
         uno::Sequence < beans::PropertyValue> aProps(1);
-        aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+        aProps[0].Name = ::rtl::OUString( "InteractionHandler" );
         aProps[0].Value <<= xInteractionHandler;
         m_xDocProps->loadFromMedium( rURL, aProps );
         pEditWin->fill( m_xDocProps, rURL );
@@ -747,7 +747,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
 
                         uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
                             task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
-                        aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+                        aArgs[3].Name = ::rtl::OUString( "InteractionHandler" );
                         aArgs[3].Value <<= xInteractionHandler;
 
                         b = sal_False;