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>

11 files changed, 14 insertions, 14 deletions

diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 5895bc8ad571..01c71872c3ca 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -87,8 +87,8 @@ const StringSequence& getColumnTypes()
 //------------------------------------------------------------------------------
 sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
 {
-    const ::rtl::OUString aModelPrefix (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.") );
-    const ::rtl::OUString aCompatibleModelPrefix (RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.") );
+    const ::rtl::OUString aModelPrefix ("com.sun.star.form.component.");
+    const ::rtl::OUString aCompatibleModelPrefix ("stardiv.one.form.component.");
 
     sal_Int32 nTypeId = -1;
     if (aModelName == FRM_COMPONENT_EDIT)
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 378febb070ff..9f40e8e9d3d2 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2016,7 +2016,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
                 if ( xColProps.is() )
                     xPSI = xColProps->getPropertySetInfo( );
 
-                static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( RTL_CONSTASCII_USTRINGPARAM( "ControlDefault" ) );
+                static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" );
                 if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_CONTROLDEFAULT ) )
                 {
                     Any aDefault = xColProps->getPropertyValue( PROPERTY_CONTROLDEFAULT );
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 706e17e0afd5..c6c665f5db41 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -300,7 +300,7 @@ namespace frm
 
                     bool bSelected = ( rEvent.Selected == STATE_CHECK );
 
-                    ::rtl::OUString sExpressionMarker( RTL_CONSTASCII_USTRINGPARAM( "$expression$" ) );
+                    ::rtl::OUString sExpressionMarker( "$expression$" );
                     ::dbtools::getBoleanComparisonPredicate(
                         sExpressionMarker,
                         bSelected,
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index a371c69e1729..42ed48f2795d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -836,7 +836,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
         ::rtl::OUString         sFormatDescription;
         LanguageType    eFormatLanguage = LANGUAGE_DONTKNOW;
 
-        static const ::rtl::OUString s_aLocaleProp (RTL_CONSTASCII_USTRINGPARAM("Locale") );
+        static const ::rtl::OUString s_aLocaleProp ("Locale");
         Reference<com::sun::star::beans::XPropertySet>  xFormat = xFormats->getByKey(nKey);
         if (hasProperty(s_aLocaleProp, xFormat))
         {
@@ -849,7 +849,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
             }
         }
 
-        static const ::rtl::OUString s_aFormatStringProp (RTL_CONSTASCII_USTRINGPARAM("FormatString") );
+        static const ::rtl::OUString s_aFormatStringProp ("FormatString");
         if (hasProperty(s_aFormatStringProp, xFormat))
             xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index a448416a80a7..ac526da62618 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -739,7 +739,7 @@ namespace frm
 
                     Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
                     ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
-                    ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT "));
+                    ::rtl::OUString aStatement("SELECT ");
                     if (aBoundFieldName.isEmpty())   // act like a combobox
                         aStatement += ::rtl::OUString("DISTINCT ");
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index b8c7a1c04505..7a3bf4178de8 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -392,7 +392,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr
             if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 )
             {   // the macro name does not already contain a :
                 // -> default the type to "document"
-                ::rtl::OUString sNewScriptCode( RTL_CONSTASCII_USTRINGPARAM( "document:" ) );
+                ::rtl::OUString sNewScriptCode( "document:" );
                 sNewScriptCode += _rDescriptor.ScriptCode;
                 _rDescriptor.ScriptCode = sNewScriptCode;
             }
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 8a3597c16f7c..b31c97eb91ec 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -332,7 +332,7 @@ namespace frm
 
             if (!bFoundIt)
             {   // somebody gave us an format which we can't translate
-                ::rtl::OUString sMessage (RTL_CONSTASCII_USTRINGPARAM("This control supports only a very limited number of formats.") );
+                ::rtl::OUString sMessage ("This control supports only a very limited number of formats.");
                 throw IllegalArgumentException(sMessage, NULL, 2);
             }
 
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 93e8497eec4c..045f98df265f 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -693,7 +693,7 @@ namespace frm
         }
 
         // is it an UNO slot?
-        ::rtl::OUString sUnoProtocolPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) );
+        ::rtl::OUString sUnoProtocolPrefix( ".uno:" );
         if ( _rURL.Complete.startsWith( sUnoProtocolPrefix ) )
         {
             ::rtl::OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() );
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 5a0e14981941..b9db8ac9a8d7 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -750,7 +750,7 @@ void Binding::valueModified()
 void Binding::distributeMIP( const XNode_t & rxNode ) {
 
     typedef com::sun::star::xforms::XFormsEventConcrete XFormsEvent_t;
-    OUString sEventName( RTL_CONSTASCII_USTRINGPARAM("xforms-generic") );
+    OUString sEventName("xforms-generic");
     XFormsEvent_t *pEvent = new XFormsEvent_t;
     pEvent->initXFormsEvent(sEventName, sal_True, sal_False);
     Reference<XEvent> xEvent(pEvent);
@@ -1257,7 +1257,7 @@ void Binding::handleEvent( const XEvent_t& xEvent )
     throw( RuntimeException )
 {
     OUString sType(xEvent->getType());
-    //OUString sEventMIPChanged(RTL_CONSTASCII_USTRINGPARAM("xforms-generic"));
+    //OUString sEventMIPChanged("xforms-generic");
     //if(sType.equals(sEventMIPChanged)) {
     if(!sType.compareToAscii("xforms-generic")) {
 
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index 462972018cd7..b313bd269cb7 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -55,7 +55,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
         ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext());
 
         // use post command
-        OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post"));
+        OUString aCommandName("post");
         PostCommandArgument2 aPostArgument;
         aPostArgument.Source = apSerialization->getInputStream();
         CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink);
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 315e42933f34..6c35ea7fee90 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -302,7 +302,7 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
+    ::rtl::OUString aUTCString("Z");
 
     ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
     ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);