[Libreoffice-commits] core.git: basctl/source basegfx/source canvas/source
Muhammet Kara
muhammet.kara at pardus.org.tr
Thu Aug 4 05:40:53 UTC 2016
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 3 +--
basctl/source/accessibility/accessibledialogwindow.cxx | 3 +--
basctl/source/basicide/unomodel.cxx | 3 +--
basegfx/source/tools/unopolypolygon.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_textlayout.cxx | 4 +---
canvas/source/directx/dx_canvasbitmap.cxx | 4 +---
canvas/source/directx/dx_canvascustomsprite.cxx | 4 +---
canvas/source/directx/dx_canvasfont.cxx | 4 +---
canvas/source/directx/dx_textlayout.cxx | 4 +---
canvas/source/factory/cf_service.cxx | 3 +--
canvas/source/tools/cachedprimitivebase.cxx | 4 +---
canvas/source/tools/parametricpolypolygon.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 +---
19 files changed, 19 insertions(+), 53 deletions(-)
New commits:
commit 0bd4154b176af84e036c4f0869e635e9fcefed1c
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Mon Aug 1 15:00:00 2016 +0300
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index a0b4d47..b4f8ac0 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -301,8 +301,7 @@ sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rService
Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
- Sequence<OUString> aNames { "com.sun.star.drawing.AccessibleShape" };
- return aNames;
+ return { "com.sun.star.drawing.AccessibleShape" };
}
// XAccessible
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index dc56db4..18e07bc 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -585,8 +585,7 @@ sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName )
Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
- Sequence<OUString> aNames { "com.sun.star.awt.AccessibleWindow" };
- return aNames;
+ return { "com.sun.star.awt.AccessibleWindow" };
}
// XAccessible
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index fe1942b..5cceb2a 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -99,8 +99,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() throw( uno::Runt
uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static()
{
- uno::Sequence< OUString > aRet { "com.sun.star.script.BasicIDE" };
- return aRet;
+ return { "com.sun.star.script.BasicIDE" };
}
uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 2e12a9e..12e00a7 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -448,9 +448,7 @@ namespace unotools
uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{
- uno::Sequence<OUString> aRet { SERVICE_NAME };
-
- return aRet;
+ return { SERVICE_NAME };
}
B2DPolyPolygon UnoPolyPolygon::getPolyPolygon() const
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 86020ac..09e1d21 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 2fe5fa2..9b5b9e8 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 8aca75b..00f023a 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 865bcc6..7247ce8 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 35877dd..f492637 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 026a663..148f263 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 95ec59a..a7f268e 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 cca3201..1d07d47 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 3aa53db..e617bbf 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 23f801e..2a4639a 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 ca2bf0d..af9d6ec 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 562e8a4..84b3adc 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 e6a4547..acff95a 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 cd78c2f..06d4ea8 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 f1951c6..d179ba3 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" };
}
}
More information about the Libreoffice-commits
mailing list