From 58ae10ed582d845412210042db97a9c47a66a55b Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Mon, 7 Jan 2013 19:42:36 +0100 Subject: RTL_CONSTASCII_(U)STRINGPARAM removed in canvas (WIP) Change-Id: Id8db06826b77a2b59df51dc0829cd9e7539045fa --- canvas/source/vcl/canvas.cxx | 5 ++--- canvas/source/vcl/canvasbitmap.cxx | 10 +++++----- canvas/source/vcl/canvascustomsprite.cxx | 10 +++++----- canvas/source/vcl/canvasfont.cxx | 10 +++++----- canvas/source/vcl/spritecanvas.cxx | 4 ++-- canvas/source/vcl/spritecanvashelper.cxx | 18 ++++++++---------- canvas/source/vcl/textlayout.cxx | 10 +++++----- canvas/source/vcl/windowoutdevholder.cxx | 3 +-- 8 files changed, 33 insertions(+), 37 deletions(-) diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 9cfb73a53539..4b59cef867e7 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -101,8 +101,7 @@ namespace vclcanvas OutputDevice* pOutDev = reinterpret_cast(nPtr); if( !pOutDev ) throw lang::NoSupportException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Passed OutDev invalid!")), + ::rtl::OUString( "Passed OutDev invalid!" ), NULL); OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) ); @@ -134,7 +133,7 @@ namespace vclcanvas ::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CANVAS_SERVICE_NAME ) ); + return ::rtl::OUString( CANVAS_SERVICE_NAME ); } bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index a943ba6c55a9..b941eb18f806 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -74,9 +74,9 @@ namespace vclcanvas #define IMPLEMENTATION_NAME "VCLCanvas.CanvasBitmap" #define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap" - ::rtl::OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) ); + return OUString( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) @@ -84,10 +84,10 @@ namespace vclcanvas return ServiceName == SERVICE_NAME; } - uno::Sequence< ::rtl::OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + uno::Sequence< OUString > aRet(1); + aRet[0] = OUString( SERVICE_NAME ); return aRet; } diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index f1cb72dfeafb..a45221278c42 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -121,9 +121,9 @@ namespace vclcanvas #define IMPLEMENTATION_NAME "VCLCanvas.CanvasCustomSprite" #define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite" - ::rtl::OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) ); + return OUString( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) @@ -131,10 +131,10 @@ namespace vclcanvas return ServiceName == SERVICE_NAME; } - uno::Sequence< ::rtl::OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + uno::Sequence< OUString > aRet(1); + aRet[0] = OUString( SERVICE_NAME ); return aRet; } diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 12fe3094217c..8f422f73b358 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -153,9 +153,9 @@ namespace vclcanvas #define IMPLEMENTATION_NAME "VCLCanvas::CanvasFont" #define SERVICE_NAME "com.sun.star.rendering.CanvasFont" - ::rtl::OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) ); + return OUString( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL CanvasFont::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) @@ -163,10 +163,10 @@ namespace vclcanvas return ServiceName == SERVICE_NAME; } - uno::Sequence< ::rtl::OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + uno::Sequence< OUString > aRet(1); + aRet[0] = OUString( SERVICE_NAME ); return aRet; } diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 2a950d6048f0..c18a7f9e6a58 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -149,9 +149,9 @@ namespace vclcanvas mbSurfaceDirty); } - ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SPRITECANVAS_SERVICE_NAME ) ); + return OUString( SPRITECANVAS_SERVICE_NAME ); } bool SpriteCanvas::repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 2f69d9dceb8c..dc663954d254 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -591,15 +591,15 @@ namespace vclcanvas const double denominator( maLastUpdate.getElapsedTime() ); maLastUpdate.reset(); - ::rtl::OUString text( ::rtl::math::doubleToUString( denominator == 0.0 ? 100.0 : 1.0/denominator, + OUString text( ::rtl::math::doubleToUString( denominator == 0.0 ? 100.0 : 1.0/denominator, rtl_math_StringFormat_F, 2,'.',NULL,' ') ); // pad with leading space while( text.getLength() < 6 ) - text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text; + text = " " + text; - text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" fps")); + text += " fps"; renderInfoText( rOutDev, text, @@ -648,9 +648,9 @@ namespace vclcanvas // pad with leading space while( text.getLength() < 3 ) - text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text; + text = " " + text; - text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Sprites: ")) + text; + text = "Sprites: " + text; renderInfoText( rOutDev, text, @@ -684,17 +684,15 @@ namespace vclcanvas rVDevSize.Width()*rVDevSize.Height() * BYTES_PER_PIXEL + rBackBufferSize.Width()*rBackBufferSize.Height() * BYTES_PER_PIXEL ); - ::rtl::OUString text( ::rtl::math::doubleToUString( nMemUsage / 1048576.0, + OUString text( ::rtl::math::doubleToUString( nMemUsage / 1048576.0, rtl_math_StringFormat_F, 2,'.',NULL,' ') ); // pad with leading space while( text.getLength() < 4 ) - text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text; + text = " " + text; - text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Mem: ")) + - text + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MB")); + text = "Mem: " + text + "MB"; renderInfoText( rOutDev, text, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 4122d8a45797..72ede12ae85b 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -466,9 +466,9 @@ namespace vclcanvas #define IMPLEMENTATION_NAME "VCLCanvas::TextLayout" #define SERVICE_NAME "com.sun.star.rendering.TextLayout" - ::rtl::OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) ); + return OUString( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) @@ -476,10 +476,10 @@ namespace vclcanvas return ServiceName == SERVICE_NAME; } - uno::Sequence< ::rtl::OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + uno::Sequence< OUString > aRet(1); + aRet[0] = OUString( SERVICE_NAME ); return aRet; } diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx index e93900e2be35..92f4e0ebf0eb 100644 --- a/canvas/source/vcl/windowoutdevholder.cxx +++ b/canvas/source/vcl/windowoutdevholder.cxx @@ -34,8 +34,7 @@ namespace vclcanvas Window* pWindow = VCLUnoHelper::GetWindow(xWin); if( !pWindow ) throw lang::NoSupportException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Parent window not VCL window, or canvas out-of-process!")), + "Parent window not VCL window, or canvas out-of-process!", NULL); return *pWindow; } -- cgit v1.2.3