summaryrefslogtreecommitdiff
path: root/toolkit/source/controls
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/controls')
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx38
-rw-r--r--toolkit/source/controls/formattedcontrol.cxx6
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx4
-rw-r--r--toolkit/source/controls/grid/gridcontrol.cxx6
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx10
-rw-r--r--toolkit/source/controls/roadmapentry.cxx14
-rw-r--r--toolkit/source/controls/stdtabcontroller.cxx2
-rw-r--r--toolkit/source/controls/tkscrollbar.cxx2
-rw-r--r--toolkit/source/controls/tksimpleanimation.cxx2
-rw-r--r--toolkit/source/controls/tkspinbutton.cxx2
-rw-r--r--toolkit/source/controls/tkthrobber.cxx2
-rw-r--r--toolkit/source/controls/tree/treecontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrols.cxx44
14 files changed, 68 insertions, 68 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 981332e1ecd2..167a88d3790b 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -586,7 +586,7 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt
Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
if ( xAgg.is() )
{
- if ( xSI->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" ) ) )
+ if ( xSI->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel")) ) )
{
// release 3 of the 4 references we have to the object
xAgg.clear();
@@ -1227,8 +1227,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1251,8 +1251,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1568,9 +1568,9 @@ UnoDialogControl::UnoDialogControl() :
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString::createFromAscii( "Dialog" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialog"));
else
- return ::rtl::OUString::createFromAscii( "TabPage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPage"));
}
// XInterface
@@ -2275,10 +2275,10 @@ void UnoDialogControl::addingControl( const Reference< XControl >& _rxControl )
{
Sequence< ::rtl::OUString > aNames( 4 );
::rtl::OUString* pNames = aNames.getArray();
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
xProps->addPropertiesChangeListener( aNames, this );
}
@@ -2680,10 +2680,10 @@ void UnoParentControl::addingControl( const Reference< XControl >& _rxControl )
{
Sequence< ::rtl::OUString > aNames( 4 );
::rtl::OUString* pNames = aNames.getArray();
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
xProps->addPropertiesChangeListener( aNames, this );
}
@@ -2846,9 +2846,9 @@ uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString::createFromAscii( "tabcontrol" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrol"));
// Hopefully we can tweak the tabcontrol to display without tabs
- return ::rtl::OUString::createFromAscii( "tabcontrolnotabs" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs"));
}
void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
@@ -3035,7 +3035,7 @@ UnoPageControl::~UnoPageControl()
::rtl::OUString UnoPageControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "tabpage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabpage"));
}
@@ -3145,7 +3145,7 @@ UnoFrameControl::~UnoFrameControl()
::rtl::OUString UnoFrameControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "frame" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("frame"));
}
void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index b82b8b4be2c0..e83749d3a6da 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -375,9 +375,9 @@ namespace toolkit
}
throw IllegalArgumentException(
- ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ")
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to convert the given value for the property "))
+= GetPropertyName((sal_uInt16)nPropId) )
- += ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."),
+ += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (double, integer, or string expected).")),
static_cast< XPropertySet* >(this),
1);
}
@@ -441,7 +441,7 @@ namespace toolkit
// -------------------------------------------------------------------
::rtl::OUString UnoFormattedFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "FormattedField" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"));
}
// -------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 1716d843a117..4a644484b599 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -117,14 +117,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t
for(sal_Int32 i=0;i<rowElements;i++)
{
- Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY );
+ Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
columns.push_back(xColumn);
xColumn->setIndex(i);
}
}
::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException)
{
- Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY );
+ Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
xColumn->setColumnWidth(column->getColumnWidth());
xColumn->setPreferredWidth(column->getPreferredWidth());
xColumn->setMaxWidth(column->getMaxWidth());
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 158876245be6..9289352720bc 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -162,7 +162,7 @@ UnoGridControl::UnoGridControl()
OUString UnoGridControl::GetComponentServiceName()
{
- return OUString::createFromAscii( "Grid" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Grid"));
}
void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException)
@@ -184,10 +184,10 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW );
Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW );
- Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "GridDataModel" )), UNO_QUERY_THROW );
+ Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("GridDataModel"))), UNO_QUERY_THROW );
if(xGridDataModel != NULL)
xGridDataModel->addDataListener(xListener);
- Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "ColumnModel" )), UNO_QUERY_THROW );
+ Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnModel"))), UNO_QUERY_THROW );
if(xGridColumnModel != NULL)
{
for(int i = 0;i<xGridColumnModel->getColumnCount();i++)
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index bf9639901f11..957b55e3afde 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -196,7 +196,7 @@ static void lcl_throwIndexOutOfBoundsException( )
if ( !xRoadmapItem.is() )
lcl_throwIllegalArgumentException();
Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
- sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+ sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
if ( !bIsRoadmapItem )
lcl_throwIllegalArgumentException();
}
@@ -210,12 +210,12 @@ static void lcl_throwIndexOutOfBoundsException( )
if ( xProps.is() )
{
sal_Int32 LocID = 0;
- Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+ Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
aValue >>= LocID;
if (LocID < 0) // index may not be smaller than zero
{
aAny <<= GetUniqueID();
- xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "ID" ), aAny );
+ xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), aAny );
}
}
}
@@ -238,7 +238,7 @@ static void lcl_throwIndexOutOfBoundsException( )
{
CurRoadmapItem = *i;
Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY );
- aAny = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+ aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
aAny >>= n_CurItemID;
if (n_CurItemID == CurID)
{
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
// -------------------------------------------------------------------
::rtl::OUString UnoRoadmapControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "Roadmap" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Roadmap"));
}
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index e12fbfae7565..55a3e8b1b3f9 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -40,22 +40,22 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
{
// registerProperty or registerMayBeVoidProperty or registerPropertyNoMember
- registerProperty( ::rtl::OUString::createFromAscii( "Label" ), RM_PROPERTY_ID_LABEL,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), RM_PROPERTY_ID_LABEL,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
& m_sLabel, ::getCppuType( &m_sLabel ) );
m_nID = -1;
- registerProperty( ::rtl::OUString::createFromAscii( "ID" ), RM_PROPERTY_ID_ID,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), RM_PROPERTY_ID_ID,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
& m_nID, ::getCppuType( &m_nID ) );
m_bEnabled = sal_True;
- registerProperty( ::rtl::OUString::createFromAscii( "Enabled" ), RM_PROPERTY_ID_ENABLED,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), RM_PROPERTY_ID_ENABLED,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bEnabled, ::getCppuType( &m_bEnabled ) );
- registerProperty( ::rtl::OUString::createFromAscii( "Interactive" ), RM_PROPERTY_ID_INTERACTIVE,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interactive")), RM_PROPERTY_ID_INTERACTIVE,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bInteractive, ::getCppuType( &m_bInteractive ) );
@@ -91,20 +91,20 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
::rtl::OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString aStr = ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.RoadmapItem");
+ ::rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.RoadmapItem"));
return aStr;
}
sal_Bool SAL_CALL ORoadmapEntry::supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
{
- return ServiceName.equals( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+ return ServiceName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
}
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem"));
return aRet;
}
//--------------------------------------------------------------------------
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index bb4f35644e3a..47cb26e89453 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -121,7 +121,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
if ( pTabs )
{
// opt: String fuer TabStop als Konstante
- static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) );
+ static const ::rtl::OUString aTabStopName( RTL_CONSTASCII_USTRINGPARAM("Tabstop") );
Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY );
Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo();
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index e2acf791a886..b5b9723d39bb 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -104,7 +104,7 @@ namespace toolkit
::rtl::OUString UnoScrollBarControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "ScrollBar" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScrollBar"));
}
// ::com::sun::star::uno::XInterface
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index f60abcaf3823..2ac9d1f1d478 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -127,7 +127,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "SimpleAnimation" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SimpleAnimation"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index c22cbf1fae10..178108621f7f 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -146,7 +146,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoSpinButtonControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "SpinButton" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinButton"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 0f3d2a58654e..b93ccda7c5ba 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -125,7 +125,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoThrobberControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "Throbber" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 2b3a6d61d9ea..4e5fa657c33e 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -148,7 +148,7 @@ UnoTreeControl::UnoTreeControl()
OUString UnoTreeControl::GetComponentServiceName()
{
- return OUString::createFromAscii( "Tree" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Tree"));
}
// -------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index d078aa358e60..c6d309659a4f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1119,7 +1119,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( !mxModel.is() )
{
RuntimeException aException;
- aException.Message = ::rtl::OUString::createFromAscii( "createPeer: no model!" );
+ aException.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createPeer: no model!"));
aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
throw( aException );
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index b2d56a6c47f7..cde41f613683 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -186,13 +186,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl, UnoControlBase, UnoEditControl
::rtl::OUString UnoEditControl::GetComponentServiceName()
{
// by default, we want a simple edit field
- ::rtl::OUString sName( ::rtl::OUString::createFromAscii( "Edit" ) );
+ ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Edit") );
// but maybe we are to display multi-line text?
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
sal_Bool b = sal_Bool();
if ( ( aVal >>= b ) && b )
- sName= ::rtl::OUString::createFromAscii( "MultiLineEdit" );
+ sName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit"));
return sName;
}
@@ -524,7 +524,7 @@ UnoFileControl::UnoFileControl()
::rtl::OUString UnoFileControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "filecontrol" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filecontrol"));
}
// ----------------------------------------------------
@@ -704,7 +704,7 @@ UnoButtonControl::UnoButtonControl()
::rtl::OUString UnoButtonControl::GetComponentServiceName()
{
- ::rtl::OUString aName( ::rtl::OUString::createFromAscii( "pushbutton" ) );
+ ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM("pushbutton") );
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_PUSHBUTTONTYPE ) );
sal_Int16 n = sal_Int16();
if ( ( aVal >>= n ) && n )
@@ -712,11 +712,11 @@ UnoButtonControl::UnoButtonControl()
// Use PushButtonType later when available...
switch ( n )
{
- case 1 /*PushButtonType::OK*/: aName= ::rtl::OUString::createFromAscii( "okbutton" );
+ case 1 /*PushButtonType::OK*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("okbutton"));
break;
- case 2 /*PushButtonType::CANCEL*/: aName= ::rtl::OUString::createFromAscii( "cancelbutton" );
+ case 2 /*PushButtonType::CANCEL*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cancelbutton"));
break;
- case 3 /*PushButtonType::HELP*/: aName= ::rtl::OUString::createFromAscii( "helpbutton" );
+ case 3 /*PushButtonType::HELP*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("helpbutton"));
break;
default:
{
@@ -924,7 +924,7 @@ UnoImageControlControl::UnoImageControlControl()
::rtl::OUString UnoImageControlControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedimage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedimage"));
}
void UnoImageControlControl::dispose() throw(uno::RuntimeException)
@@ -1014,7 +1014,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
::rtl::OUString UnoRadioButtonControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "radiobutton" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton"));
}
void UnoRadioButtonControl::dispose() throw(uno::RuntimeException)
@@ -1221,7 +1221,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
::rtl::OUString UnoCheckBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "checkbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox"));
}
void UnoCheckBoxControl::dispose() throw(uno::RuntimeException)
@@ -1412,7 +1412,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
::rtl::OUString UnoFixedHyperlinkControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedhyperlink" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedhyperlink"));
}
// uno::XInterface
@@ -1591,7 +1591,7 @@ UnoFixedTextControl::UnoFixedTextControl()
::rtl::OUString UnoFixedTextControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedtext" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
}
// uno::XInterface
@@ -1722,7 +1722,7 @@ UnoGroupBoxControl::UnoGroupBoxControl()
::rtl::OUString UnoGroupBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "groupbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("groupbox"));
}
sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
@@ -2287,7 +2287,7 @@ UnoListBoxControl::UnoListBoxControl()
::rtl::OUString UnoListBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "listbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox"));
}
IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
@@ -2793,7 +2793,7 @@ IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_Uno
::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "combobox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox"));
}
void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
@@ -3246,7 +3246,7 @@ UnoDateFieldControl::UnoDateFieldControl()
::rtl::OUString UnoDateFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "datefield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("datefield"));
}
// uno::XInterface
@@ -3485,7 +3485,7 @@ UnoTimeFieldControl::UnoTimeFieldControl()
::rtl::OUString UnoTimeFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "timefield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("timefield"));
}
// uno::XInterface
@@ -3684,7 +3684,7 @@ UnoNumericFieldControl::UnoNumericFieldControl()
::rtl::OUString UnoNumericFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "numericfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numericfield"));
}
// uno::XInterface
@@ -3884,7 +3884,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
::rtl::OUString UnoCurrencyFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "longcurrencyfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longcurrencyfield"));
}
// uno::XInterface
@@ -4075,7 +4075,7 @@ UnoPatternFieldControl::UnoPatternFieldControl()
::rtl::OUString UnoPatternFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "patternfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("patternfield"));
}
void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
@@ -4220,7 +4220,7 @@ UnoProgressBarControl::UnoProgressBarControl()
::rtl::OUString UnoProgressBarControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "ProgressBar" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressBar"));
}
// uno::XInterface
@@ -4349,7 +4349,7 @@ UnoFixedLineControl::UnoFixedLineControl()
::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "FixedLine" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine"));
}
sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)
generated by cgit (git 2.34.1) at 2025-05-08 21:15:47 +0000