summaryrefslogtreecommitdiff
path: root/forms/source/component
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/component')
-rw-r--r--forms/source/component/Columns.cxx22
-rw-r--r--forms/source/component/ComboBox.cxx2
-rw-r--r--forms/source/component/Currency.cxx4
-rw-r--r--forms/source/component/DatabaseForm.cxx18
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/component/Filter.cxx20
-rw-r--r--forms/source/component/FormComponent.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx4
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx2
-rw-r--r--forms/source/component/FormsCollection.cxx4
-rw-r--r--forms/source/component/Grid.cxx2
-rw-r--r--forms/source/component/GroupManager.cxx2
-rw-r--r--forms/source/component/ImageControl.cxx6
-rw-r--r--forms/source/component/ListBox.cxx10
-rw-r--r--forms/source/component/clickableimage.cxx10
-rw-r--r--forms/source/component/navigationbar.cxx6
-rw-r--r--forms/source/component/scrollbar.cxx4
-rw-r--r--forms/source/component/spinbutton.cxx4
18 files changed, 63 insertions, 63 deletions
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<XPropertySet> 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<XURLTransfor
if (xDisp.is())
{
Sequence<PropertyValue> 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<XURLTransfor
Sequence< sal_Int8 > 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<XControl>& Control, const ::com:
if (xDisp.is())
{
Sequence<PropertyValue> 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<XControl>& Control, const ::com:
return;
Sequence<PropertyValue> 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<XNumberFormatsSupplier> 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<XControlModel> > 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<PropertyValue> 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<PropertyValue> 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" ) );
}
//--------------------------------------------------------------------
generated by cgit (git 2.34.1) at 2024-07-25 01:39:11 +0000