From 6721d123fbb97007281e59537a77b6e5bf1651dc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:58:11 +0200 Subject: Improved loplugin:stringconstant (now that GCC 7 supports it): canvas Change-Id: Ia01e9c6a5a730e0efe97a9315810a5dfef5ec98f Reviewed-on: https://gerrit.libreoffice.org/76693 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- canvas/source/cairo/cairo_canvas.cxx | 2 +- canvas/source/cairo/cairo_canvasbitmap.cxx | 2 +- canvas/source/cairo/cairo_canvascustomsprite.cxx | 2 +- canvas/source/cairo/cairo_canvasfont.cxx | 2 +- canvas/source/cairo/cairo_spritecanvas.cxx | 2 +- canvas/source/cairo/cairo_textlayout.cxx | 2 +- canvas/source/factory/cf_service.cxx | 2 +- canvas/source/opengl/ogl_spritecanvas.cxx | 2 +- canvas/source/simplecanvas/simplecanvasimpl.cxx | 2 +- canvas/source/tools/cachedprimitivebase.cxx | 2 +- canvas/source/tools/parametricpolypolygon.cxx | 2 +- canvas/source/vcl/canvas.cxx | 2 +- canvas/source/vcl/canvasbitmap.cxx | 2 +- canvas/source/vcl/canvascustomsprite.cxx | 2 +- canvas/source/vcl/canvasfont.cxx | 2 +- canvas/source/vcl/spritecanvas.cxx | 2 +- canvas/source/vcl/textlayout.cxx | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'canvas') diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 036d443aba7a..025beafda4ba 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -120,7 +120,7 @@ namespace cairocanvas OUString SAL_CALL Canvas::getServiceName( ) { - return OUString( CANVAS_SERVICE_NAME ); + return CANVAS_SERVICE_NAME; } bool Canvas::repaint( const SurfaceSharedPtr& pSurface, diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 87f4ebc0c204..938f1b3bdd2e 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -146,7 +146,7 @@ namespace cairocanvas OUString SAL_CALL CanvasBitmap::getImplementationName( ) { - return OUString( "CairoCanvas.CanvasBitmap" ); + return "CairoCanvas.CanvasBitmap"; } sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 3883e051df6a..eb166588c7eb 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -135,7 +135,7 @@ namespace cairocanvas OUString SAL_CALL CanvasCustomSprite::getImplementationName() { - return OUString( "CairoCanvas.CanvasCustomSprite" ); + return "CairoCanvas.CanvasCustomSprite"; } sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index dac423fd6901..472c18cb932b 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -133,7 +133,7 @@ namespace cairocanvas OUString SAL_CALL CanvasFont::getImplementationName() { - return OUString( "CairoCanvas::CanvasFont" ); + return "CairoCanvas::CanvasFont"; } sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 113c7541964b..3b4e5aa1bb69 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -140,7 +140,7 @@ namespace cairocanvas OUString SAL_CALL SpriteCanvas::getServiceName( ) { - return OUString( SPRITECANVAS_SERVICE_NAME ); + return SPRITECANVAS_SERVICE_NAME; } SurfaceSharedPtr SpriteCanvas::getSurface() diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 5e7fca21f61a..8cfa4d40a38e 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -553,7 +553,7 @@ namespace cairocanvas OUString SAL_CALL TextLayout::getImplementationName() { - return OUString( "CairoCanvas::TextLayout" ); + return "CairoCanvas::TextLayout"; } sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 26be9d34b1c0..ce4caad1684b 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -217,7 +217,7 @@ CanvasFactory::~CanvasFactory() // XServiceInfo OUString CanvasFactory::getImplementationName() { - return OUString("com.sun.star.comp.rendering.CanvasFactory"); + return "com.sun.star.comp.rendering.CanvasFactory"; } sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index ccc0025172b5..0bed1cac8565 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -140,7 +140,7 @@ namespace oglcanvas OUString SAL_CALL SpriteCanvas::getServiceName( ) { - return OUString( SPRITECANVAS_SERVICE_NAME ); + return SPRITECANVAS_SERVICE_NAME; } void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite ) diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 724e4dbb5372..564e26199284 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -173,7 +173,7 @@ namespace // Ifc XServiceName virtual OUString SAL_CALL getServiceName( ) override { - return OUString( SERVICE_NAME ); + return SERVICE_NAME; } // Ifc XSimpleCanvas diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 331db5e5bb1d..dac4dd08768d 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -78,7 +78,7 @@ namespace canvas OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) { - return OUString("canvas::CachedPrimitiveBase"); + return "canvas::CachedPrimitiveBase"; } sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index bdfa9dbeae12..d0e3f48f5b83 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -194,7 +194,7 @@ namespace canvas OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) { - return OUString( "Canvas::ParametricPolyPolygon" ); + return "Canvas::ParametricPolyPolygon"; } sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index c33185b2999c..56f2bc0f0c64 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -127,7 +127,7 @@ namespace vclcanvas OUString SAL_CALL Canvas::getServiceName( ) { - return OUString( CANVAS_SERVICE_NAME ); + return CANVAS_SERVICE_NAME; } bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 638d71764856..48bd6c5d963c 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -76,7 +76,7 @@ namespace vclcanvas OUString SAL_CALL CanvasBitmap::getImplementationName( ) { - return OUString( "VCLCanvas.CanvasBitmap" ); + return "VCLCanvas.CanvasBitmap"; } sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index 27cd685f2325..4e504155e73f 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -117,7 +117,7 @@ namespace vclcanvas OUString SAL_CALL CanvasCustomSprite::getImplementationName() { - return OUString( "VCLCanvas.CanvasCustomSprite" ); + return "VCLCanvas.CanvasCustomSprite"; } sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index b21ffd4cdaaa..5609cb3334d5 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -153,7 +153,7 @@ namespace vclcanvas OUString SAL_CALL CanvasFont::getImplementationName() { - return OUString( "VCLCanvas::CanvasFont" ); + return "VCLCanvas::CanvasFont"; } sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 429559fbe964..90697dda794d 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -141,7 +141,7 @@ namespace vclcanvas OUString SAL_CALL SpriteCanvas::getServiceName( ) { - return OUString( SPRITECANVAS_SERVICE_NAME ); + return SPRITECANVAS_SERVICE_NAME; } bool SpriteCanvas::repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 3eee412c3416..48e6aaac79dc 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -409,7 +409,7 @@ namespace vclcanvas OUString SAL_CALL TextLayout::getImplementationName() { - return OUString( "VCLCanvas::TextLayout" ); + return "VCLCanvas::TextLayout"; } sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) -- cgit