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>

7 files changed, 22 insertions, 22 deletions

diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index f40f964732e1..5de9580fd3fa 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -96,7 +96,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
+                OUString( "com.sun.star.ui.AddressBookSourceDialog" );
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
@@ -109,7 +109,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilterOptionsDialog" ));
+                OUString( "com.sun.star.ui.dialogs.FilterOptionsDialog" );
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 6707dfcb0d68..86bdf797e6cb 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -404,7 +404,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         {
             Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY );
             if ( !xDataModel.is() )
-                throw GridInvalidDataException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid data model." ) ), *this );
+                throw GridInvalidDataException( ::rtl::OUString( "Invalid data model." ), *this );
 
             m_pTableModel->setDataModel( xDataModel );
             impl_checkTableModelInit();
@@ -416,7 +416,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
             // obtain new col model
             Reference< XGridColumnModel > const xColumnModel( aValue, UNO_QUERY );
             if ( !xColumnModel.is() )
-                throw GridInvalidModelException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid column model." ) ), *this );
+                throw GridInvalidModelException( ::rtl::OUString( "Invalid column model." ), *this );
 
             // remove all old columns
             m_pTableModel->removeAllColumns();
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 14e3bc4960cf..becdcd04bbbf 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -148,7 +148,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const
     {
         try
         {
-            xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))),UNO_QUERY);
+            xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )),UNO_QUERY);
         }
         catch ( Exception& )
         {
@@ -380,7 +380,7 @@ throw (::com::sun::star::uno::RuntimeException)
             Sequence<PropertyValue>   aArgs( 1 );
 
             // Provide key modifier information to dispatch function
-            aArgs[0].Name   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+            aArgs[0].Name   = rtl::OUString( "KeyModifier" );
             aArgs[0].Value  = makeAny( KeyModifier );
 
             aTargetURL.Complete = aCommandURL;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 809cf61c83ba..692b23a9a9c2 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1467,7 +1467,7 @@ bool TreeControlPeer::loadImage( const ::rtl::OUString& rURL, Image& rImage )
     if( mxGraphicProvider.is() ) try
     {
         ::com::sun::star::beans::PropertyValues aProps( 1 );
-        aProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+        aProps[0].Name = OUString( "URL" );
         aProps[0].Value <<= rURL;
 
         Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic( aProps ) );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 49edf88dd409..43612825ac3f 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1449,7 +1449,7 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE
         xRoadmapItem = evt.Source;
         sal_Int32 nID = 0;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" ));
         aValue >>= nID;
 
         ::com::sun::star::uno::Any rVal = evt.NewValue;
@@ -1498,11 +1498,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
     if ( xPropertySet.is() )
     {
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Label" ));
         aValue >>= aCurRMItemData.Label;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" ));
         aValue >>= aCurRMItemData.n_ID;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" )));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Enabled" ));
         aValue >>= aCurRMItemData.b_Enabled;
     }
     return aCurRMItemData;
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 26ba6f636c03..8fa36eb35faf 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -401,18 +401,18 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam
     throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" ));
+    aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.image.ImageMapObject" );
     switch( mnType )
     {
     case IMAP_OBJ_POLYGON:
     default:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapPolygonObject" );
         break;
     case IMAP_OBJ_RECTANGLE:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapRectangleObject" );
         break;
     case IMAP_OBJ_CIRCLE:
-        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapCircleObject" );
         break;
     }
     return aSNS;
@@ -424,11 +424,11 @@ Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNam
     {
     case IMAP_OBJ_POLYGON:
     default:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapPolygonObject");
     case IMAP_OBJ_CIRCLE:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapCircleObject");
     case IMAP_OBJ_RECTANGLE:
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") );
+        return ::rtl::OUString("org.openoffice.comp.svt.ImageMapRectangleObject");
     }
 }
 
@@ -721,7 +721,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements(  ) throw(RuntimeException)
 ::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
     throw(RuntimeException)
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svt.SvUnoImageMap" ) );
+    return ::rtl::OUString( "org.openoffice.comp.svt.SvUnoImageMap" );
 }
 
 sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 5d9ffac6ebc2..bb8a2bfcbd61 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -158,7 +158,7 @@ namespace svt { namespace uno
             {
                 if ( i_rPaths[i][0] != nFirstPageId )
                     throw IllegalArgumentException(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "All paths must start with the same page id." ) ),
+                        ::rtl::OUString( "All paths must start with the same page id." ),
                         i_rContext, 2 );
             }
         }
@@ -240,14 +240,14 @@ namespace svt { namespace uno
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) );
+        return ::rtl::OUString( "com.sun.star.comp.svtools.uno.Wizard" );
     }
 
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aServices(1);
-        aServices[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Wizard" ) );
+        aServices[0] = ::rtl::OUString( "com.sun.star.ui.dialogs.Wizard" );
         return aServices;
     }