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>

4 files changed, 28 insertions, 28 deletions

diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 9fb075306486..9fa3b3dc223e 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -65,7 +65,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString&
             }
         }
 
-        OUString aRelURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+        OUString aRelURL( "vnd.sun.star.Package:" );
         aRelURL += rFilterName;
         aRelURL += OUString( sal_Unicode( '/' ) );
         aRelURL += aName;
@@ -81,18 +81,18 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
 {
     try
     {
-        const OUString sComponentData       ( RTL_CONSTASCII_USTRINGPARAM ( "oor:component-data" ) );
-        const OUString sNode                ( RTL_CONSTASCII_USTRINGPARAM ( "node" ) );
-        const OUString sName                ( RTL_CONSTASCII_USTRINGPARAM ( "oor:name" ) );
-        const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
-        const OUString sUIName              ( RTL_CONSTASCII_USTRINGPARAM ( "UIName" ) );
-        const OUString sComma               ( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
-        const OUString sDelim               ( RTL_CONSTASCII_USTRINGPARAM ( ";" ) );
-        const OUString sData                ( RTL_CONSTASCII_USTRINGPARAM ( "Data" ) );
-        const OUString sDocTypePrefix       ( RTL_CONSTASCII_USTRINGPARAM ( "doctype:" ) );
-        const OUString sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) );
-        const OUString sXSLTFilterService   ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) );
-        const OUString sCdataAttribute      ( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
+        const OUString sComponentData       ( "oor:component-data" );
+        const OUString sNode                ( "node" );
+        const OUString sName                ( "oor:name" );
+        const OUString sWhiteSpace          ( " " );
+        const OUString sUIName              ( "UIName" );
+        const OUString sComma               ( "," );
+        const OUString sDelim               ( ";" );
+        const OUString sData                ( "Data" );
+        const OUString sDocTypePrefix       ( "doctype:" );
+        const OUString sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
+        const OUString sXSLTFilterService   ( "com.sun.star.documentconversion.XSLTFilter" );
+        const OUString sCdataAttribute      ( "CDATA" );
 
 
         // set up sax writer and connect to given output stream
@@ -227,10 +227,10 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU
 {
     try
     {
-        const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
-        const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) );
-        const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) );
-        const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+        const OUString sCdataAttribute( "CDATA" );
+        const OUString sProp( "prop" );
+        const OUString sValue( "value" );
+        const OUString sWhiteSpace          ( " " );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
         pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
@@ -257,10 +257,10 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co
 {
     try
     {
-        const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
-        const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) );
-        const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) );
-        const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+        const OUString sCdataAttribute( "CDATA" );
+        const OUString sProp( "prop" );
+        const OUString sValue( "value" );
+        const OUString sWhiteSpace          ( " " );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
         pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 91691d68e4bf..79f6a6a0442f 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -197,7 +197,7 @@ OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeExcepti
 
 Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames()  throw ( RuntimeException )
 {
-    OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.XSLTFilterDialog" ) );
+    OUString aServiceName( "com.sun.star.comp.ui.XSLTFilterDialog" );
     Sequence< ::rtl::OUString > aSupported( &aServiceName, 1 );
     return aSupported;
 }
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 5947131be136..f99bd73938b1 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -177,7 +177,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
 
             // get root zip folder
             Reference< XInterface > xRootFolder;
-            OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") );
+            OUString szRootFolder("/");
             xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder;
 
             // export filters files
@@ -227,7 +227,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
             }
 
             Reference< XInputStream > XIS(  new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, STREAM_READ ), true ) );
-            OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection.xcu" ) );
+            OUString szTypeDetection( "TypeDetection.xcu" );
             _addFile( xRootFolder, xFactory,  XIS, szTypeDetection );
 
             Reference< XChangesBatch > xBatch( xIfc, UNO_QUERY );
@@ -277,10 +277,10 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
 
             // get root zip folder
             Reference< XInterface > xRootFolder;
-            OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") );
+            OUString szRootFolder("/");
             xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder;
 
-            OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM("TypeDetection.xcu") );
+            OUString szTypeDetection("TypeDetection.xcu");
             if( xIfc->hasByHierarchicalName( szTypeDetection ) )
             {
                 Reference< XActiveDataSink > xTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index b90b9cfc748c..c7c78f8d4d28 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -404,7 +404,7 @@ void XMLFilterTestDialog::onExportBrowse()
 
             Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
             Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
-            OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+            OUString aFrame( "_default" );
             Sequence< PropertyValue > aArguments(1);
             aArguments[0].Name = OUString( "InteractionHandler" );
             aArguments[0].Value <<= xInter;
@@ -590,7 +590,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
         Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
         Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
 
-        OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+        OUString aFrame( "_default" );
         Sequence< PropertyValue > aArguments(2);
         aArguments[0].Name = OUString( "FilterName" );
         aArguments[0].Value <<= m_pFilterInfo->maFilterName;