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>

5 files changed, 7 insertions, 8 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 337316229a8e..c9ebbd6a8e36 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -36,8 +36,7 @@ using namespace ::com::sun::star::container;
 
 static const OUString& GetPathToConfigurationRoot (void)
 {
-    static const OUString sPathToConfigurationRoot (
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.SunPresentationMinimizer"));
+    static const OUString sPathToConfigurationRoot ("org.openoffice.Office.extension.SunPresentationMinimizer");
     return sPathToConfigurationRoot;
 }
 
@@ -168,7 +167,7 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken )
     rtl::OUString aPath;
     try
     {
-        static const OUString sProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) );
+        static const OUString sProtocol( "vnd.sun.star.expand:" );
         Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW );
         if ( xSet->hasByName( TKGet( eToken ) ) )
             xSet->getByName( TKGet( eToken ) ) >>= aPath;
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 62859f82ca9c..922527e2a88d 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -334,7 +334,7 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString&
 
 void UnoDialog::enableControl( const OUString& rControlName )
 {
-    const OUString sEnabled( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) );
+    const OUString sEnabled( "Enabled" );
     setControlProperty( rControlName, sEnabled, Any( sal_True ) );
 }
 
@@ -342,7 +342,7 @@ void UnoDialog::enableControl( const OUString& rControlName )
 
 void UnoDialog::disableControl( const OUString& rControlName )
 {
-    const OUString sEnabled( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) );
+    const OUString sEnabled( "Enabled" );
     setControlProperty( rControlName, sEnabled, Any( sal_False ) );
 }
 
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 503971629ab8..efe23acab074 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -338,7 +338,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
     for( sal_Int32 i = 0; i < nAttribs; i++ )
     {
 #if OSL_DEBUG_LEVEL > 1
-        rtl::OUString aVal( RTL_CONSTASCII_USTRINGPARAM( "<no string>" ) );
+        rtl::OUString aVal( "<no string>" );
         pAttribs[i].Value >>= aVal;
         OSL_TRACE( "doDetection: Attrib: %s = %s\n",
                    rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(),
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 609dc3d8424d..92a2376585fb 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -69,7 +69,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
         for( sal_Int32 i = 0; i < nAttribs; i++ )
         {
             #if OSL_DEBUG_LEVEL > 1
-            rtl::OUString aVal( RTL_CONSTASCII_USTRINGPARAM( "<no string>" ) );
+            rtl::OUString aVal( "<no string>" );
             pAttribs[i].Value >>= aVal;
             SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name << " = " << aVal << "\n");
             #endif
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 774193e57306..c31ef1409111 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -50,7 +50,7 @@ SaxAttrList::~SaxAttrList()
 namespace {
     static const rtl::OUString& getCDATAString()
     {
-        static rtl::OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
+        static rtl::OUString aStr( "CDATA" );
         return aStr;
     }
 }