From 563a9b7ab3cc1ed0166d1bfe0568124a2fd9b80e Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Mon, 1 Apr 2013 21:08:13 +0200 Subject: Remove RTL_CONSTASCII_USTRINGPARAM in smoketest/sot/svl/toolkit/vbahelper Change-Id: I0816631a1d0c68dcef9c640c91d00ac9942ded28 --- toolkit/source/awt/vclxtoolkit.cxx | 6 +++--- toolkit/source/awt/vclxwindows.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index ab08d923e8f3..9cb085378cdf 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -582,12 +582,12 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, Window* pNewWindow = NULL; sal_uInt16 nType = ImplGetComponentType( aServiceName ); bool bFrameControl = false; - if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("frame") ) ) + if ( aServiceName == String( "frame" ) ) bFrameControl = true; - if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs") ) ) + if ( aServiceName == String( "tabcontrolnotabs" ) ) { nWinBits |= WB_NOBORDER; - nType = ImplGetComponentType( String( RTL_CONSTASCII_USTRINGPARAM("tabcontrol") ) ); + nType = ImplGetComponentType( String( "tabcontrol" ) ); } if ( !pParent ) { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 0eb97e2e345c..bba1abeb06c5 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2677,7 +2677,7 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea const rtl::OUString &name = Properties[i].Name; const uno::Any &value = Properties[i].Value; - if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title"))) + if (name == "Title") { rtl::OUString title = value.get(); pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( ID ), title ); @@ -2695,7 +2695,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3 #define ADD_PROP( seq, i, name, val ) { \ beans::NamedValue value; \ - value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \ + value.Name = rtl::OUString( name ); \ value.Value = uno::makeAny( val ); \ seq[i] = value; \ } -- cgit