summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorHieronymous <sudk1896@gmail.com>2016-10-14 14:49:51 +0530
committerJulien Nabet <serval2412@yahoo.fr>2016-10-16 10:58:15 +0000
commitad59a9a9cd1e48fa5120c98930f49fd02551185c (patch)
tree79fe2538e68cb491610034396a1e43fdebcd7668 /framework
parent01dc6d098def20d6db57a13e8b2d79492a051fce (diff)
tdf#88205 css::uno::Sequence to use initializer_list ctor.
Change-Id: If4f2e8e369930f028c342bc81c4f49df7350e238 Reviewed-on: https://gerrit.libreoffice.org/29811 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx3
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx9
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx3
-rw-r--r--framework/source/uifactory/addonstoolbarfactory.cxx3
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx3
-rw-r--r--framework/source/uifactory/toolbarfactory.cxx3
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx9
-rw-r--r--framework/source/uifactory/windowcontentfactorymanager.cxx3
8 files changed, 12 insertions, 24 deletions
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 69ea33010a41..d876ee044917 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 e23f64ce2fa8..ee8c0d3ba6de 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 858933b3e48c..b50d248bb771 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 776ea27edebb..6cb52141bb24 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 e6b89a0a7bd3..2e3361881d98 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 a84996626573..63811997c53a 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 ad280b406c59..25114ce32fb7 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 08cbbe3f30b4..ee61aba829f9 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