tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: Id747848b222f69af3293a2095a62542f1e1116d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95215
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index cca3e06..1d16109 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -55,16 +55,10 @@
return OBoundControl::_getTypes();
}
css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames()
{
css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_DATEFIELD;
pArray[aSupported.getLength()-2] = STARDIV_ONE_FORM_CONTROL_DATEFIELD;
return aSupported;
const css::uno::Sequence<OUString> vals { FRM_SUN_CONTROL_DATEFIELD, STARDIV_ONE_FORM_CONTROL_DATEFIELD };
return comphelper::concatSequences(OBoundControl::getSupportedServiceNames(), vals);
}
@@ -122,26 +116,19 @@
css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames()
{
css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
const css::uno::Sequence<OUString> vals {
BINDABLE_CONTROL_MODEL,
DATA_AWARE_CONTROL_MODEL,
VALIDATABLE_CONTROL_MODEL,
BINDABLE_DATA_AWARE_CONTROL_MODEL,
VALIDATABLE_BINDABLE_CONTROL_MODEL,
FRM_SUN_COMPONENT_DATEFIELD,
FRM_SUN_COMPONENT_DATABASE_DATEFIELD,
BINDABLE_DATABASE_DATE_FIELD,
FRM_COMPONENT_DATEFIELD
};
sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 );
OUString* pStoreTo = aSupported.getArray() + nOldLen;
*pStoreTo++ = BINDABLE_CONTROL_MODEL;
*pStoreTo++ = DATA_AWARE_CONTROL_MODEL;
*pStoreTo++ = VALIDATABLE_CONTROL_MODEL;
*pStoreTo++ = BINDABLE_DATA_AWARE_CONTROL_MODEL;
*pStoreTo++ = VALIDATABLE_BINDABLE_CONTROL_MODEL;
*pStoreTo++ = FRM_SUN_COMPONENT_DATEFIELD;
*pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_DATEFIELD;
*pStoreTo++ = BINDABLE_DATABASE_DATE_FIELD;
*pStoreTo++ = FRM_COMPONENT_DATEFIELD;
return aSupported;
return comphelper::concatSequences(OBoundControlModel::getSupportedServiceNames(), vals);
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 6d13f72..c042eac 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -383,16 +383,11 @@
AccessibleDrawDocumentView::getSupportedServiceNames()
{
ThrowIfDisposed();
// Get list of supported service names from base class...
const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleDrawDocumentView" };
uno::Sequence<OUString> aServiceNames =
AccessibleDocumentViewBase::getSupportedServiceNames();
sal_Int32 nCount (aServiceNames.getLength());
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
aServiceNames[nCount] = "com.sun.star.drawing.AccessibleDrawDocumentView";
return aServiceNames;
return comphelper::concatSequences(aServiceNames, vals);
}
//===== XInterface ==========================================================
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 10f4222..c7fe3c6 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -104,16 +104,8 @@
AccessibleGraphicShape::getSupportedServiceNames()
{
ThrowIfDisposed ();
// Get list of supported service names from base class...
uno::Sequence<OUString> aServiceNames =
AccessibleShape::getSupportedServiceNames();
sal_Int32 nCount (aServiceNames.getLength());
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
aServiceNames[nCount] = "com.sun.star.drawing.AccessibleGraphicShape";
return aServiceNames;
const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleGraphicShape" };
return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals);
}
// XTypeProvider
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index daf3fb2..ea5aca8 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -111,16 +111,8 @@
AccessibleOLEShape::getSupportedServiceNames()
{
ThrowIfDisposed();
// Get list of supported service names from base class...
uno::Sequence< OUString > aServiceNames =
AccessibleShape::getSupportedServiceNames();
sal_Int32 nCount (aServiceNames.getLength());
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
aServiceNames[nCount] = "com.sun.star.drawing.AccessibleOLEShape";
return aServiceNames;
const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleOLEShape" };
return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals);
}
// XTypeProvider
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 6842d76..3285f1c 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -48,6 +48,7 @@
#include <svx/svdview.hxx>
#include <tools/diagnose_ex.h>
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/sequence.hxx>
#include "AccessibleEmptyEditSource.hxx"
#include <algorithm>
@@ -863,16 +864,8 @@
AccessibleShape::getSupportedServiceNames()
{
ThrowIfDisposed ();
// Get list of supported service names from base class...
uno::Sequence<OUString> aServiceNames =
AccessibleContextBase::getSupportedServiceNames();
sal_Int32 nCount (aServiceNames.getLength());
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
aServiceNames[nCount] = "com.sun.star.drawing.AccessibleShape";
return aServiceNames;
const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleShape" };
return comphelper::concatSequences(AccessibleContextBase::getSupportedServiceNames(), vals);
}
// XTypeProvider
@@ -884,30 +877,14 @@
uno::Sequence<uno::Type> aTypeList (AccessibleContextBase::getTypes());
// ... get list of types from component base implementation, ...
uno::Sequence<uno::Type> aComponentTypeList (AccessibleComponentBase::getTypes());
// ... define local types, ...
const uno::Type aLangEventListenerType =
cppu::UnoType<lang::XEventListener>::get();
const uno::Type aDocumentEventListenerType =
cppu::UnoType<document::XEventListener>::get();
const uno::Type aUnoTunnelType =
cppu::UnoType<lang::XUnoTunnel>::get();
// ... define local types
uno::Sequence<uno::Type> localTypesList = {
cppu::UnoType<lang::XEventListener>::get(),
cppu::UnoType<document::XEventListener>::get(),
cppu::UnoType<lang::XUnoTunnel>::get()
};
// ... and merge them all into one list.
sal_Int32 nTypeCount (aTypeList.getLength()),
nComponentTypeCount (aComponentTypeList.getLength());
aTypeList.realloc (nTypeCount + nComponentTypeCount + 3);
std::copy(aComponentTypeList.begin(), aComponentTypeList.end(),
std::next(aTypeList.begin(), nTypeCount));
int i = nTypeCount + nComponentTypeCount;
aTypeList[ i++ ] = aLangEventListenerType;
aTypeList[ i++ ] = aDocumentEventListenerType;
aTypeList[ i ] = aUnoTunnelType;
return aTypeList;
return comphelper::concatSequences(aTypeList, aComponentTypeList, localTypesList);
}
// lang::XEventListener
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 9c4b6894..2a584ff 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -34,6 +34,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/string.hxx>
#include <comphelper/sequence.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/unoshtxt.hxx>
#include <svx/svdotext.hxx>
@@ -461,16 +462,8 @@
Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames()
{
ThrowIfDisposed ();
// Get list of supported service names from base class...
uno::Sequence<OUString> aServiceNames = AccessibleContextBase::getSupportedServiceNames();
sal_Int32 nCount (aServiceNames.getLength());
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
aServiceNames[nCount] = "com.sun.star.drawing.AccessibleCell";
return aServiceNames;
const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleCell" };
return comphelper::concatSequences(AccessibleContextBase::getSupportedServiceNames(), vals);
}
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 22bbf0c..f6716ae 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -187,10 +187,8 @@
Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames()
{
Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 1 );
aServices[ aServices.getLength() - 1 ] = "com.sun.star.awt.UnoControlSpinButtonModel";
return aServices;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlSpinButtonModel" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
@@ -250,10 +248,8 @@
Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames()
{
Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 1 );
aServices[ aServices.getLength() - 1 ] = "com.sun.star.awt.UnoControlSpinButton";
return aServices;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlSpinButton" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 945b1f7..6ad3af4 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -138,11 +138,8 @@
css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlEditModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Edit";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlEditModel", "stardiv.vcl.controlmodel.Edit" };
return comphelper::concatSequences(UnoControlModel::getSupportedServiceNames(), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -459,11 +456,8 @@
uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames()
{
uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( );
aNames.realloc( aNames.getLength() + 2 );
aNames[ aNames.getLength() - 2 ] = "com.sun.star.awt.UnoControlEdit";
aNames[ aNames.getLength() - 1 ] = "stardiv.vcl.control.Edit";
return aNames;
css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlEdit", "stardiv.vcl.control.Edit" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames( ), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -534,11 +528,8 @@
css::uno::Sequence<OUString>
UnoControlFileControlModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFileControlModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FileControl";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFileControlModel", "stardiv.vcl.controlmodel.FileControl" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -568,11 +559,8 @@
css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
{
auto s(UnoEditControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFileControl";
s[s.getLength() - 1] = "stardiv.vcl.control.FileControl";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFileControl", "stardiv.vcl.control.FileControl" };
return comphelper::concatSequences( UnoEditControl::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -711,11 +699,8 @@
css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
{
auto s(GraphicControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlButtonModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Button";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlButtonModel", "stardiv.vcl.controlmodel.Button" };
return comphelper::concatSequences( GraphicControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -868,11 +853,8 @@
css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlButton";
s[s.getLength() - 1] = "stardiv.vcl.control.Button";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlButton", "stardiv.vcl.control.Button" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -905,13 +887,13 @@
css::uno::Sequence<OUString>
UnoControlImageControlModel::getSupportedServiceNames()
{
auto s(GraphicControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 4);
s[s.getLength() - 4] = "com.sun.star.awt.UnoControlImageButtonModel";
s[s.getLength() - 3] = "com.sun.star.awt.UnoControlImageControlModel";
s[s.getLength() - 2] = "stardiv.vcl.controlmodel.ImageButton";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ImageControl";
return s;
const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlImageButtonModel",
"com.sun.star.awt.UnoControlImageControlModel",
"stardiv.vcl.controlmodel.ImageButton",
"stardiv.vcl.controlmodel.ImageControl"
};
return comphelper::concatSequences( GraphicControlModel::getSupportedServiceNames(), vals);
}
uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1035,13 +1017,13 @@
css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 4);
s[s.getLength() - 4] = "com.sun.star.awt.UnoControlImageButton";
s[s.getLength() - 3] = "com.sun.star.awt.UnoControlImageControl";
s[s.getLength() - 2] = "stardiv.vcl.control.ImageButton";
s[s.getLength() - 1] = "stardiv.vcl.control.ImageControl";
return s;
const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlImageButton",
"com.sun.star.awt.UnoControlImageControl",
"stardiv.vcl.control.ImageButton",
"stardiv.vcl.control.ImageControl"
};
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1100,11 +1082,8 @@
css::uno::Sequence<OUString>
UnoControlRadioButtonModel::getSupportedServiceNames()
{
auto s(GraphicControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRadioButtonModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.RadioButton";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlRadioButtonModel", "stardiv.vcl.controlmodel.RadioButton" };
return comphelper::concatSequences( GraphicControlModel::getSupportedServiceNames(), vals);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1277,11 +1256,8 @@
css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRadioButton";
s[s.getLength() - 1] = "stardiv.vcl.control.RadioButton";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlRadioButton", "stardiv.vcl.control.RadioButton" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1339,11 +1315,8 @@
css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames()
{
auto s(GraphicControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCheckBoxModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.CheckBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlCheckBoxModel", "stardiv.vcl.controlmodel.CheckBox" };
return comphelper::concatSequences( GraphicControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1489,11 +1462,8 @@
css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCheckBox";
s[s.getLength() - 1] = "stardiv.vcl.control.CheckBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlCheckBox", "stardiv.vcl.control.CheckBox" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1743,11 +1713,8 @@
css::uno::Sequence<OUString>
UnoControlFixedTextModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedTextModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FixedText";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFixedTextModel", "stardiv.vcl.controlmodel.FixedText" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1848,11 +1815,8 @@
css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedText";
s[s.getLength() - 1] = "stardiv.vcl.control.FixedText";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFixedText", "stardiv.vcl.control.FixedText" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1914,11 +1878,8 @@
css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlGroupBoxModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.GroupBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlGroupBoxModel", "stardiv.vcl.controlmodel.GroupBox" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1955,11 +1916,8 @@
css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlGroupBox";
s[s.getLength() - 1] = "stardiv.vcl.control.GroupBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlGroupBox", "stardiv.vcl.control.GroupBox" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -2113,11 +2071,8 @@
css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlListBoxModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ListBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlListBoxModel", "stardiv.vcl.controlmodel.ListBox" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
OUString UnoControlListBoxModel::getServiceName()
@@ -2551,11 +2506,8 @@
css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlListBox";
s[s.getLength() - 1] = "stardiv.vcl.control.ListBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlListBox", "stardiv.vcl.control.ListBox" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals);
}
void UnoListBoxControl::dispose()
@@ -2959,11 +2911,8 @@
css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlComboBoxModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ComboBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlComboBoxModel", "stardiv.vcl.controlmodel.ComboBox" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals);
}
uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( )
@@ -3051,11 +3000,8 @@
css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
{
auto s(UnoEditControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlComboBox";
s[s.getLength() - 1] = "stardiv.vcl.control.ComboBox";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlComboBox", "stardiv.vcl.control.ComboBox" };
return comphelper::concatSequences( UnoEditControl::getSupportedServiceNames(), vals);
}
OUString UnoComboBoxControl::GetComponentServiceName()
@@ -3492,11 +3438,8 @@
css::uno::Sequence<OUString>
UnoControlDateFieldModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlDateFieldModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.DateField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlDateFieldModel", "stardiv.vcl.controlmodel.DateField" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -3708,11 +3651,8 @@
css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames()
{
auto s(UnoSpinFieldControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlDateField";
s[s.getLength() - 1] = "stardiv.vcl.control.DateField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlDateField", "stardiv.vcl.control.DateField" };
return comphelper::concatSequences( UnoSpinFieldControl::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -3767,11 +3707,8 @@
css::uno::Sequence<OUString>
UnoControlTimeFieldModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlTimeFieldModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.TimeField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlTimeFieldModel", "stardiv.vcl.controlmodel.TimeField" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -3942,11 +3879,8 @@
css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames()
{
auto s(UnoSpinFieldControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlTimeField";
s[s.getLength() - 1] = "stardiv.vcl.control.TimeField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlTimeField", "stardiv.vcl.control.TimeField" };
return comphelper::concatSequences( UnoSpinFieldControl::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4001,11 +3935,8 @@
css::uno::Sequence<OUString>
UnoControlNumericFieldModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlNumericFieldModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.NumericField";
return s;
const css::uno::Sequence<OUString> vals { "stardiv.vcl.controlmodel.NumericField", "com.sun.star.awt.UnoControlNumericFieldModel" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4147,11 +4078,8 @@
css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
{
auto s(UnoSpinFieldControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlNumericField";
s[s.getLength() - 1] = "stardiv.vcl.control.NumericField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlNumericField", "stardiv.vcl.control.NumericField" };
return comphelper::concatSequences( UnoSpinFieldControl::getSupportedServiceNames(), vals );
}
void UnoNumericFieldControl::setSpinSize( double Digits )
@@ -4230,11 +4158,8 @@
css::uno::Sequence<OUString>
UnoControlCurrencyFieldModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCurrencyFieldModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.CurrencyField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlCurrencyFieldModel", "stardiv.vcl.controlmodel.CurrencyField" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4376,11 +4301,8 @@
css::uno::Sequence<OUString>
UnoCurrencyFieldControl::getSupportedServiceNames()
{
auto s(UnoSpinFieldControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCurrencyField";
s[s.getLength() - 1] = "stardiv.vcl.control.CurrencyField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlCurrencyField", "stardiv.vcl.control.CurrencyField" };
return comphelper::concatSequences( UnoSpinFieldControl::getSupportedServiceNames(), vals );
}
void UnoCurrencyFieldControl::setSpinSize( double Digits )
@@ -4454,11 +4376,8 @@
css::uno::Sequence<OUString>
UnoControlPatternFieldModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlPatternFieldModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.PatternField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlPatternFieldModel", "stardiv.vcl.controlmodel.PatternField" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4566,11 +4485,8 @@
css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames()
{
auto s(UnoSpinFieldControl::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlPatternField";
s[s.getLength() - 1] = "stardiv.vcl.control.PatternField";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlPatternField", "stardiv.vcl.control.PatternField" };
return comphelper::concatSequences( UnoSpinFieldControl::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4637,11 +4553,8 @@
css::uno::Sequence<OUString>
UnoControlProgressBarModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlProgressBarModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ProgressBar";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlProgressBarModel", "stardiv.vcl.controlmodel.ProgressBar" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4735,11 +4648,8 @@
css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlProgressBar";
s[s.getLength() - 1] = "stardiv.vcl.control.ProgressBar";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlProgressBar", "stardiv.vcl.control.ProgressBar" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4802,11 +4712,8 @@
css::uno::Sequence<OUString>
UnoControlFixedLineModel::getSupportedServiceNames()
{
auto s(UnoControlModel::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedLineModel";
s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FixedLine";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFixedLineModel", "stardiv.vcl.controlmodel.FixedLine" };
return comphelper::concatSequences( UnoControlModel::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -4843,11 +4750,8 @@
css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames()
{
auto s(UnoControlBase::getSupportedServiceNames());
s.realloc(s.getLength() + 2);
s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedLine";
s[s.getLength() - 1] = "stardiv.vcl.control.FixedLine";
return s;
const css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlFixedLine", "stardiv.vcl.control.FixedLine" };
return comphelper::concatSequences( UnoControlBase::getSupportedServiceNames(), vals );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
