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 +-- toolkit/source/controls/animatedimages.cxx | 5 +---- toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 4 +--- toolkit/source/controls/grid/gridcolumn.cxx | 4 +--- toolkit/source/controls/spinningprogress.cxx | 8 +++----- ucb/source/ucp/ext/ucpext_content.cxx | 5 +---- ucb/source/ucp/ext/ucpext_provider.cxx | 5 +---- ucb/source/ucp/file/filtask.cxx | 4 +--- ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 5 +---- ucb/source/ucp/package/pkgcontent.cxx | 8 +------- xmlhelp/source/cxxhelp/provider/provider.cxx | 6 +----- xmlhelp/source/treeview/tvfactory.cxx | 3 +-- 16 files changed, 19 insertions(+), 56 deletions(-)
New commits: commit 5ad254ed246cf8d11b55e50ed0ccba5736d0cdbb Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sat Aug 17 12:15:01 2019 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sat Aug 17 13:30:19 2019 +0200 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 <serval2...@yahoo.fr> 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" }; } } commit 1c3d143cd4e16271e1ede4484dac2a894f2c9c38 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sat Aug 17 11:58:10 2019 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sat Aug 17 13:30:06 2019 +0200 tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor in ucb, xmlhelp Change-Id: I79f6378cff14c71987f77e0c08e0107bd4b3eefb Reviewed-on: https://gerrit.libreoffice.org/77623 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index fcee9b022e68..823bdea776ab 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -169,10 +169,7 @@ namespace ucb { namespace ucp { namespace ext Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - Sequence< OUString > aServiceNames(2); - aServiceNames[0] = "com.sun.star.ucb.Content"; - aServiceNames[1] = "com.sun.star.ucb.ExtensionContent"; - return aServiceNames; + return { "com.sun.star.ucb.Content", "com.sun.star.ucb.ExtensionContent" }; } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 2689e2c9e2bb..253cbbb91d79 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -68,10 +68,7 @@ namespace ucb { namespace ucp { namespace ext Sequence< OUString > ContentProvider::getSupportedServiceNames_static( ) { - Sequence< OUString > aServiceNames(2); - aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; - aServiceNames[1] = "com.sun.star.ucb.ExtensionContentProvider"; - return aServiceNames; + return { "com.sun.star.ucb.ContentProvider", "com.sun.star.ucb.ExtensionContentProvider" }; } diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 633b7d2c87b9..b9a83a186dff 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2952,9 +2952,7 @@ TaskManager::getImplementationName_static() uno::Sequence< OUString > TaskManager::getSupportedServiceNames_static() { - OUString Supported("com.sun.star.ucb.FileContentProvider"); - css::uno::Sequence< OUString > Seq( &Supported,1 ); - return Seq; + return { "com.sun.star.ucb.FileContentProvider" }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 295a86612448..2646425394de 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -242,10 +242,7 @@ HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMulti css::uno::Sequence< OUString > HierarchyDataSource::getSupportedServiceNames_Static() { - uno::Sequence< OUString > aSNS( 2 ); - aSNS[ 0 ] = "com.sun.star.ucb.DefaultHierarchyDataSource"; - aSNS[ 1 ] = "com.sun.star.ucb.HierarchyDataSource"; - return aSNS; + return { "com.sun.star.ucb.DefaultHierarchyDataSource", "com.sun.star.ucb.HierarchyDataSource" }; } ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 587f0682e5ca..e9e3296900b3 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -367,13 +367,7 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - uno::Sequence< OUString > aSNS( 1 ); - if ( isFolder() ) - aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageFolderContent"; - else - aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageStreamContent"; - - return aSNS; + return { isFolder()? OUString("com.sun.star.ucb.PackageFolderContent"):OUString("com.sun.star.ucb.PackageStreamContent") } ; } diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index ff6db4be77a2..6c52e0357814 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -140,11 +140,7 @@ ContentProvider_CreateInstance( uno::Sequence< OUString > ContentProvider::getSupportedServiceNames_Static() { - uno::Sequence< OUString > aSNS( 2 ); - aSNS.getArray()[ 0 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME1; - aSNS.getArray()[ 1 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME2; - - return aSNS; + return { MYUCP_CONTENT_PROVIDER_SERVICE_NAME1, MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 }; } // Service factory implementation. diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 16aa313d9333..73adce6ae7b4 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -117,8 +117,7 @@ TVFactory::createInstanceWithArguments( Sequence< OUString > SAL_CALL TVFactory::getAvailableServiceNames( ) { - Sequence<OUString> seq { "com.sun.star.ucb.HierarchyDataReadAccess" }; - return seq; + return { "com.sun.star.ucb.HierarchyDataReadAccess" }; } // static _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits