From b733aa815680ae00576253ab2a1371adb862ccd3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 10 Jun 2011 23:53:58 +0100 Subject: createFromAscii -> RTL_CONSTASCII_USTRINGPARAM --- toolkit/source/awt/vclxtabpagemodel.cxx | 6 +++--- toolkit/source/awt/vclxtoolkit.cxx | 8 ++++---- toolkit/source/controls/animatedimages.cxx | 4 ++-- .../source/controls/controlmodelcontainerbase.cxx | 22 +++++++++++----------- toolkit/source/controls/dialogcontrol.cxx | 4 ++-- toolkit/source/controls/spinningprogress.cxx | 4 ++-- toolkit/source/controls/tabpagecontainer.cxx | 2 +- toolkit/source/controls/tabpagemodel.cxx | 7 +++---- 8 files changed, 28 insertions(+), 29 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx index c7145992bd7f..6f8b2b51c134 100644 --- a/toolkit/source/awt/vclxtabpagemodel.cxx +++ b/toolkit/source/awt/vclxtabpagemodel.cxx @@ -107,7 +107,7 @@ void SAL_CALL VCLXTabPageModel::setEnabled( ::sal_Bool _enabled ) throw (::com:: //if ( pTabControl ) // return pTabControl->GetPageText(0); //else - return ::rtl::OUString::createFromAscii(""); + return ::rtl::OUString(); } void SAL_CALL VCLXTabPageModel::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException) { @@ -118,7 +118,7 @@ void SAL_CALL VCLXTabPageModel::setTitle( const ::rtl::OUString& _title ) throw } ::rtl::OUString SAL_CALL VCLXTabPageModel::getImageURL() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii(""); + return ::rtl::OUString(); } void SAL_CALL VCLXTabPageModel::setImageURL( const ::rtl::OUString& /*_imageurl*/ ) throw (::com::sun::star::uno::RuntimeException) { @@ -127,7 +127,7 @@ void SAL_CALL VCLXTabPageModel::setImageURL( const ::rtl::OUString& /*_imageurl* ::rtl::OUString SAL_CALL VCLXTabPageModel::getTooltip() throw (::com::sun::star::uno::RuntimeException) { //return m_sTooltip; - return ::rtl::OUString::createFromAscii(""); + return ::rtl::OUString(); } void SAL_CALL VCLXTabPageModel::setTooltip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 6a303eee1ef0..f255777f5cb6 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -893,8 +893,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, break; case WINDOW_TABPAGE: /* - if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( - ::rtl::OUString::createFromAscii("tabpagemodel") ) ) + if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL( + RTL_CONSTASCII_STRINGPARAM("tabpagemodel") ) ) { pNewWindow = new TabControl( pParent, nWinBits ); *ppNewComp = new VCLXTabPageContainer; @@ -1031,8 +1031,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, // (compatibility) *ppNewComp = new ::toolkit::XThrobber; } - else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( - ::rtl::OUString::createFromAscii("tabpagecontainer") ) ) + else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL( + RTL_CONSTASCII_STRINGPARAM("tabpagecontainer") ) ) { pNewWindow = new TabControl( pParent, nWinBits ); *ppNewComp = new VCLXTabPageContainer; 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& 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 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(&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) -- cgit