framework/source/uielement/objectmenucontroller.cxx | 3 +--
framework/source/uielement/popuptoolbarcontroller.cxx | 9 +++------
framework/source/uielement/subtoolbarcontroller.cxx | 3 +--
framework/source/uifactory/addonstoolbarfactory.cxx | 3 +--
framework/source/uifactory/statusbarfactory.cxx | 3 +--
framework/source/uifactory/toolbarfactory.cxx | 3 +--
framework/source/uifactory/uicontrollerfactory.cxx | 9 +++------
framework/source/uifactory/windowcontentfactorymanager.cxx | 3 +--
8 files changed, 12 insertions(+), 24 deletions(-)
New commits:
commit ad59a9a9cd1e48fa5120c98930f49fd02551185c
Author: Hieronymous <sudk1...@gmail.com>
Date: Fri Oct 14 14:49:51 2016 +0530
tdf#88205 css::uno::Sequence to use initializer_list ctor.
Change-Id: If4f2e8e369930f028c342bc81c4f49df7350e238
Reviewed-on: https://gerrit.libreoffice.org/29811
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/framework/source/uielement/objectmenucontroller.cxx
b/framework/source/uielement/objectmenucontroller.cxx
index 69ea330..d876ee0 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -75,8 +75,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.frame.PopupMenuController" };
- return aSeq;
+ return {"com.sun.star.frame.PopupMenuController"};
}
// XStatusListener
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index e23f64c..ee8c0d3 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -310,8 +310,7 @@ sal_Bool
GenericPopupToolbarController::supportsService(OUString const & rServic
css::uno::Sequence<OUString>
GenericPopupToolbarController::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController"
};
- return aRet;
+ return {"com.sun.star.frame.ToolbarController"};
}
ToolBoxItemBits GenericPopupToolbarController::getDropDownStyle() const
@@ -515,8 +514,7 @@ sal_Bool SaveToolbarController::supportsService( OUString
const & rServiceName )
css::uno::Sequence< OUString >
SaveToolbarController::getSupportedServiceNames()
throw ( css::uno::RuntimeException )
{
- css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController"
};
- return aRet;
+ return {"com.sun.star.frame.ToolbarController"};
}
class NewToolbarController : public PopupMenuToolbarController
@@ -565,8 +563,7 @@ sal_Bool NewToolbarController::supportsService(OUString
const & rServiceName)
css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
- css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController"
};
- return aRet;
+ return {"com.sun.star.frame.ToolbarController"};
}
void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence<
css::uno::Any >& aArguments )
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx
b/framework/source/uielement/subtoolbarcontroller.cxx
index 858933b..b50d248 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -450,8 +450,7 @@ sal_Bool SubToolBarController::supportsService( const
OUString& rServiceName )
css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames()
throw ( css::uno::RuntimeException )
{
- css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController"
};
- return aRet;
+ return {"com.sun.star.frame.ToolbarController"};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx
b/framework/source/uifactory/addonstoolbarfactory.cxx
index 776ea27..6cb5214 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -72,8 +72,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq { "com.sun.star.ui.ToolBarFactory"
};
- return aSeq;
+ return {"com.sun.star.ui.ToolBarFactory"};
}
// XUIElementFactory
diff --git a/framework/source/uifactory/statusbarfactory.cxx
b/framework/source/uifactory/statusbarfactory.cxx
index e6b89a0..2e33618 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -57,8 +57,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.ui.StatusBarFactory" };
- return aSeq;
+ return {"com.sun.star.ui.StatusBarFactory"};
}
// XUIElementFactory
diff --git a/framework/source/uifactory/toolbarfactory.cxx
b/framework/source/uifactory/toolbarfactory.cxx
index a849966..6381199 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -55,8 +55,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq { "com.sun.star.ui.ToolBarFactory"
};
- return aSeq;
+ return {"com.sun.star.ui.ToolBarFactory"};
}
// XUIElementFactory
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx
b/framework/source/uifactory/uicontrollerfactory.cxx
index ad280b4..25114ce 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -258,8 +258,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.frame.PopupMenuControllerFactory" };
- return aSeq;
+ return {"com.sun.star.frame.PopupMenuControllerFactory"};
}
};
@@ -309,8 +308,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.frame.ToolbarControllerFactory" };
- return aSeq;
+ return {"com.sun.star.frame.ToolbarControllerFactory"};
}
};
@@ -360,8 +358,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.frame.StatusbarControllerFactory" };
- return aSeq;
+ return {"com.sun.star.frame.StatusbarControllerFactory"};
}
};
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx
b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 08cbbe3..ee61aba 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -67,8 +67,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override
{
- css::uno::Sequence< OUString > aSeq {
"com.sun.star.ui.WindowContentFactoryManager" };
- return aSeq;
+ return {"com.sun.star.ui.WindowContentFactoryManager"};
}
// XSingleComponentFactory
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
