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>
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 66be976..535d8e1 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 050c2dd..d551e9f 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 1eb3e99..2a5a58b 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 ca0582e..8aff166 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 283e73d..a45792a 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 bcc0e06..efa48ce 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 460b4bc..bbaf350 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 f56c250..5b52b18 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 50ca0bd..22479c7 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" };
}
}
