diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-08-05 11:49:02 +0300 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-05 12:45:48 +0000 |
commit | e50a95b829b327b07ba35e831ae10fb8c40a71ee (patch) | |
tree | d6d39e710747e7b13535c83553582298df7ff1e9 /chart2/source/model | |
parent | 36d65037e7b5ac4ee6452430296b2ae8893ae366 (diff) |
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in chart2 module
Change-Id: I9c6f2efd59b3796e0e6f5389467fe888f4465586
Reviewed-on: https://gerrit.libreoffice.org/27895
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2/source/model')
-rw-r--r-- | chart2/source/model/main/CartesianCoordinateSystem.cxx | 3 | ||||
-rw-r--r-- | chart2/source/model/main/Legend.cxx | 19 | ||||
-rw-r--r-- | chart2/source/model/main/PolarCoordinateSystem.cxx | 3 | ||||
-rw-r--r-- | chart2/source/model/template/DataInterpreter.cxx | 3 |
4 files changed, 11 insertions, 17 deletions
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 44dd8f4482a6..ec99d529703a 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -82,8 +82,7 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo // ____ XServiceInfo ____ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static() { - Sequence<OUString> aServices { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; - return aServices; + return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index d7eabc951b7e..2d3d691e94c8 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -264,17 +264,14 @@ void Legend::fireModifyEvent() Sequence< OUString > Legend::getSupportedServiceNames_Static() { - const sal_Int32 nNumServices( 6 ); - sal_Int32 nI = 0; - Sequence< OUString > aServices( nNumServices ); - aServices[ nI++ ] = "com.sun.star.chart2.Legend"; - aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; - aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; - aServices[ nI++ ] = "com.sun.star.drawing.LineProperties"; - aServices[ nI++ ] = "com.sun.star.style.CharacterProperties"; - aServices[ nI++ ] = "com.sun.star.layout.LayoutElement"; - OSL_ASSERT( nNumServices == nI ); - return aServices; + return Sequence< OUString >{ + "com.sun.star.chart2.Legend", + "com.sun.star.beans.PropertySet", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties", + "com.sun.star.style.CharacterProperties", + "com.sun.star.layout.LayoutElement" + }; } // ____ OPropertySet ____ diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index c702dfab169d..44433a0a606f 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -82,8 +82,7 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() // ____ XServiceInfo ____ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() { - Sequence<OUString> aServices { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; - return aServices; + return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 163ac44bfc8d..73899a6d5976 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -381,8 +381,7 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() { - Sequence<OUString> aServices { "com.sun.star.chart2.DataInterpreter" }; - return aServices; + return { "com.sun.star.chart2.DataInterpreter" }; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static |