summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 11:56:17 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 12:58:04 -0500
commit4d20c0d5893718e14f661cd316a6def6a008518e (patch)
tree53717102b33c4e5b1b15637fd5d8e939c724d62d /canvas
parent343bd286c9693c7411bb7e622b4d487b8205fc10 (diff)
targeted string re-work
Change-Id: I73abfa24f5bb7f25afddef820bb4725bf7cee359
Diffstat (limited to 'canvas')
-rw-r--r--canvas/workben/canvasdemo.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 4a3449cb96d1..1aa919f28d40 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -90,7 +90,7 @@ class TestWindow : public Dialog
public:
TestWindow() : Dialog( (Window *) NULL )
{
- SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Canvas test" )) );
+ SetText( rtl::OUString( "Canvas test" ) );
SetSizePixel( Size( 600, 450 ) );
EnablePaint( true );
Show();
@@ -150,8 +150,8 @@ class DemoRenderer
lang::Locale aLocale;
rendering::FontInfo aFontInfo;
- aFontInfo.FamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Swiss" ));
- aFontInfo.StyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SansSerif" ));
+ aFontInfo.FamilyName = ::rtl::OUString( "Swiss" );
+ aFontInfo.StyleName = ::rtl::OUString( "SansSerif" );
geometry::Matrix2D aFontMatrix( 1, 0,
0, 1 );
rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale );
@@ -688,8 +688,8 @@ void DemoApp::Main()
// Create UCB.
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE );
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
InitVCL( xFactory );