[PATCH 03/12] RTL_CONSTASCII_USTRINGPARAM in components - forms
pjacquod
pjacquod at alumni.ethz.ch
Mon Nov 15 14:38:11 PST 2010
the whole directory components/forms/source/component
should now be OK
---
forms/source/component/Columns.cxx | 4 +-
forms/source/component/Currency.cxx | 4 +-
forms/source/component/DatabaseForm.cxx | 26 +++++++++++-----------
forms/source/component/Edit.cxx | 2 +-
forms/source/component/Filter.cxx | 18 +++++++-------
forms/source/component/FormComponent.cxx | 4 +-
forms/source/component/FormattedField.cxx | 6 ++--
forms/source/component/FormattedFieldWrapper.cxx | 2 +-
forms/source/component/FormsCollection.cxx | 4 +-
forms/source/component/GroupManager.cxx | 2 +-
forms/source/component/ListBox.cxx | 10 ++++----
forms/source/component/RadioButton.cxx | 4 +--
forms/source/component/clickableimage.cxx | 2 +-
13 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index af41076..f0364a4 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -94,8 +94,8 @@ const StringSequence& getColumnTypes()
//------------------------------------------------------------------------------
sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
{
- const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component.");
- const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
+ const ::rtl::OUString aModelPrefix (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.") );
+ const ::rtl::OUString aCompatibleModelPrefix (RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.") );
sal_Int32 nTypeId = -1;
if (aModelName == FRM_COMPONENT_EDIT)
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 808863d..b604400 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -121,11 +121,11 @@ void OCurrencyModel::implConstruct()
bPrependCurrencySymbol = sal_False;
break;
case 2: // $ 1
- sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString::createFromAscii(" ");
+ sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
bPrependCurrencySymbol = sal_True;
break;
case 3: // 1 $
- sCurrencySymbol = ::rtl::OUString::createFromAscii(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
+ sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
bPrependCurrencySymbol = sal_False;
break;
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index cb42736..162c617 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -995,7 +995,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
switch( nCharCode )
{
case 13: // CR
- aResult += ::rtl::OUString::createFromAscii("%0D%0A"); // Hex-Darstellung CR LF
+ aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%0D%0A") ); // Hex-Darstellung CR LF
break;
@@ -1042,7 +1042,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
// Header
- ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii("form-data; name=\"");
+ ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM("form-data; name=\"") );
aContentDisp += rName;
aContentDisp += UniString('\"');
pChild->SetContentDisposition( aContentDisp );
@@ -1107,15 +1107,15 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
// Header
- ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii( "form-data; name=\"" );
+ ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM( "form-data; name=\"") );
aContentDisp += rName;
aContentDisp += UniString('\"');
- aContentDisp += ::rtl::OUString::createFromAscii("; filename=\"");
+ aContentDisp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; filename=\"") );
aContentDisp += aFileName;
aContentDisp += UniString('\"');
pChild->SetContentDisposition( aContentDisp );
pChild->SetContentType( aContentType );
- pChild->SetContentTransferEncoding( UniString(::rtl::OUString::createFromAscii("8bit")) );
+ pChild->SetContentTransferEncoding( UniString(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("8bit") ) ) );
// Body
@@ -2186,7 +2186,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(2);
- aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer");
+ aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
@@ -2195,7 +2195,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
Sequence< sal_Int8 > aPostData((sal_Int8*)a8BitData.GetBuffer(), a8BitData.Len());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
- aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("PostData");
+ aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
aArgs.getArray()[1].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -2254,7 +2254,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
Reference<XURLTransformer>
xTransformer(m_xServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer") ) ), UNO_QUERY);
DBG_ASSERT(xTransformer.is(), "ODatabaseForm::submit_impl : could not create an URL transformer !");
// URL-Encoding
@@ -2283,7 +2283,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(1);
- aArgs.getArray()->Name = ::rtl::OUString::createFromAscii("Referer");
+ aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
aArgs.getArray()->Value <<= aReferer;
xDisp->dispatch(aURL, aArgs);
}
@@ -2316,15 +2316,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
return;
Sequence<PropertyValue> aArgs(3);
- aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer");
+ aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
aArgs.getArray()[0].Value <<= aReferer;
- aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("ContentType");
+ aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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::createFromAscii("PostData");
+ aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
aArgs.getArray()[2].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -3826,7 +3826,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati
::rtl::OUString* pServices = aServices.getArray();
*pServices++ = FRM_SUN_FORMCOMPONENT;
- *pServices++ = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents");
+ *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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 799816c..31332e0 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -629,7 +629,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
if ( !m_bMaxTextLenModified )
{
sal_Int32 nFieldLen = 0;
- xField->getPropertyValue(::rtl::OUString::createFromAscii("Precision")) >>= nFieldLen;
+ xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen;
if (nFieldLen && nFieldLen <= USHRT_MAX)
{
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 1add42b..899ed0e 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -168,22 +168,22 @@ namespace frm
switch (m_nControlClass)
{
case FormComponentType::RADIOBUTTON:
- aServiceName = ::rtl::OUString::createFromAscii("radiobutton");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") );
break;
case FormComponentType::CHECKBOX:
- aServiceName = ::rtl::OUString::createFromAscii("checkbox");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") );
break;
case FormComponentType::COMBOBOX:
- aServiceName = ::rtl::OUString::createFromAscii("combobox");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") );
break;
case FormComponentType::LISTBOX:
- aServiceName = ::rtl::OUString::createFromAscii("listbox");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") );
break;
default:
if (m_bMultiLine)
- aServiceName = ::rtl::OUString::createFromAscii("MultiLineEdit");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") );
else
- aServiceName = ::rtl::OUString::createFromAscii("Edit");
+ aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") );
}
return aServiceName;
}
@@ -711,10 +711,10 @@ namespace frm
try
{
Sequence< Any > aArgs(2);
- aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE);
- aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE);
+ aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException") ), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE);
+ aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow") ), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE);
- static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" );
+ static ::rtl::OUString s_sDialogServiceName (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") );
Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY );
if ( xErrorDialog.is() )
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index c8b108e..af3f299 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -784,7 +784,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta
{
Sequence< ::rtl::OUString > aServiceNames( 2 );
aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
- aServiceNames[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.FormControlModel" );
+ aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") );
return aServiceNames;
}
@@ -1654,7 +1654,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::createFromAscii( "com.sun.star.form.DataAwareControlModel" );
+ aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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 5958726..7c7eb29 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -790,7 +790,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::createFromAscii("NullDate") ) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate;
OEditBaseModel::onConnectedDbColumn( _rxForm );
}
@@ -852,7 +852,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
::rtl::OUString sFormatDescription;
LanguageType eFormatLanguage = LANGUAGE_DONTKNOW;
- static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale");
+ static const ::rtl::OUString s_aLocaleProp (RTL_CONSTASCII_USTRINGPARAM("Locale") );
Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey);
if (hasProperty(s_aLocaleProp, xFormat))
{
@@ -865,7 +865,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
}
}
- static const ::rtl::OUString s_aFormatStringProp = ::rtl::OUString::createFromAscii("FormatString");
+ static const ::rtl::OUString s_aFormatStringProp (RTL_CONSTASCII_USTRINGPARAM("FormatString") );
if (hasProperty(s_aFormatStringProp, xFormat))
xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 161046d..84048ab 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -205,7 +205,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
//------------------------------------------------------------------
::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException)
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") );
}
//------------------------------------------------------------------
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index cf69c00..c2152a2 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -119,7 +119,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormsCollection");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") );
}
//------------------------------------------------------------------------------
@@ -139,7 +139,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti
StringSequence aReturn(2);
aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION;
- aReturn.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents");
+ aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") );
return aReturn;
}
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index e146c05..6334faa 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -269,7 +269,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const
DBG_NAME(OGroupManager);
//------------------------------------------------------------------
OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
- :m_pCompGroup( new OGroup( ::rtl::OUString::createFromAscii( "AllComponentGroup" ) ) )
+ :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) )
,m_xContainer(_rxContainer)
{
DBG_CTOR(OGroupManager,NULL);
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index c8d0c72..8bcb052 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -744,17 +744,17 @@ namespace frm
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
- ::rtl::OUString aStatement = ::rtl::OUString::createFromAscii("SELECT ");
+ ::rtl::OUString aStatement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ") );
if (!aBoundFieldName.getLength()) // act like a combobox
- aStatement += ::rtl::OUString::createFromAscii("DISTINCT ");
+ aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") );
aStatement += quoteName(aQuote,aFieldName);
if (aBoundFieldName.getLength())
{
- aStatement += ::rtl::OUString::createFromAscii(", ");
+ aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") );
aStatement += quoteName(aQuote, aBoundFieldName);
}
- aStatement += ::rtl::OUString::createFromAscii(" FROM ");
+ aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") );
::rtl::OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation );
@@ -846,7 +846,7 @@ namespace frm
try
{
Reference< XPropertySet > xBoundField( xColumns->getByIndex( nBoundColumn ), UNO_QUERY_THROW );
- OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= m_nBoundColumnType );
+ OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType );
}
catch( const Exception& )
{
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 4afd474..1e816a6 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -87,9 +87,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>
// switch off the auto-toggle, we do this ourself ....
// (formerly this switch-off was done in the toolkit - but the correct place is here ...)
-// Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY );
-// if (xVclWindowPeer.is())
-// xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False));
+
// new order: do _not_ switch off the auto toggle because:
// * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it)
// * without auto toggle, the AccessibleEvents as fired by the radio buttons are
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index b08d919..3a3b01a 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -317,7 +317,7 @@ namespace frm
Sequence<PropertyValue> aArgs(1);
PropertyValue& rProp = aArgs.getArray()[0];
- rProp.Name = ::rtl::OUString::createFromAscii("Referer");
+ rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
rProp.Value <<= xModel->getURL();
if (xDisp.is())
--
1.7.1
--------------010801020102040300050307--
More information about the LibreOffice
mailing list