diff options
Diffstat (limited to 'canvas/workben/canvasdemo.cxx')
| -rw-r--r-- | canvas/workben/canvasdemo.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 6cb2afa82d7b..db72a7df4079 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,6 +54,7 @@ #include <vcl/canvastools.hxx> #include <rtl/bootstrap.hxx> +#include <sal/macros.h> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/FillRule.hpp> @@ -91,7 +93,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString::createFromAscii( "Canvas test" ) ); + SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Canvas test" )) ); SetSizePixel( Size( 600, 450 ) ); EnablePaint( true ); Show(); @@ -151,8 +153,8 @@ class DemoRenderer lang::Locale aLocale; rendering::FontInfo aFontInfo; - aFontInfo.FamilyName = ::rtl::OUString::createFromAscii( "Swiss" ); - aFontInfo.StyleName = ::rtl::OUString::createFromAscii( "SansSerif" ); + aFontInfo.FamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Swiss" )); + aFontInfo.StyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SansSerif" )); geometry::Matrix2D aFontMatrix( 1, 0, 0, 1 ); rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale ); @@ -250,7 +252,7 @@ class DemoRenderer { const double SCALE=7.0; const char hilbert[] = "urdrrulurulldluuruluurdrurddldrrruluurdrurddldrddlulldrdldrrurd"; - int nLength = sizeof( hilbert ) / sizeof (hilbert [0]); + int nLength = SAL_N_ELEMENTS( hilbert ); uno::Sequence< geometry::RealPoint2D > aPoints( nLength ); uno::Reference< rendering::XLinePolyPolygon2D > xPoly; @@ -655,8 +657,8 @@ void DemoApp::Main() { ::rtl::OUString aParam = GetCommandLineParam( i ); - if( aParam.equalsAscii( "--help" ) || - aParam.equalsAscii( "-h" ) ) + if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || + aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) bHelp = true; } @@ -690,8 +692,8 @@ void DemoApp::Main() // Create UCB. uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); InitVCL( xFactory ); @@ -710,3 +712,4 @@ DemoApp aDemoApp; // - complete all of pre-existing canvas bits // - affine transform tweakage ... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |