uui/source/interactionhandler.cxx | 10 ++++------ xmlhelp/source/treeview/tvfactory.cxx | 5 +---- 2 files changed, 5 insertions(+), 10 deletions(-)
New commits: commit 51a30d7daee8779ef51d8db58559e4fe15665d1b Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sun Aug 18 13:38:16 2019 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sun Aug 18 14:32:56 2019 +0200 tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor in uui, xmlhelp Change-Id: I588ed4154e6b21e178f2466c58abc08562eddf80 Reviewed-on: https://gerrit.libreoffice.org/77663 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 71286345a177..df06d4ea1d0e 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -91,13 +91,11 @@ UUIInteractionHandler::supportsService(OUString const & rServiceName) uno::Sequence< OUString > SAL_CALL UUIInteractionHandler::getSupportedServiceNames() { - uno::Sequence< OUString > aNames(3); - aNames[0] = "com.sun.star.task.InteractionHandler"; - // added to indicate support for configuration.backend.MergeRecoveryRequest - aNames[1] = "com.sun.star.configuration.backend.InteractionHandler"; - aNames[2] = "com.sun.star.uui.InteractionHandler"; + return { "com.sun.star.task.InteractionHandler", + // added to indicate support for configuration.backend.MergeRecoveryRequest + "com.sun.star.configuration.backend.InteractionHandler", // for backwards compatibility - return aNames; + "com.sun.star.uui.InteractionHandler" }; } void SAL_CALL diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 73adce6ae7b4..e4fc02c58e41 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -131,10 +131,7 @@ TVFactory::getImplementationName_static() Sequence< OUString > TVFactory::getSupportedServiceNames_static() { - Sequence< OUString > seq( 2 ); - seq[0] = "com.sun.star.help.TreeView"; - seq[1] = "com.sun.star.ucb.HiearchyDataSource"; - return seq; + return { "com.sun.star.help.TreeView", "com.sun.star.ucb.HiearchyDataSource" }; } Reference< XSingleServiceFactory > _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits