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>

3 files changed, 8 insertions, 8 deletions

diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 15a510e71bd6..4a9f607eaec2 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -318,7 +318,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     {
         try
         {
-            Any a = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+            Any a = xPropSet->getPropertyValue( OUString( "LayoutManager" ));
             a >>= xLayoutManager;
         }
         catch ( const uno::Exception& )
@@ -327,7 +327,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     }
 
     if ( xLayoutManager.is() )
-        xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )));
+        xLayoutManager->createElement( OUString( "private:resource/menubar/menubar" ));
 }
 
 BibDataManager* BibliographyLoader::GetDataManager()const
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 60450e199794..9891fe077fff 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -915,7 +915,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
                 if ( xFactory.is() )
-                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
                 ::rtl::OUString aString("SELECT * FROM ");
 
@@ -1075,7 +1075,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
         aPropertySet->setPropertyValue("ActiveConnection", aVal);
         Reference< XMultiServiceFactory >   xFactory(xConnection, UNO_QUERY);
         if ( xFactory.is() )
-            m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+            m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
         if(xOldConnection.is())
             xOldConnection->dispose();
@@ -1168,7 +1168,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
                 if ( xFactory.is() )
-                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
                 ::rtl::OUString aString("SELECT * FROM ");
 
@@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
 
             xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName);
             xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) );
-            xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeWidgetLook" ) ), makeAny( (sal_Bool)sal_True ) );
+            xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) );
 
             Reference< XFormComponent >  aFormComp(xModel,UNO_QUERY );
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 26925ebaea65..9dfd994a031b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -204,7 +204,7 @@ BibFrameController_Impl::~BibFrameController_Impl()
 
 ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography"));
+    return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography");
 }
 
 sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin
     // return only top level services ...
     // base services are included there and should be asked by uno-rtti.
     ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography"));
+    lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography");
     return lNames;
 }