summaryrefslogtreecommitdiff
path: root/toolkit/source/controls
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/controls')
-rw-r--r--toolkit/source/controls/animatedimages.cxx4
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx22
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx4
-rw-r--r--toolkit/source/controls/spinningprogress.cxx4
-rw-r--r--toolkit/source/controls/tabpagecontainer.cxx2
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx7
6 files changed, 21 insertions, 22 deletions
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index c2fd91f1ea46..8ee3bbd866b3 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -289,7 +289,7 @@ namespace toolkit
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "org.openoffice.comp.toolkit.AnimatedImagesControlModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.toolkit.AnimatedImagesControlModel"));
}
//------------------------------------------------------------------------------------------------------------------
@@ -297,7 +297,7 @@ namespace toolkit
{
Sequence< ::rtl::OUString > aServiceNames(2);
aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel );
- aServiceNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" );
+ aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"));
return aServiceNames;
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 56f1b7fab53d..f791ee07ca2d 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -408,7 +408,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl::
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();
@@ -996,8 +996,8 @@ void ControlModelContainerBase::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
}
@@ -1029,8 +1029,8 @@ void ControlModelContainerBase::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
continue;
@@ -1059,8 +1059,8 @@ void ControlModelContainerBase::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
}
@@ -1722,10 +1722,10 @@ void ControlContainerBase::addingControl( const Reference< XControl >& _rxContro
{
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 );
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 7516a422eddd..072a8ae5b09d 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -266,9 +266,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"));
}
void UnoDialogControl::dispose() throw(RuntimeException)
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index cb02274e3997..632d139f8c33 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -122,7 +122,7 @@ namespace toolkit
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "org.openoffice.comp.toolkit.SpinningProgressControlModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.toolkit.SpinningProgressControlModel"));
}
//------------------------------------------------------------------------------------------------------------------
@@ -131,7 +131,7 @@ namespace toolkit
Sequence< ::rtl::OUString > aServiceNames(3);
aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SpinningProgressControlModel );
aServiceNames[1] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel );
- aServiceNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" );
+ aServiceNames[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"));
return aServiceNames;
}
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 222f98105c9a..162f5683153a 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -185,7 +185,7 @@ UnoControlTabPageContainer::UnoControlTabPageContainer( const Reference< XMultiS
OUString UnoControlTabPageContainer::GetComponentServiceName()
{
- return OUString::createFromAscii( "TabPageContainer" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("TabPageContainer"));
}
void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException)
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 5629aa9d12ba..0235139165dc 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -247,14 +247,13 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
//===== Service ===============================================================
::rtl::OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel"));
}
Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel"));
+ const ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel"));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
//=============================================================================
@@ -274,7 +273,7 @@ UnoControlTabPage::~UnoControlTabPage()
::rtl::OUString UnoControlTabPage::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "TabPageModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPageModel"));
}
void UnoControlTabPage::dispose() throw(RuntimeException)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 09:27:40 +0000