summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-05-29 19:08:42 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-05-29 19:30:23 -0500
commit601500f8a85d170f3278f905c6b6795b2dd0fa8b (patch)
treee886a669ff35c7dce31344ed2a9c365cd7d931f1 /toolkit
parentc88234357f97020885010d50aa3e2c3e1c53d605 (diff)
targeted string re-work
Change-Id: I6ce76c22118586b213161a0e307a53b22b318004
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index e50d96812ca8..41633b5a5050 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -69,9 +69,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
-#define PROPERTY_DIALOGSOURCEURL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogSourceURL" ))
-#define PROPERTY_IMAGEURL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ))
-#define PROPERTY_GRAPHIC ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ))
+#define PROPERTY_DIALOGSOURCEURL ::rtl::OUString( "DialogSourceURL" )
+#define PROPERTY_IMAGEURL ::rtl::OUString( "ImageURL" )
+#define PROPERTY_GRAPHIC ::rtl::OUString( "Graphic" )
//
// we probably will need both a hash of control models and hash of controls
@@ -282,9 +282,9 @@ UnoDialogControl::~UnoDialogControl()
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialog"));
+ return ::rtl::OUString("Dialog");
else
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPage"));
+ return ::rtl::OUString("TabPage");
}
void UnoDialogControl::dispose() throw(RuntimeException)
@@ -456,8 +456,8 @@ throw (::com::sun::star::uno::RuntimeException)
Sequence< rtl::OUString > aProps( 2 );
Sequence< Any > aValues( 2 );
// Properties in a sequence must be sorted!
- aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ));
- aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
+ aProps[0] = rtl::OUString( "Height" );
+ aProps[1] = rtl::OUString( "Width" );
aValues[0] <<= aAppFontSize.Height();
aValues[1] <<= aAppFontSize.Width();
@@ -483,8 +483,8 @@ throw (::com::sun::star::uno::RuntimeException)
mbPosModified = true;
Sequence< rtl::OUString > aProps( 2 );
Sequence< Any > aValues( 2 );
- aProps[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionX" ));
- aProps[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionY" ));
+ aProps[0] = rtl::OUString( "PositionX" );
+ aProps[1] = rtl::OUString( "PositionY" );
aValues[0] <<= aTmp.Width();
aValues[1] <<= aTmp.Height();
@@ -731,9 +731,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(RTL_CONSTASCII_USTRINGPARAM("tabcontrol"));
+ return ::rtl::OUString("tabcontrol");
// Hopefully we can tweak the tabcontrol to display without tabs
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs"));
+ return ::rtl::OUString("tabcontrolnotabs");
}
void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
@@ -917,7 +917,7 @@ UnoPageControl::~UnoPageControl()
::rtl::OUString UnoPageControl::GetComponentServiceName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabpage"));
+ return ::rtl::OUString("tabpage");
}
@@ -1024,7 +1024,7 @@ UnoFrameControl::~UnoFrameControl()
::rtl::OUString UnoFrameControl::GetComponentServiceName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("frame"));
+ return ::rtl::OUString("frame");
}
void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )