Kaydet (Commit) 04af3ecc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Get array indexing right in ControlModelContainerBase::getAvailableServiceNames.

Apparently a merge conflict from 83380a78 "Merge commit 'ooo/DEV300_m106' into libreoffice-3-4"
toolkit/qa/unoapi stumbled over it.
üst f2416a7f
...@@ -462,8 +462,8 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames( ...@@ -462,8 +462,8 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames(
pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel ); pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );
pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel );
pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel );
pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel ); pNames[25] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel );
} }
return *pNamesSeq; return *pNamesSeq;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment