[Libreoffice-commits] .: toolkit/source

[Stephan Bergmann]

 toolkit/source/controls/controlmodelcontainerbase.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 04af3ecc202d4c69d7dce0f0c1a5982a6af93074
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 8 13:04:59 2011 +0200

    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.

diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index d186d4a..1d752f9 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;
 }