From 5ad254ed246cf8d11b55e50ed0ccba5736d0cdbb Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 17 Aug 2019 12:15:01 +0200 Subject: 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 --- testtools/source/bridgetest/bridgetest.cxx | 3 +-- testtools/source/bridgetest/constructors.cxx | 6 ++---- testtools/source/bridgetest/cppobj.cxx | 3 +-- testtools/source/performance/ubobject.cxx | 3 +-- testtools/source/performance/ubtest.cxx | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) (limited to 'testtools') 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 cloneSequence(const Sequence& 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 }; } -- cgit