diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-08-01 15:00:00 +0300 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-04 05:40:11 +0000 |
commit | 0bd4154b176af84e036c4f0869e635e9fcefed1c (patch) | |
tree | 36cde969568f1705faff9bfb5459b0ca54d0e465 /canvas | |
parent | 51cf057f4e5277ef5ce99c76dd67aeff702a448e (diff) |
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in basctl, basegfx, canvas
Change-Id: I59383d2599793b99b560333387e163a3d80eecec
Reviewed-on: https://gerrit.libreoffice.org/27778
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvasbitmap.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvascustomsprite.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasbitmap.cxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvascustomsprite.cxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasfont.cxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_textlayout.cxx | 4 | ||||
-rw-r--r-- | canvas/source/factory/cf_service.cxx | 3 | ||||
-rw-r--r-- | canvas/source/tools/cachedprimitivebase.cxx | 4 | ||||
-rw-r--r-- | canvas/source/tools/parametricpolypolygon.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvasbitmap.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvascustomsprite.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvasfont.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/textlayout.cxx | 4 |
15 files changed, 15 insertions, 44 deletions
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 86020acaefe3..09e1d210a9e7 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -220,9 +220,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; - - return aRet; + return { "com.sun.star.rendering.CanvasBitmap" }; } } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 2fe5fa28e954..9b5b9e84a65a 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -144,9 +144,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; - - return aRet; + return { "com.sun.star.rendering.CanvasCustomSprite" }; } } diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 8aca75baa26a..00f023a1f01a 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -149,9 +149,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; - - return aRet; + return { "com.sun.star.rendering.CanvasFont" }; } vcl::Font CanvasFont::getVCLFont() const diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 865bcc60b2c3..7247ce8f1c19 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -593,9 +593,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; - - return aRet; + return { "com.sun.star.rendering.TextLayout" }; } } diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 35877ddb639b..f492637990fd 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -251,9 +251,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; - - return aRet; + return { "com.sun.star.rendering.CanvasBitmap" }; } } diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 026a6634a606..148f2636b50d 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -93,9 +93,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; - - return aRet; + return { "com.sun.star.rendering.CanvasCustomSprite" }; } void CanvasCustomSprite::redraw() const diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index 95ec59a5aae4..a7f268eb55bc 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -134,9 +134,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; - - return aRet; + return { "com.sun.star.rendering.CanvasFont" }; } double CanvasFont::getCellAscent() const diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index cca32010b5bd..1d07d474d601 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -247,9 +247,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; - - return aRet; + return { "com.sun.star.rendering.TextLayout" }; } } diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 3aa53db321d4..e617bbffd0ab 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -231,8 +231,7 @@ sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) Sequence<OUString> CanvasFactory::getSupportedServiceNames() throw (RuntimeException, std::exception) { - OUString name("com.sun.star.rendering.CanvasFactory"); - return Sequence<OUString>(&name, 1); + return { "com.sun.star.rendering.CanvasFactory" }; } // XMultiComponentFactory diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 23f801eb6807..2a4639aa1284 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -91,9 +91,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CachedBitmap" }; - - return aRet; + return { "com.sun.star.rendering.CachedBitmap" }; } } diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index ca2bf0d1c325..af9d6ec3ea4b 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -211,9 +211,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.ParametricPolyPolygon" }; - - return aRet; + return { "com.sun.star.rendering.ParametricPolyPolygon" }; } ParametricPolyPolygon::~ParametricPolyPolygon() diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 562e8a46196b..84b3adc7ef0b 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -86,9 +86,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; - - return aRet; + return { "com.sun.star.rendering.CanvasBitmap" }; } BitmapEx CanvasBitmap::getBitmap() const diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index e6a454701c01..acff95a08810 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -127,9 +127,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; - - return aRet; + return { "com.sun.star.rendering.CanvasCustomSprite" }; } // Sprite diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index cd78c2feda9a..06d4ea8d2392 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -161,9 +161,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; - - return aRet; + return { "com.sun.star.rendering.CanvasFont" }; } vcl::Font CanvasFont::getVCLFont() const diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index f1951c6c6c5b..d179ba33a63d 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -472,9 +472,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; - - return aRet; + return { "com.sun.star.rendering.TextLayout" }; } } |