From c4f0c87b2f4ac68accc202731e0328ab101a073e Mon Sep 17 00:00:00 2001 From: Mesut Çifci Date: Mon, 13 Jan 2020 03:35:14 +0300 Subject: tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor Change-Id: I1c1e7b42211c51f572698efd3135e388f8fb2979 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86648 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 3 +-- dbaccess/source/core/api/column.cxx | 6 ++---- oox/source/core/filterdetect.cxx | 3 +-- oox/source/shape/ShapeContextHandler.cxx | 3 +-- package/source/zippackage/ZipPackageFolder.cxx | 3 +-- sfx2/source/appl/shutdownicon.cxx | 3 +-- stoc/source/implementationregistration/implreg.cxx | 3 +-- testtools/source/bridgetest/constructors.cxx | 3 +-- ucb/source/ucp/cmis/cmis_repo_content.cxx | 3 +-- 9 files changed, 10 insertions(+), 20 deletions(-) diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx index 89e485cad0fe..a6fd0a7e3f8d 100644 --- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx +++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx @@ -106,8 +106,7 @@ sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceN Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames() { - Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" }; - return aNames; + return { "com.sun.star.awt.AccessibleHeaderBarItem" }; } // XAccessible diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 8b96a438292e..59780891c3a3 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -98,8 +98,7 @@ sal_Bool OColumn::supportsService( const OUString& _rServiceName ) Sequence< OUString > OColumn::getSupportedServiceNames( ) { - Sequence aSNS { SERVICE_SDBCX_COLUMN }; - return aSNS; + return { SERVICE_SDBCX_COLUMN }; } // OComponentHelper @@ -190,8 +189,7 @@ sal_Bool OColumns::supportsService( const OUString& _rServiceName ) Sequence< OUString > OColumns::getSupportedServiceNames( ) { - Sequence aSNS { SERVICE_SDBCX_CONTAINER }; - return aSNS; + return { SERVICE_SDBCX_CONTAINER }; } void OColumns::append( const OUString& _rName, OColumn* _pColumn ) diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index c83dab9d6f74..8325752360ec 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -371,8 +371,7 @@ sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName ) Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames() { - Sequence aServiceNames { "com.sun.star.frame.ExtendedTypeDetection" }; - return aServiceNames; + return { "com.sun.star.frame.ExtendedTypeDetection" }; } // com.sun.star.document.XExtendedFilterDetection interface ------------------- diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index acc8624af602..9db23f51b325 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -599,8 +599,7 @@ OUString ShapeContextHandler::getImplementationName() uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames() { - uno::Sequence< OUString > s { "com.sun.star.xml.sax.FastShapeContextHandler" }; - return s; + return { "com.sun.star.xml.sax.FastShapeContextHandler" }; } sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName) diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index fdc7231059a6..3a6b7ee19bbd 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -414,8 +414,7 @@ OUString ZipPackageFolder::getImplementationName() uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames() { - uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolder" }; - return aNames; + return { "com.sun.star.packages.PackageFolder" }; } sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const & rServiceName ) diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 8ec370eddc1c..740cbc702a63 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -100,8 +100,7 @@ sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString const & ServiceName) css::uno::Sequence SAL_CALL ShutdownIcon::getSupportedServiceNames() { - css::uno::Sequence< OUString > aSeq { "com.sun.star.office.Quickstart" }; - return aSeq; + return { "com.sun.star.office.Quickstart" }; } bool ShutdownIcon::bModalMode = false; diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 730dd7febdd8..dc21f55663c3 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1127,8 +1127,7 @@ sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName // XServiceInfo Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() { - Sequence< OUString > seqNames { "com.sun.star.registry.ImplementationRegistration" }; - return seqNames; + return { "com.sun.star.registry.ImplementationRegistration" }; } Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceManager() const diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index d551e9fdcaa3..9683c1fac9ed 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -418,8 +418,7 @@ OUString getImplementationName() { } css::uno::Sequence< OUString > getSupportedServiceNames() { - css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors" }; - return s; + return { "test.testtools.bridgetest.Constructors" }; } css::uno::Reference< css::uno::XInterface > create2( diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 7225d51502aa..ead15fb1e2f7 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -311,8 +311,7 @@ namespace cmis uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() { - uno::Sequence aSNS { "com.sun.star.ucb.Content" }; - return aSNS; + return { "com.sun.star.ucb.Content" }; } OUString SAL_CALL RepoContent::getContentType() -- cgit