tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in forms and fpicker
Change-Id: Ifa931bed6de434a2ee183c78e8e1be852ca06a56
Reviewed-on: https://gerrit.libreoffice.org/77637
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index e0c7b3e..e8c8efc 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -682,10 +682,7 @@ Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames()
Sequence< OUString > OControlModel::getSupportedServiceNames_Static()
{
Sequence< OUString > aServiceNames( 2 );
aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
aServiceNames[ 1 ] = "com.sun.star.form.FormControlModel";
return aServiceNames;
return { FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormControlModel" };
}
// XEventListener
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 753deca..2b2b52c 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -95,12 +95,7 @@ sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceNa
css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames()
{
css::uno::Sequence<OUString> aReturn(2);
aReturn[0] = "com.sun.star.form.Forms";
aReturn[1] = "com.sun.star.form.FormComponents";
return aReturn;
return { "com.sun.star.form.Forms", "com.sun.star.form.FormComponents" };
}
// XCloneable
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 2e153c3..b478a58 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -118,9 +118,7 @@ namespace frm
// to benefit from the functionality for binding to spreadsheet cells
Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames()
{
Sequence< OUString > aOwnNames( 2 );
aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SCROLLBAR;
aOwnNames[ 1 ] = BINDABLE_INTEGER_VALUE_RANGE;
Sequence< OUString > aOwnNames { FRM_SUN_COMPONENT_SCROLLBAR, BINDABLE_INTEGER_VALUE_RANGE };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 9d6b618..d9504a5 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -71,9 +71,7 @@ namespace frm
// to benefit from the functionality for binding to spreadsheet cells
Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames()
{
Sequence< OUString > aOwnNames( 2 );
aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SPINBUTTON;
aOwnNames[ 1 ] = BINDABLE_INTEGER_VALUE_RANGE;
Sequence< OUString > aOwnNames { FRM_SUN_COMPONENT_SPINBUTTON, BINDABLE_INTEGER_VALUE_RANGE };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 3d1e7a75..9ec22b9 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -233,15 +233,15 @@ namespace frm
Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
{
Sequence< OUString > aOwnNames( 8 );
aOwnNames[ 0 ] = FRM_SUN_COMPONENT_RICHTEXTCONTROL;
aOwnNames[ 1 ] = "com.sun.star.text.TextRange";
aOwnNames[ 2 ] = "com.sun.star.style.CharacterProperties";
aOwnNames[ 3 ] = "com.sun.star.style.ParagraphProperties";
aOwnNames[ 4 ] = "com.sun.star.style.CharacterPropertiesAsian";
aOwnNames[ 5 ] = "com.sun.star.style.CharacterPropertiesComplex";
aOwnNames[ 6 ] = "com.sun.star.style.ParagraphPropertiesAsian";
aOwnNames[ 7 ] = "com.sun.star.style.ParagraphPropertiesComplex";
Sequence< OUString > aOwnNames {
FRM_SUN_COMPONENT_RICHTEXTCONTROL,
"com.sun.star.text.TextRange",
"com.sun.star.style.CharacterProperties",
"com.sun.star.style.ParagraphProperties",
"com.sun.star.style.CharacterPropertiesAsian",
"com.sun.star.style.CharacterPropertiesComplex",
"com.sun.star.style.ParagraphPropertiesAsian",
"com.sun.star.style.ParagraphPropertiesComplex" };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index e0137e0..ac54fca 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -65,11 +65,9 @@ namespace
{
uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
aRet[2] = "com.sun.star.ui.dialogs.AquaFilePicker";
return aRet;
return { "com.sun.star.ui.dialogs.FilePicker",
"com.sun.star.ui.dialogs.SystemFilePicker",
"com.sun.star.ui.dialogs.AquaFilePicker" };
}
}
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index b47d813..3d2259c 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -53,10 +53,7 @@ namespace
// controlling event notifications
uno::Sequence<OUString> FolderPicker_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker";
aRet[1] = "com.sun.star.ui.dialogs.AquaFolderPicker";
return aRet;
return { "com.sun.star.ui.dialogs.SystemFolderPicker", "com.sun.star.ui.dialogs.AquaFolderPicker" };
}
}
diff --git a/fpicker/source/win32/VistaFilePicker.cxx b/fpicker/source/win32/VistaFilePicker.cxx
index c100dd5..1c888b4 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -47,11 +47,10 @@ namespace
{
css::uno::Sequence< OUString > VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< OUString > aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
aRet[2] = "com.sun.star.ui.dialogs.SystemFolderPicker";
return aRet;
return {
"com.sun.star.ui.dialogs.FilePicker",
"com.sun.star.ui.dialogs.SystemFilePicker",
"com.sun.star.ui.dialogs.SystemFolderPicker" };
}
}
