From 8b27d78b4afaa9c47ca0fda144c8060f2f14046b Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 19 Mar 2013 09:22:44 +0100 Subject: 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 Tested-by: Thomas Arnhold --- forms/source/component/Columns.cxx | 22 +++++++++++----------- forms/source/component/ComboBox.cxx | 2 +- forms/source/component/Currency.cxx | 4 ++-- forms/source/component/DatabaseForm.cxx | 18 +++++++++--------- forms/source/component/Edit.cxx | 2 +- forms/source/component/Filter.cxx | 20 ++++++++++---------- forms/source/component/FormComponent.cxx | 4 ++-- forms/source/component/FormattedField.cxx | 4 ++-- forms/source/component/FormattedFieldWrapper.cxx | 2 +- forms/source/component/FormsCollection.cxx | 4 ++-- forms/source/component/Grid.cxx | 2 +- forms/source/component/GroupManager.cxx | 2 +- forms/source/component/ImageControl.cxx | 6 +++--- forms/source/component/ListBox.cxx | 10 +++++----- forms/source/component/clickableimage.cxx | 10 +++++----- forms/source/component/navigationbar.cxx | 6 +++--- forms/source/component/scrollbar.cxx | 4 ++-- forms/source/component/spinbutton.cxx | 4 ++-- forms/source/inc/FormComponent.hxx | 2 +- forms/source/misc/InterfaceContainer.cxx | 10 +++++----- forms/source/misc/limitedformats.cxx | 4 ++-- forms/source/misc/services.cxx | 4 ++-- forms/source/richtext/clipboarddispatcher.cxx | 6 +++--- forms/source/richtext/richtextcontrol.cxx | 6 +++--- forms/source/richtext/richtextmodel.cxx | 16 ++++++++-------- forms/source/runtime/formoperations.cxx | 8 ++++---- forms/source/solar/component/navbarcontrol.cxx | 6 +++--- forms/source/solar/control/navtoolbar.cxx | 2 +- forms/source/xforms/datatyperepository.cxx | 2 +- forms/source/xforms/datatypes.cxx | 4 ++-- forms/source/xforms/submission.cxx | 2 +- forms/source/xforms/submission/replace.cxx | 6 +++--- forms/source/xforms/submission/submission_post.cxx | 2 +- forms/source/xforms/xpathlib/extension.cxx | 4 ++-- 34 files changed, 105 insertions(+), 105 deletions(-) (limited to 'forms/source') diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 0b8f7f1a014a..5895bc8ad571 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -70,16 +70,16 @@ const StringSequence& getColumnTypes() if (aColumnTypes.getConstArray()[0].isEmpty()) { ::rtl::OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) ); - pNames[TYPE_COMBOBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) ); - pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) ); - pNames[TYPE_DATEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) ); - pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) ); - pNames[TYPE_LISTBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) ); - pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) ); - pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) ); - pNames[TYPE_TEXTFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ); - pNames[TYPE_TIMEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) ); + pNames[TYPE_CHECKBOX] = ::rtl::OUString( "CheckBox" ); + pNames[TYPE_COMBOBOX] = ::rtl::OUString( "ComboBox" ); + pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( "CurrencyField" ); + pNames[TYPE_DATEFIELD] = ::rtl::OUString( "DateField" ); + pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( "FormattedField" ); + pNames[TYPE_LISTBOX] = ::rtl::OUString( "ListBox" ); + pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( "NumericField" ); + pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( "PatternField" ); + pNames[TYPE_TEXTFIELD] = ::rtl::OUString( "TextField" ); + pNames[TYPE_TIMEFIELD] = ::rtl::OUString( "TimeField" ); } return aColumnTypes; } @@ -341,7 +341,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN ); aForbiddenProperties.insert( PROPERTY_IMAGE_URL ); aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION ); - aForbiddenProperties.insert( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) ); + aForbiddenProperties.insert( ::rtl::OUString( "EnableVisible" ) ); if ( !bAllowDropDown ) aForbiddenProperties.insert( PROPERTY_DROPDOWN ); diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index fb19bccf50b2..29abbe3a7af8 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -521,7 +521,7 @@ void OComboBoxModel::loadData( bool _bForce ) // otherwise look for the alias Reference xFormProp(xForm,UNO_QUERY); Reference< XColumnsSupplier > xSupplyFields; - xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields; + xFormProp->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !"); diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 4536b207ea69..6076fc64b7d2 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -110,11 +110,11 @@ void OCurrencyModel::implConstruct() bPrependCurrencySymbol = sal_False; break; case 2: // $ 1 - sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ); + sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(" "); bPrependCurrencySymbol = sal_True; break; case 3: // 1 $ - sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); + sCurrencySymbol = ::rtl::OUString(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); bPrependCurrencySymbol = sal_False; break; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 24d07499bbf6..378febb070ff 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -404,7 +404,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) catch(const Exception&) { throw WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given database form." ) ), + ::rtl::OUString( "Could not clone the given database form." ), *const_cast< ODatabaseForm* >( &_cloneSource ), ::cppu::getCaughtException() ); @@ -2165,7 +2165,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference aArgs(2); - aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; // build a sequence from the to-be-submitted string @@ -2174,7 +2174,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength()); Reference< XInputStream > xPostData = new SequenceInputStream(aPostData); - aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); + aArgs.getArray()[1].Name = ::rtl::OUString("PostData"); aArgs.getArray()[1].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -2259,7 +2259,7 @@ void ODatabaseForm::submit_impl(const Reference& Control, const ::com: if (xDisp.is()) { Sequence aArgs(1); - aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()->Name = ::rtl::OUString("Referer"); aArgs.getArray()->Value <<= aReferer; xDisp->dispatch(aURL, aArgs); } @@ -2292,15 +2292,15 @@ void ODatabaseForm::submit_impl(const Reference& Control, const ::com: return; Sequence aArgs(3); - aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; - aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType") ); + aArgs.getArray()[1].Name = ::rtl::OUString("ContentType"); aArgs.getArray()[1].Value <<= aContentType; // build a sequence from the to-be-submitted string Reference< XInputStream > xPostData = new SequenceInputStream(aData); - aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); + aArgs.getArray()[2].Name = ::rtl::OUString("PostData"); aArgs.getArray()[2].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -3781,7 +3781,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.ODatabaseForm" ); } //------------------------------------------------------------------------------ @@ -3802,7 +3802,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati ::rtl::OUString* pServices = aServices.getArray(); *pServices++ = FRM_SUN_FORMCOMPONENT; - *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); + *pServices++ = ::rtl::OUString("com.sun.star.form.FormComponents"); *pServices++ = FRM_SUN_COMPONENT_FORM; *pServices++ = FRM_SUN_COMPONENT_HTMLFORM; *pServices++ = FRM_SUN_COMPONENT_DATAFORM; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index c69a23e1e4b7..b6e43b54b4c0 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -619,7 +619,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm ) if ( !m_bMaxTextLenModified ) { sal_Int32 nFieldLen = 0; - xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen; + xField->getPropertyValue(::rtl::OUString("Precision") ) >>= nFieldLen; if (nFieldLen && nFieldLen <= USHRT_MAX) { diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 9afc606ecfeb..d2bc3239260b 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -158,22 +158,22 @@ namespace frm switch (m_nControlClass) { case FormComponentType::RADIOBUTTON: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") ); + aServiceName = rtl::OUString("radiobutton"); break; case FormComponentType::CHECKBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") ); + aServiceName = rtl::OUString("checkbox"); break; case FormComponentType::COMBOBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") ); + aServiceName = rtl::OUString("combobox"); break; case FormComponentType::LISTBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") ); + aServiceName = rtl::OUString("listbox"); break; default: if (m_bMultiLine) - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") ); + aServiceName = rtl::OUString("MultiLineEdit"); else - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") ); + aServiceName = rtl::OUString("Edit"); } return aServiceName; } @@ -405,7 +405,7 @@ namespace frm // create a query composer Reference< XColumnsSupplier > xSuppColumns; - xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSuppColumns; + xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns; const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW ); const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW ); @@ -899,15 +899,15 @@ namespace frm //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" ); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aNames( 2 ); - aNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.FilterControl" ) ); - aNames[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); + aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" ); + aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); return aNames; } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 569fe435554c..ac5b96c92a17 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -772,7 +772,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta { Sequence< ::rtl::OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; - aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") ); + aServiceNames[ 1 ] = ::rtl::OUString("com.sun.star.form.FormControlModel"); return aServiceNames; } @@ -1656,7 +1656,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< ::rtl::OUString > aOwnServiceNames( 1 ); - aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.DataAwareControlModel") ); + aOwnServiceNames[ 0 ] = ::rtl::OUString("com.sun.star.form.DataAwareControlModel"); return ::comphelper::concatSequences( OControlModel::getSupportedServiceNames_Static(), diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index dd918461eb04..a371c69e1729 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -601,7 +601,7 @@ void OFormattedModel::updateFormatterNullDate() // calc the current NULL date Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() ); if ( xSupplier.is() ) - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= m_aNullDate; } //------------------------------------------------------------------------------ @@ -774,7 +774,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor Reference xSupplier = calcFormatsSupplier(); m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) ); m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey ); - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString("NullDate") ) >>= m_aNullDate; OEditBaseModel::onConnectedDbColumn( _rxForm ); } diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index ebd40a4f4c3d..e634bbf8ed7c 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -195,7 +195,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw //------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") ); + return ::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper"); } //------------------------------------------------------------------ diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index a31e15c368e6..e997ef77b948 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -108,7 +108,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") ); + return ::rtl::OUString("com.sun.star.comp.forms.OFormsCollection"); } //------------------------------------------------------------------------------ @@ -128,7 +128,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti StringSequence aReturn(2); aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION; - aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); + aReturn.getArray()[1] = ::rtl::OUString("com.sun.star.form.FormComponents"); return aReturn; } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 005c7199340a..d25212629ec5 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -202,7 +202,7 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept aSupported.realloc(aSupported.getLength() + 2); ::rtl::OUString*pArray = aSupported.getArray(); - pArray[aSupported.getLength()-2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel")); + pArray[aSupported.getLength()-2] = ::rtl::OUString("com.sun.star.awt.UnoControlModel"); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL; return aSupported; } diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index da407cf8e544..caa015af2d0b 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -257,7 +257,7 @@ Sequence< Reference > OGroup::GetControlModels() const DBG_NAME(OGroupManager); //------------------------------------------------------------------ OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer) - :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) ) + :m_pCompGroup( new OGroup( ::rtl::OUString("AllComponentGroup") ) ) ,m_xContainer(_rxContainer) { DBG_CTOR(OGroupManager,NULL); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8100ce2551dc..801d833c9341 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -294,7 +294,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con ::rtl::OUString sNewImageURL; if ( m_xGraphicObject.is() ) { - sNewImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); + sNewImageURL = ::rtl::OUString( "vnd.sun.star.GraphicObject:" ); sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); } m_sImageURL = sNewImageURL; @@ -795,7 +795,7 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce ) if ( sOldImageURL.isEmpty() ) // the ImageURL is already empty, so simply setting a new empty one would not suffice // (since it would be ignored) - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:emptyImage" ) ) ) ); + xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( "private:emptyImage" ) ) ); // (the concrete URL we're passing here doens't matter. It's important that // the model cannot resolve it to a a valid resource describing an image stream } @@ -879,7 +879,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const { Reference< XPropertySet > xModelProps( const_cast< OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW ); Reference< XGraphic > xGraphic; - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ) >>= xGraphic ); + OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "Graphic" ) ) >>= xGraphic ); bIsEmpty = !xGraphic.is(); } catch( const Exception& ) diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 306829e9ce7c..a448416a80a7 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -719,7 +719,7 @@ namespace frm { // otherwise look for the alias Reference< XColumnsSupplier > xSupplyFields; - xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields; + xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !"); @@ -741,15 +741,15 @@ namespace frm ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); if (aBoundFieldName.isEmpty()) // act like a combobox - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") ); + aStatement += ::rtl::OUString("DISTINCT "); aStatement += quoteName(aQuote,aFieldName); if (!aBoundFieldName.isEmpty()) { - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") ); + aStatement += ::rtl::OUString(", "); aStatement += quoteName(aQuote, aBoundFieldName); } - aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") ); + aStatement += ::rtl::OUString(" FROM "); ::rtl::OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation ); @@ -841,7 +841,7 @@ namespace frm try { Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW ); - OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType ); + OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString("Type") ) >>= m_nBoundColumnType ); } catch( const Exception& ) { diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 12c205c9a436..97b06d6b9309 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -305,7 +305,7 @@ namespace frm Sequence aArgs(1); PropertyValue& rProp = aArgs.getArray()[0]; - rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); + rProp.Name = ::rtl::OUString("Referer"); rProp.Value <<= xModel->getURL(); if (xDisp.is()) @@ -320,13 +320,13 @@ namespace frm if ( xDisp.is() ) { Sequence aProps(3); - aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aProps[0].Name = ::rtl::OUString("URL"); aProps[0].Value <<= aURL.Complete; - aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")); + aProps[1].Name = ::rtl::OUString("FrameName"); aProps[1].Value = xSet->getPropertyValue(PROPERTY_TARGET_FRAME); - aProps[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + aProps[2].Name = ::rtl::OUString("Referer"); aProps[2].Value <<= xModel->getURL(); xDisp->dispatch( aHyperLink, aProps ); @@ -679,7 +679,7 @@ namespace frm ImageProducer *pImgProd = GetImageProducer(); // grab the ImageURL rtl::OUString sURL; - getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL; + getPropertyValue( rtl::OUString("ImageURL") ) >>= sURL; if (!m_pMedium) { if ( ::svt::GraphicAccess::isSupportedURL( sURL ) ) diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index cd4c527d5c25..f2f133688fa7 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -173,7 +173,7 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarModel" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarModel" ); } //------------------------------------------------------------------ @@ -183,7 +183,7 @@ namespace frm aSupported.realloc( aSupported.getLength() + 2 ); ::rtl::OUString* pArray = aSupported.getArray(); - pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlModel" ) ); + pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlModel" ); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR; return aSupported; } @@ -447,7 +447,7 @@ namespace frm break; case PROPERTY_ID_DEFAULTCONTROL: - aDefault <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) ); + aDefault <<= ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); break; case PROPERTY_ID_HELPTEXT: diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 8d34774d6fa1..dd8a6673af9d 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -287,8 +287,8 @@ namespace frm Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) ); + ::rtl::OUString( "ScrollValueMin" ), + ::rtl::OUString( "ScrollValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 0b764009d02f..77fe5439fa61 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -243,8 +243,8 @@ namespace frm Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) ); + ::rtl::OUString( "SpinValueMin" ), + ::rtl::OUString( "SpinValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 3403df8c2308..b0b71fa35ddb 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -93,7 +93,7 @@ namespace frm // old macro for quickly implementing XServiceInfo::getImplementationName #define IMPLEMENTATION_NAME(ImplName) \ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ - { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } + { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } class OControlModel; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 4e09785d15ee..b8c7a1c04505 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn break; Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW ); - Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider") ) ), UNO_QUERY ); + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY ); if ( !xNameQuery.is() ) break; @@ -146,9 +146,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW ); ::rtl::OUString sServiceName; - xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl") ) ) >>= sServiceName; + xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName; - Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBAToOOEventDesc") ) ), UNO_QUERY_THROW ); + Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW ); Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName ); // register the vba script events m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents ); @@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource ) catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given interface hierarchy." ) ), + ::rtl::OUString( "Could not clone the given interface hierarchy." ), static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ), ::cppu::getCaughtException() ); @@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper bool bHandleVbaEvents = false; try { - _rxElement->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GenerateVbaEvents") ) ) >>= bHandleVbaEvents; + _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents; } catch( const Exception& ) { diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 06bba11583b7..8a3597c16f7c 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -54,8 +54,8 @@ namespace frm //--------------------------------------------------------------------- static const Locale& getLocale(LocaleType _eType) { - static const Locale s_aEnglishUS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("us") ), ::rtl::OUString() ); - static const Locale s_aGerman( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE") ), ::rtl::OUString() ); + static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() ); + static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() ); static const ::rtl::OUString s_sEmptyString; static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString ); diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 844b6c2c4437..0ba171fcd1a7 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -123,7 +123,7 @@ void registerClassInfo( //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ + ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ aServices, \ frm::classImplName##_CreateInstance) @@ -218,7 +218,7 @@ void ensureClassInfos() aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD; aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD; - registerClassInfo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted") ), + registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"), aServices, frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted); diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 097ab031b30b..72e078973f6d 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -44,13 +44,13 @@ namespace frm switch ( _eFunc ) { case OClipboardDispatcher::eCut: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Cut" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Cut" ); break; case OClipboardDispatcher::eCopy: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Copy" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Copy" ); break; case OClipboardDispatcher::ePaste: - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Paste" ) ); + aURL.Complete = ::rtl::OUString( ".uno:Paste" ); break; } return aURL; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 053abd151116..93e8497eec4c 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -280,15 +280,15 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ORichTextControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ORichTextControl" ); } //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices( 3 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEdit" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlEdit" ); aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL; return aServices; } diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 2d8f431ef4ac..5799ca8a90af 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -244,13 +244,13 @@ namespace frm //-------------------------------------------------------------------- IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel, FRM_SUN_COMPONENT_RICHTEXTCONTROL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextRange" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphProperties" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesAsian" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesComplex" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesAsian" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesComplex" ) ) + ::rtl::OUString( "com.sun.star.text.TextRange" ), + ::rtl::OUString( "com.sun.star.style.CharacterProperties" ), + ::rtl::OUString( "com.sun.star.style.ParagraphProperties" ), + ::rtl::OUString( "com.sun.star.style.CharacterPropertiesAsian" ), + ::rtl::OUString( "com.sun.star.style.CharacterPropertiesComplex" ), + ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesAsian" ), + ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesComplex" ) ) //------------------------------------------------------------------------------ @@ -409,7 +409,7 @@ namespace frm // forward to our aggregate, so the EditEngine knows about it if ( m_xAggregateSet.is() ) m_xAggregateSet->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), _rValue ); + ::rtl::OUString( "WritingMode" ), _rValue ); } break; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 529a43ea8546..d1c810e86a54 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -144,14 +144,14 @@ namespace frm //-------------------------------------------------------------------- ::rtl::OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.FormOperations" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.FormOperations" ); } //-------------------------------------------------------------------- Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormOperations" ) ); + aNames[0] = ::rtl::OUString( "com.sun.star.form.runtime.FormOperations" ); return aNames; } @@ -402,7 +402,7 @@ namespace frm ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) ); if ( !bFinalCount ) - sValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" *") ); + sValue += ::rtl::OUString(" *"); aState.State <<= sValue; aState.Enabled = sal_True; @@ -1137,7 +1137,7 @@ namespace frm Reference< XMultiServiceFactory > xFactory( ::dbtools::getConnection( m_xCursor ), 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 ); OSL_ENSURE( m_xParser.is(), "FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a parser for us!" ); } } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 001b711d250c..56f54c19d202 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -219,15 +219,15 @@ namespace frm //------------------------------------------------------------------ ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarControl" ); } //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); return aServices; } diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 3222f4d69f2e..2d102247b080 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -89,7 +89,7 @@ namespace frm case FormFeature::RemoveFilterAndSort : pAsciiCommandName = "RemoveFilterSort"; break; } if ( pAsciiCommandName != NULL ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + ::rtl::OUString::createFromAscii( pAsciiCommandName ); + return ::rtl::OUString( ".uno:" ) + ::rtl::OUString::createFromAscii( pAsciiCommandName ); OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" ); return ::rtl::OUString(); diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 0b6131021db0..c209a7f92c6a 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -157,7 +157,7 @@ namespace xforms Repository::iterator aTypePos = implLocate( typeName ); if ( aTypePos->second->getIsBasic() ) - throw VetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is a built-in type and cannot be removed." ) ), *this ); + throw VetoException( ::rtl::OUString( "This is a built-in type and cannot be removed." ), *this ); // TODO: localize this error message m_aRepository.erase( aTypePos ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 8b458fcbdfbe..94f6fa8828a5 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -289,7 +289,7 @@ namespace xforms RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) { - _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is no valid pattern." ) ); + _rErrorMessage = ::rtl::OUString( "This is no valid pattern." ); return false; } } @@ -547,7 +547,7 @@ namespace xforms sal_Int32 nValue( 0 ); OSL_VERIFY( _rNewValue >>= nValue ); if ( nValue <= 0 ) - _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Length limits must denote positive integer values." ) ); + _rErrorMessage = ::rtl::OUString( "Length limits must denote positive integer values." ); // TODO/eforms: localize the error message } break; diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 8cd3f09c09f4..cc4d8ddcb52d 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -502,7 +502,7 @@ void SAL_CALL Submission::submitWithInteraction( if ( !xModel.is() || msID.isEmpty() ) throw RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is not a valid submission object." ) ), + ::rtl::OUString( "This is not a valid submission object." ), *this ); diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index f08b3f628a7e..27bcd4baee84 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -63,13 +63,13 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla // open the stream from the result... // build media descriptor Sequence< PropertyValue > descriptor(2); - descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ), + descriptor[0] = PropertyValue(::rtl::OUString("InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); - descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ), + descriptor[1] = PropertyValue(::rtl::OUString("ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); - ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") ); + ::rtl::OUString aTarget = ::rtl::OUString("_default"); xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); return CSubmission::SUCCESS; diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index f64e1ac19ce1..462972018cd7 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -60,7 +60,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< aPostArgument.Source = apSerialization->getInputStream(); CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink); aPostArgument.Sink = aSink; - aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml")); + aPostArgument.MediaType = OUString("application/xml"); aPostArgument.Referer = OUString(); Any aCommandArgument; aCommandArgument <<= aPostArgument; diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 5e567f78c1fd..75c6922e109f 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -41,13 +41,13 @@ Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create( ::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") ); + return ::rtl::OUString("com.sun.star.comp.xml.xpath.XFormsExtension"); } Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aSequence(1); - aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") ); + aSequence[0] = ::rtl::OUString("com.sun.star.xml.xpath.XPathExtension"); return aSequence; } -- cgit