diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2019-08-17 12:15:01 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2019-08-17 13:30:19 +0200 |
commit | 5ad254ed246cf8d11b55e50ed0ccba5736d0cdbb (patch) | |
tree | a79c63f38dede22b97133adeba86ace9ab23851a | |
parent | 1c3d143cd4e16271e1ede4484dac2a894f2c9c38 (diff) |
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in testtools and toolkit
Change-Id: I14b53c27906eb615e68482cbc3918be8da464212
Reviewed-on: https://gerrit.libreoffice.org/77624
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 3 | ||||
-rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 6 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 3 | ||||
-rw-r--r-- | testtools/source/performance/ubobject.cxx | 3 | ||||
-rw-r--r-- | testtools/source/performance/ubtest.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/animatedimages.cxx | 5 | ||||
-rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/grid/gridcolumn.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/spinningprogress.cxx | 8 |
9 files changed, 12 insertions, 27 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 66be97682ddf..535d8e1fa73c 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -76,8 +76,7 @@ static Sequence<T> cloneSequence(const Sequence<T>& val); static Sequence< OUString > getSupportedServiceNames() { - OUString aName( SERVICENAME ); - return Sequence< OUString >( &aName, 1 ); + return { SERVICENAME }; } static bool check( bool b , char const * message ) diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 050c2dd6683c..d551e9fdcaa3 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -430,13 +430,11 @@ css::uno::Reference< css::uno::XInterface > create2( } OUString getImplementationName2() { - return - "comp.test.testtools.bridgetest.Constructors2"; + return "comp.test.testtools.bridgetest.Constructors2"; } css::uno::Sequence< OUString > getSupportedServiceNames2() { - css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors2" }; - return s; + return { "test.testtools.bridgetest.Constructors2" }; } ::cppu::ImplementationEntry const entries[] = { diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 1eb3e9903753..2a5a58be34bb 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -69,8 +69,7 @@ namespace bridge_object static Sequence< OUString > getSupportedServiceNames() { - OUString aName( SERVICENAME ); - return Sequence< OUString >( &aName, 1 ); + return { SERVICENAME }; } diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index ca0582e24e4b..8aff1663ed9c 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -47,8 +47,7 @@ namespace benchmark_object inline static Sequence< OUString > getSupportedServiceNames() { - OUString aName( SERVICENAME); - return Sequence< OUString >( &aName, 1 ); + return { SERVICENAME }; } diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 283e73d699c9..a45792a07a4b 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -388,8 +388,7 @@ static void createInstance( Reference< T > & rxOut, inline static Sequence< OUString > getSupportedServiceNames() { - OUString aName( SERVICENAME ); - return Sequence< OUString >( &aName, 1 ); + return { SERVICENAME }; } diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index bcc0e0628130..efa48cec0b1f 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -292,10 +292,7 @@ namespace toolkit { Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() { - Sequence< OUString > aServiceNames(2); - aServiceNames[0] = "com.sun.star.awt.AnimatedImagesControlModel"; - aServiceNames[1] = "com.sun.star.awt.UnoControlModel"; - return aServiceNames; + return { "com.sun.star.awt.AnimatedImagesControlModel", "com.sun.star.awt.UnoControlModel" }; } diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 460b4bcc03d0..bbaf3502e3bf 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -327,9 +327,7 @@ private: Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) { - const OUString aServiceName("com.sun.star.awt.grid.DefaultGridColumnModel"); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return { "com.sun.star.awt.grid.DefaultGridColumnModel" }; } diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index f56c250156c9..5b52b183daf4 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -273,9 +273,7 @@ namespace toolkit css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) { - const OUString aServiceName("com.sun.star.awt.grid.GridColumn"); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return { "com.sun.star.awt.grid.GridColumn" }; } diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index 50ca0bdcaa59..22479c7035b2 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -115,11 +115,9 @@ protected: Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() { - Sequence< OUString > aServiceNames(3); - aServiceNames[0] = "com.sun.star.awt.SpinningProgressControlModel"; - aServiceNames[1] = "com.sun.star.awt.AnimatedImagesControlModel"; - aServiceNames[2] = "com.sun.star.awt.UnoControlModel"; - return aServiceNames; + return { "com.sun.star.awt.SpinningProgressControlModel", + "com.sun.star.awt.AnimatedImagesControlModel", + "com.sun.star.awt.UnoControlModel" }; } } |