From dd5e0814cd3d6b1d914e3beaca07fb9cd34e3977 Mon Sep 17 00:00:00 2001 From: Hieronymous Date: Fri, 14 Oct 2016 01:17:10 +0530 Subject: [PATCH] tdf#88205 Adapt uses of css::uno::Sequence to use initialize_list ctor Change-Id: Idb456f6cf0b4f3dda4b92d341ae6de59cb9879e2 Reviewed-on: https://gerrit.libreoffice.org/29797 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- framework/source/services/autorecovery.cxx | 3 +-- framework/source/services/frame.cxx | 3 +-- framework/source/services/sessionlistener.cxx | 3 +-- framework/source/services/substitutepathvars.cxx | 3 +-- framework/source/services/taskcreatorsrv.cxx | 3 +-- framework/source/services/urltransformer.cxx | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 932995f6c0e5..dec1ee8392ba 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -453,8 +453,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.AutoRecovery" }; - return aSeq; + return {"com.sun.star.frame.AutoRecovery"}; } // XInterface diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 29aefb6f407b..111a8a4d2387 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -138,8 +138,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.Frame" }; - return aSeq; + return {"com.sun.star.frame.Frame"}; } // XComponentLoader diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 28feccbf107d..d4a9d8099de2 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -125,8 +125,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.SessionListener" }; - return aSeq; + return {"com.sun.star.frame.SessionListener"}; } virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index e4d15c7b5752..0bbc05563b8d 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -153,8 +153,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aSeq { "com.sun.star.util.PathSubstitution" }; - return aSeq; + return {"com.sun.star.util.PathSubstitution"}; } // XStringSubstitution diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 265b30e773dc..11203415d74e 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -81,8 +81,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.TaskCreator" }; - return aSeq; + return {"com.sun.star.frame.TaskCreator"}; } // XSingleServiceFactory diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index d5811e4b868a..581c14b0295b 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -54,8 +54,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { - css::uno::Sequence< OUString > aRet { "com.sun.star.util.URLTransformer" }; - return aRet; + return {"com.sun.star.util.URLTransformer"}; } virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL )