From e01949e9c56c1605a4eccbae285f85d1b3085e15 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 17 Aug 2019 12:18:30 +0200 Subject: tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor in comphelper Change-Id: I4d9b9e13801ebf7671ff651b931a6c4144860985 Reviewed-on: https://gerrit.libreoffice.org/77626 Tested-by: Jenkins Reviewed-by: Julien Nabet --- comphelper/source/compare/AnyCompareFactory.cxx | 4 +--- comphelper/source/container/IndexedPropertyValuesContainer.cxx | 4 +--- comphelper/source/container/NamedPropertyValuesContainer.cxx | 4 +--- comphelper/source/misc/instancelocker.cxx | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index a912bb62e156..e4cec19feeed 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -118,9 +118,7 @@ sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceNam Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) { - const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return { "com.sun.star.ucb.AnyCompareFactory" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 7455831214ca..0053cc8e4374 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -143,9 +143,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUStrin css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) { - const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return { "com.sun.star.document.IndexedPropertyValues" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 5cc30b1cf954..13b8f855866f 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -151,9 +151,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) { - const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return { "com.sun.star.document.NamedPropertyValues" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 31e55c20a6e0..ad581840d01d 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -186,8 +186,7 @@ sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() { - const OUString aServiceName( "com.sun.star.embed.InstanceLocker" ); - return uno::Sequence< OUString >( &aServiceName, 1 ); + return { "com.sun.star.embed.InstanceLocker" }; } // OLockListener -- cgit