diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-11-15 08:43:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-15 10:13:08 +0000 |
commit | 8e234c5b7d5bae66c544e581bee5770f3f83dd81 (patch) | |
tree | 7d78f03ce2231de4f727d1135449aeb8cba74e99 /canvas | |
parent | 3bdd176731c351638f541a37b94094124f3c9f52 (diff) |
use initialiser syntax for Sequence<OUString>
replaced using the script:
git grep -lP 'Sequence.*OUString.*\(1\)'
| xargs perl -0777 -pi
-e "s/Sequence< OUString > (\w+)\(1\);
.*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g"
Change-Id: I23688a91562051a8eed11fc2a85599545c285c34
Reviewed-on: https://gerrit.libreoffice.org/19967
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 | 3 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvascustomsprite.cxx | 3 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 3 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 3 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasbitmap.cxx | 3 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvascustomsprite.cxx | 3 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvasfont.cxx | 3 | ||||
-rw-r--r-- | canvas/source/directx/dx_config.cxx | 6 | ||||
-rw-r--r-- | canvas/source/directx/dx_textlayout.cxx | 3 | ||||
-rw-r--r-- | canvas/source/tools/cachedprimitivebase.cxx | 3 | ||||
-rw-r--r-- | canvas/source/tools/parametricpolypolygon.cxx | 3 | ||||
-rw-r--r-- | canvas/source/vcl/canvasbitmap.cxx | 3 | ||||
-rw-r--r-- | canvas/source/vcl/canvascustomsprite.cxx | 3 | ||||
-rw-r--r-- | canvas/source/vcl/canvasfont.cxx | 3 | ||||
-rw-r--r-- | canvas/source/vcl/textlayout.cxx | 3 |
15 files changed, 16 insertions, 32 deletions
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 9a2cad1e7c70..947d1857c16c 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -213,8 +213,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasBitmap"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; return aRet; } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 2a2d94cc2336..e527cb486e1b 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -149,8 +149,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasCustomSprite"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; return aRet; } diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 2a5bdbb2caf7..875feae4283c 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -149,8 +149,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasFont"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; return aRet; } diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 2f4af89fb2c9..58a860a1f043 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -591,8 +591,7 @@ namespace cairocanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.TextLayout"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; return aRet; } diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index c30c74f94659..2af84a56dbab 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -256,8 +256,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasBitmap"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; return aRet; } diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index b6295424e005..e56237a7ac98 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -93,8 +93,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasCustomSprite"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; return aRet; } diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index 92528376b9d4..95ec59a5aae4 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -134,8 +134,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasFont"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; return aRet; } diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index be4c3c70bbf2..2ab26c1ca78e 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -43,8 +43,7 @@ namespace dxcanvas { try { - uno::Sequence< OUString > aName(1); - aName[0] = "DeviceBlacklist"; + uno::Sequence< OUString > aName { "DeviceBlacklist" }; uno::Sequence< uno::Any > aProps( GetProperties( aName )); uno::Sequence< sal_Int32 > aValues; @@ -96,8 +95,7 @@ namespace dxcanvas try { - uno::Sequence< OUString > aName(1); - aName[0] = "DeviceBlacklist"; + uno::Sequence< OUString > aName { "DeviceBlacklist" }; uno::Sequence< sal_Int32 > aValues( sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() ); diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index fea9d9600a57..fc3111ab0db6 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -258,8 +258,7 @@ namespace dxcanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.TextLayout"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; return aRet; } diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 02bf2ea7e9f1..23f801eb6807 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -91,8 +91,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CachedBitmap"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CachedBitmap" }; return aRet; } diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 29b35a389f10..e38ab876594f 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -211,8 +211,7 @@ namespace canvas uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.ParametricPolyPolygon"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.ParametricPolyPolygon" }; return aRet; } diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 3bb99f1acbfe..a254f00f99a4 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -86,8 +86,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasBitmap"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasBitmap" }; return aRet; } diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index aec9d8f2635b..e6a454701c01 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -127,8 +127,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasCustomSprite"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasCustomSprite" }; return aRet; } diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index d474e80019a4..efb880945014 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -161,8 +161,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.CanvasFont"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.CanvasFont" }; return aRet; } diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index d86fb802583c..13cf03c9cc0a 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -472,8 +472,7 @@ namespace vclcanvas uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.rendering.TextLayout"; + uno::Sequence< OUString > aRet { "com.sun.star.rendering.TextLayout" }; return aRet; } |