canvas/source/cairo/cairo_canvas.cxx | 4 ++-- canvas/source/cairo/cairo_canvasbitmap.cxx | 4 ++-- canvas/source/cairo/cairo_canvascustomsprite.cxx | 4 ++-- canvas/source/cairo/cairo_canvasfont.cxx | 4 ++-- canvas/source/cairo/cairo_spritecanvas.cxx | 2 +- canvas/source/cairo/cairo_textlayout.cxx | 4 ++-- canvas/source/tools/cachedprimitivebase.cxx | 4 ++-- canvas/source/tools/parametricpolypolygon.cxx | 4 ++-- canvas/source/vcl/canvas.cxx | 4 ++-- canvas/source/vcl/canvasbitmap.cxx | 4 ++-- canvas/source/vcl/canvascustomsprite.cxx | 4 ++-- canvas/source/vcl/canvasfont.cxx | 4 ++-- canvas/source/vcl/textlayout.cxx | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-)
New commits: commit 6a831189367528d8d9eea0eb6826af401f756cc6 Author: Arnaud VERSINI <arnaud.vers...@pm.me> AuthorDate: Tue Feb 6 13:04:11 2024 +0100 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Thu Feb 8 04:37:27 2024 +0100 canvas : use more OUString literals Change-Id: I539e1e6d04299154bfe1ad2cf0362bdf3d96537b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163051 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 1a16a9f813cb..100ee51c0aa2 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -110,7 +110,7 @@ namespace cairocanvas OUString SAL_CALL Canvas::getServiceName( ) { - return "com.sun.star.rendering.Canvas.Cairo"; + return u"com.sun.star.rendering.Canvas.Cairo"_ustr; } // XServiceInfo @@ -121,7 +121,7 @@ namespace cairocanvas } OUString Canvas::getImplementationName() { - return "com.sun.star.comp.rendering.Canvas.Cairo"; + return u"com.sun.star.comp.rendering.Canvas.Cairo"_ustr; } css::uno::Sequence< OUString > Canvas::getSupportedServiceNames() { diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 9f18be80824a..c4de75ee2fce 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -145,7 +145,7 @@ namespace cairocanvas OUString SAL_CALL CanvasBitmap::getImplementationName( ) { - return "CairoCanvas.CanvasBitmap"; + return u"CairoCanvas.CanvasBitmap"_ustr; } sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) @@ -155,7 +155,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { - return { "com.sun.star.rendering.CanvasBitmap" }; + return { u"com.sun.star.rendering.CanvasBitmap"_ustr }; } } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index f7fffb6e50be..72fb291ebf35 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -134,7 +134,7 @@ namespace cairocanvas OUString SAL_CALL CanvasCustomSprite::getImplementationName() { - return "CairoCanvas.CanvasCustomSprite"; + return u"CairoCanvas.CanvasCustomSprite"_ustr; } sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) @@ -144,7 +144,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { - return { "com.sun.star.rendering.CanvasCustomSprite" }; + return { u"com.sun.star.rendering.CanvasCustomSprite"_ustr }; } } diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 2445f408853c..a2650811b721 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -139,7 +139,7 @@ namespace cairocanvas OUString SAL_CALL CanvasFont::getImplementationName() { - return "CairoCanvas::CanvasFont"; + return u"CairoCanvas::CanvasFont"_ustr; } sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) @@ -149,7 +149,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { - return { "com.sun.star.rendering.CanvasFont" }; + return { u"com.sun.star.rendering.CanvasFont"_ustr }; } vcl::Font const & CanvasFont::getVCLFont() const diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 5af40370c57f..be26b17774d7 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -144,7 +144,7 @@ namespace cairocanvas } OUString SpriteCanvas::getImplementationName() { - return "com.sun.star.comp.rendering.SpriteCanvas.Cairo"; + return u"com.sun.star.comp.rendering.SpriteCanvas.Cairo"_ustr; } css::uno::Sequence< OUString > SpriteCanvas::getSupportedServiceNames() { diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 8ecd0e025976..e033040d01b2 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -346,7 +346,7 @@ namespace cairocanvas OUString SAL_CALL TextLayout::getImplementationName() { - return "CairoCanvas::TextLayout"; + return u"CairoCanvas::TextLayout"_ustr; } sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) @@ -356,7 +356,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { - return { "com.sun.star.rendering.TextLayout" }; + return { u"com.sun.star.rendering.TextLayout"_ustr }; } } diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 7aaf3d58ac5e..73b09758dce2 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -76,7 +76,7 @@ namespace canvas OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) { - return "canvas::CachedPrimitiveBase"; + return u"canvas::CachedPrimitiveBase"_ustr; } sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) @@ -86,7 +86,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) { - return { "com.sun.star.rendering.CachedBitmap" }; + return { u"com.sun.star.rendering.CachedBitmap"_ustr }; } } diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 8c660a5e5308..ca42d7fe36f7 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -181,7 +181,7 @@ namespace canvas OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) { - return "Canvas::ParametricPolyPolygon"; + return u"Canvas::ParametricPolyPolygon"_ustr; } sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) @@ -191,7 +191,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) { - return { "com.sun.star.rendering.ParametricPolyPolygon" }; + return { u"com.sun.star.rendering.ParametricPolyPolygon"_ustr }; } ParametricPolyPolygon::~ParametricPolyPolygon() diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 9408a4dbb66c..4a3b6f8d766b 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -94,11 +94,11 @@ namespace vclcanvas OUString SAL_CALL Canvas::getServiceName( ) { - return "com.sun.star.rendering.Canvas.VCL"; + return u"com.sun.star.rendering.Canvas.VCL"_ustr; } OUString Canvas::getImplementationName() { - return "com.sun.star.comp.rendering.Canvas.VCL"; + return u"com.sun.star.comp.rendering.Canvas.VCL"_ustr; } sal_Bool Canvas::supportsService(OUString const & ServiceName) { diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 9ae37c2c495a..193afd62c6b2 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -71,7 +71,7 @@ namespace vclcanvas OUString SAL_CALL CanvasBitmap::getImplementationName( ) { - return "VCLCanvas.CanvasBitmap"; + return u"VCLCanvas.CanvasBitmap"_ustr; } sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) @@ -81,7 +81,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { - return { "com.sun.star.rendering.CanvasBitmap" }; + return { u"com.sun.star.rendering.CanvasBitmap"_ustr }; } BitmapEx CanvasBitmap::getBitmap() const diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index 02e9b47fb233..316176f6ac24 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -103,7 +103,7 @@ namespace vclcanvas OUString SAL_CALL CanvasCustomSprite::getImplementationName() { - return "VCLCanvas.CanvasCustomSprite"; + return u"VCLCanvas.CanvasCustomSprite"_ustr; } sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) @@ -113,7 +113,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { - return { "com.sun.star.rendering.CanvasCustomSprite" }; + return { u"com.sun.star.rendering.CanvasCustomSprite"_ustr }; } // Sprite diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 336f70d632f0..d827368969ba 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -134,7 +134,7 @@ namespace vclcanvas OUString SAL_CALL CanvasFont::getImplementationName() { - return "VCLCanvas::CanvasFont"; + return u"VCLCanvas::CanvasFont"_ustr; } sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) @@ -144,7 +144,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { - return { "com.sun.star.rendering.CanvasFont" }; + return { u"com.sun.star.rendering.CanvasFont"_ustr }; } vcl::Font const & CanvasFont::getVCLFont() const diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 25318ee1fbce..23c450e66149 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -434,7 +434,7 @@ namespace vclcanvas OUString SAL_CALL TextLayout::getImplementationName() { - return "VCLCanvas::TextLayout"; + return u"VCLCanvas::TextLayout"_ustr; } sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) @@ -444,7 +444,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { - return { "com.sun.star.rendering.TextLayout" }; + return { u"com.sun.star.rendering.TextLayout"_ustr }; } }