diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-08 13:04:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-08 13:07:35 +0200 |
| commit | 04af3ecc202d4c69d7dce0f0c1a5982a6af93074 (patch) | |
| tree | 02cc8e601e791ac882d92c84760fdb234cf4fffe /toolkit | |
| parent | f2416a7f2c9851f674b3a33ed50aa4e2109ae04c (diff) | |
Get array indexing right in ControlModelContainerBase::getAvailableServiceNames.
Apparently a merge conflict from 83380a7805f69b18f432895fc17c53cf0354bf4d "Merge commit 'ooo/DEV300_m106' into libreoffice-3-4"
toolkit/qa/unoapi stumbled over it.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index d186d4a41332..1d752f99cdad 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -462,8 +462,8 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames( pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel ); pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); - pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); - pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel ); + pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); + pNames[25] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel ); } return *pNamesSeq; } |