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>

2 files changed, 7 insertions, 9 deletions

diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 51af243c0c62..458bded2165c 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -257,7 +257,7 @@ Any EnumerationImpl::nextElement()
     if (_nPos >= _pMgr->_aProviders.size())
     {
         throw NoSuchElementException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("there is no further element!") ),
+            OUString("there is no further element!"),
             (XWeak *)(OWeakObject *)this );
     }
     return makeAny( _pMgr->_aProviders[_nPos++] );
@@ -423,7 +423,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
             if (find( newProvs.begin(), newProvs.end(), xElem ) != newProvs.end())
             {
                 throw ElementExistException(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("provider already inserted!") ),
+                    OUString("provider already inserted!"),
                     (XWeak *)(OWeakObject *)this );
             }
 
@@ -530,7 +530,7 @@ void SAL_CALL ManagerImpl::remove( const Any & rElement )
         if (! (rElement >>= xElem))
         {
             throw IllegalArgumentException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("no type description provider given!") ),
+                OUString("no type description provider given!"),
                 (XWeak *)(OWeakObject *)this, 0 );
         }
 
@@ -539,7 +539,7 @@ void SAL_CALL ManagerImpl::remove( const Any & rElement )
         if (iFind == _aProviders.end())
         {
             throw NoSuchElementException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("provider not found!") ),
+                OUString("provider not found!"),
                 (XWeak *)(OWeakObject *)this );
         }
         _aProviders.erase( iFind );
@@ -654,7 +654,7 @@ TypeClass SequenceTypeDescriptionImpl::getTypeClass()
 OUString SequenceTypeDescriptionImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return (OUString( RTL_CONSTASCII_USTRINGPARAM("[]") ) + _xElementTD->getName());
+    return (OUString("[]") + _xElementTD->getName());
 }
 
 // XIndirectTypeDescription
diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
index 7433d11b84cc..ea44a750835e 100644
--- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
+++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
@@ -88,8 +88,7 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement()
         return xEnum->nextElement();
 
     throw container::NoSuchElementException(
-        rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
+        rtl::OUString("No further elements in enumeration!"),
         static_cast< cppu::OWeakObject * >( this  ) );
 }
 
@@ -111,8 +110,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
         return xEnum->nextTypeDescription();
 
     throw container::NoSuchElementException(
-        rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
+        rtl::OUString("No further elements in enumeration!"),
         static_cast< cppu::OWeakObject * >( this  ) );
 }