diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2018-04-10 22:12:06 +0900 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-11 09:31:32 +0200 |
| commit | 5823ecd54b16974ffe8821a5ae061cd0ecc4cf84 (patch) | |
| tree | c2aabca1d1751923f1aed17624c8dce36569feb8 /toolkit/source | |
| parent | 0310815de2a75d4bbbd34d97e2592dccddcad812 (diff) | |
toolkit: Recover missing service names for ControlModelContainerBase
namely:
com.sun.star.awt.UnoControlProgressBarModel
com.sun.star.awt.UnoControlScrollBarModel
com.sun.star.awt.UnoControlFixedLineModel
com.sun.star.awt.UnoControlRoadmapModel
They seems accidentally dropped at 45fe77164c90cf15b78cd8b99adc043e2dd26be1.
Change-Id: Iebd72cadc9eb9bdcb80f9b8c11f6e5e40bdb50a2
Reviewed-on: https://gerrit.libreoffice.org/52673
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'toolkit/source')
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 8f6cf1783f29..767501c91b4d 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -413,35 +413,33 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() { - static Sequence< OUString >* pNamesSeq = nullptr; - if ( !pNamesSeq ) - { - pNamesSeq = new Sequence< OUString >( 26 ); - OUString* pNames = pNamesSeq->getArray(); - pNames[0] = "com.sun.star.awt.UnoControlEditModel"; - pNames[1] = "com.sun.star.awt.UnoControlFormattedFieldModel"; - pNames[2] = "com.sun.star.awt.UnoControlFileControlModel"; - pNames[3] = "com.sun.star.awt.UnoControlButtonModel"; - pNames[4] = "com.sun.star.awt.UnoControlImageControlModel"; - pNames[5] = "com.sun.star.awt.UnoControlRadioButtonModel"; - pNames[6] = "com.sun.star.awt.UnoControlCheckBoxModel"; - pNames[7] = "com.sun.star.awt.UnoControlFixedTextModel"; - pNames[8] = "com.sun.star.awt.UnoControlGroupBoxModel"; - pNames[9] = "com.sun.star.awt.UnoControlListBoxModel"; - pNames[10] = "com.sun.star.awt.UnoControlComboBoxModel"; - pNames[11] = "com.sun.star.awt.UnoControlDateFieldModel"; - pNames[12] = "com.sun.star.awt.UnoControlTimeFieldModel"; - pNames[13] = "com.sun.star.awt.UnoControlNumericFieldModel"; - pNames[14] = "com.sun.star.awt.UnoControlCurrencyFieldModel"; - pNames[15] = "com.sun.star.awt.UnoControlPatternFieldModel"; - pNames[16] = "com.sun.star.awt.tree.TreeControlModel"; - pNames[21] = "com.sun.star.awt.grid.UnoControlGridModel"; - pNames[22] = "com.sun.star.awt.tab.UnoControlTabPageContainerModel"; - pNames[23] = "com.sun.star.awt.tab.UnoControlTabPageModel"; - pNames[24] = "com.sun.star.awt.UnoMultiPageModel"; - pNames[25] = "com.sun.star.awt.UnoFrameModel"; - } - return *pNamesSeq; + return { "com.sun.star.awt.UnoControlEditModel", + "com.sun.star.awt.UnoControlFormattedFieldModel", + "com.sun.star.awt.UnoControlFileControlModel", + "com.sun.star.awt.UnoControlButtonModel", + "com.sun.star.awt.UnoControlImageControlModel", + "com.sun.star.awt.UnoControlRadioButtonModel", + "com.sun.star.awt.UnoControlCheckBoxModel", + "com.sun.star.awt.UnoControlFixedTextModel", + "com.sun.star.awt.UnoControlGroupBoxModel", + "com.sun.star.awt.UnoControlListBoxModel", + "com.sun.star.awt.UnoControlComboBoxModel", + "com.sun.star.awt.UnoControlDateFieldModel", + "com.sun.star.awt.UnoControlTimeFieldModel", + "com.sun.star.awt.UnoControlNumericFieldModel", + "com.sun.star.awt.UnoControlCurrencyFieldModel", + "com.sun.star.awt.UnoControlPatternFieldModel", + "com.sun.star.awt.UnoControlProgressBarModel", + "com.sun.star.awt.UnoControlScrollBarModel", + "com.sun.star.awt.UnoControlFixedLineModel", + "com.sun.star.awt.UnoControlRoadmapModel", + "com.sun.star.awt.tree.TreeControlModel", + "com.sun.star.awt.grid.UnoControlGridModel", + "com.sun.star.awt.tab.UnoControlTabPageContainerModel", + "com.sun.star.awt.tab.UnoControlTabPageModel", + "com.sun.star.awt.UnoMultiPageModel", + "com.sun.star.awt.UnoFrameModel" + }; } // XContainer |