Clean up integer types representing positions in ToolBox's item vector

(vs. uses of sal_uInt16 representing such items' IDs).  APPEND and ITEM_NOTFOUND
are members of ToolBox now (and have been bumped to the corresponding type's
max).  The payload of VclEventIds

ToolboxButtonStateChanged
ToolboxClick
ToolboxHighlightOff
ToolboxItemAdded
ToolboxItemDisabled
ToolboxItemEnabled
ToolboxItemRemoved
ToolboxItemTextChanged
ToolboxItemUpdated
ToolboxItemWindowChanged
ToolboxSelect

has been changed too (note that reading/writing of those payloads isn't very
consistent, though: for some of these, values are written that are never read,
while for some others no values are ever written but the reading code would like
to receive some value if the payload wasn't a nullptr).

Change-Id: I4856ffb3637404b8d866621a3503d7922b1b8141

4 files changed, 42 insertions, 35 deletions

diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 683af8635d5e..665f37b3e086 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -63,7 +63,7 @@ typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer;
 struct ReferenceToolbarPathInfo
 {
     VclPtr<ToolBox>    pToolbar;
-    sal_uInt16         nPos;
+    ToolBox::ImplToolItems::size_type nPos;
     bool               bResult;
 };
 
@@ -88,7 +88,7 @@ class ToolBarMerger
                                                             const OUString& rReferencePoint );
 
         static bool       ProcessMergeOperation( ToolBox*                  pToolbar,
-                                                 sal_uInt16                nPos,
+                                                 ToolBox::ImplToolItems::size_type nPos,
                                                  sal_uInt16&               rItemId,
                                                  CommandToInfoMap&         rCommandMap,
                                                  const OUString&           rModuleIdentifier,
@@ -97,7 +97,7 @@ class ToolBarMerger
                                                  const AddonToolbarItemContainer& rItems );
 
         static bool       ProcessMergeFallback( ToolBox*                         pToolbar,
-                                                sal_uInt16                       nPos,
+                                                ToolBox::ImplToolItems::size_type nPos,
                                                 sal_uInt16&                      rItemId,
                                                 CommandToInfoMap&                rCommandMap,
                                                 const OUString&           rModuleIdentifier,
@@ -106,7 +106,7 @@ class ToolBarMerger
                                                 const AddonToolbarItemContainer& rItems );
 
         static bool       MergeItems( ToolBox*                  pToolbar,
-                                      sal_uInt16                nPos,
+                                      ToolBox::ImplToolItems::size_type nPos,
                                       sal_uInt16                nModIndex,
                                       sal_uInt16&               rItemId,
                                       CommandToInfoMap&         rCommandMap,
@@ -114,14 +114,14 @@ class ToolBarMerger
                                       const AddonToolbarItemContainer& rAddonToolbarItems );
 
         static bool       ReplaceItem( ToolBox*                  pToolbar,
-                                       sal_uInt16                nPos,
+                                       ToolBox::ImplToolItems::size_type nPos,
                                        sal_uInt16&               rItemId,
                                        CommandToInfoMap&         rCommandMap,
                                        const OUString&           rModuleIdentifier,
                                        const AddonToolbarItemContainer& rAddonToolbarItems );
 
         static bool       RemoveItems( ToolBox*           pToolbar,
-                                       sal_uInt16         nPos,
+                                       ToolBox::ImplToolItems::size_type nPos,
                                        const OUString&    rMergeCommandParameter );
 
         static ::cppu::OWeakObject* CreateController(
@@ -134,7 +134,7 @@ class ToolBarMerger
             const OUString& rControlType );
 
         static void CreateToolbarItem( ToolBox* pToolbox,
-                                       sal_uInt16 nPos,
+                                       ToolBox::ImplToolItems::size_type nPos,
                                        sal_uInt16 nItemId,
                                        const AddonToolbarItem& rAddonToolbarItem );
 
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 6257c12b521c..24e98b0c7233 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -142,7 +142,7 @@ void SAL_CALL AddonsToolBarManager::dispose()
     {
         // Remove addon specific data from toolbar items.
         SolarMutexGuard g;
-        for ( sal_uInt16 n = 0; n < m_pToolBar->GetItemCount(); n++ )
+        for ( ToolBox::ImplToolItems::size_type n = 0; n < m_pToolBar->GetItemCount(); n++ )
         {
             sal_uInt16 nId( m_pToolBar->GetItemId( n ) );
 
@@ -171,7 +171,7 @@ bool AddonsToolBarManager::MenuItemAllowed( sal_uInt16 nId ) const
 void AddonsToolBarManager::RefreshImages()
 {
     bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
         sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
 
@@ -239,7 +239,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
         {
             if ( aURL == "private:separator" ) // toolbox item separator
             {
-                sal_uInt16 nCount = m_pToolBar->GetItemCount();
+                ToolBox::ImplToolItems::size_type nCount = m_pToolBar->GetItemCount();
                 if ( nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != ToolBoxItemType::SEPARATOR ) && nElements > 0 )
                 {
                     nElements = 0;
@@ -248,7 +248,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
             }
             else
             {
-                sal_uInt16 nCount = m_pToolBar->GetItemCount();
+                ToolBox::ImplToolItems::size_type nCount = m_pToolBar->GetItemCount();
                 if ( bAppendSeparator && nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != ToolBoxItemType::SEPARATOR ))
                 {
                     // We have to append a separator first if the last item is not a separator
@@ -451,7 +451,7 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent const *, pDataCha
         CheckAndUpdateImages();
     }
 
-    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
         const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d72a16518055..0ad9f1a01f85 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -223,7 +223,7 @@ void ToolBarManager::Destroy()
     }
 
     // Delete the additional add-ons data
-    for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
+    for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
         sal_uInt16 nItemId = m_pToolBar->GetItemId( i );
         if ( nItemId > 0 )
@@ -639,7 +639,7 @@ void ToolBarManager::RemoveControllers()
     // destroyed by the dispose() at the XComponent. This is needed
     // as VCL code later tries to access the item window data in certain
     // dtors where the item window is already invalid!
-    for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
+    for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
         sal_uInt16 nItemId = m_pToolBar->GetItemId( i );
         if ( nItemId > 0 )
@@ -669,7 +669,7 @@ void ToolBarManager::CreateControllers()
     bool                bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
     SvtCommandOptions   aCmdOptions;
 
-    for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
+    for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
         sal_uInt16 nId = m_pToolBar->GetItemId( i );
         if ( nId == 0 )
@@ -1177,7 +1177,7 @@ void ToolBarManager::FillOverflowToolbar( ToolBox* pParent )
 {
     CommandInfo aCmdInfo;
     bool bInsertSeparator = false;
-    for ( sal_uInt16 i = 0; i < pParent->GetItemCount(); ++i )
+    for ( ToolBox::ImplToolItems::size_type i = 0; i < pParent->GetItemCount(); ++i )
     {
         sal_uInt16 nId = pParent->GetItemId( i );
         if ( pParent->IsItemClipped( nId ) )
@@ -1422,7 +1422,6 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 
     if ( m_pToolBar->IsCustomize() )
     {
-        sal_uInt16    nPos( 0 );
         ::PopupMenu*  pVisibleItemsPopupMenu( aQuickCustomizationMenu->GetPopupMenu( 1 ));
 
         bool    bIsFloating( false );
@@ -1459,18 +1458,22 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
         std::map< OUString, Image > commandToImage;
 
         // Go through all toolbar items and add them to the context menu
-        for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+        for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
         {
             if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
             {
                 sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
                 OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
                 pVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
+                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
                 pVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
+                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
                 pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
                 Image aImage(vcl::CommandInfoProvider::GetImageForCommand(aCommandURL, m_xFrame));
                 commandToImage[aCommandURL] = aImage;
                 pVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
+                    //TODO: ToolBox::ImplToolItems::size_type -> sal_uInt16!
             }
             else
             {
@@ -1480,7 +1483,7 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 
         // Now we go through all the contextual menu to update the icons
         std::map< OUString, Image >::iterator it;
-        for ( nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
         {
             sal_uInt16 nId = pMenu->GetItemId( nPos );
             OUString cmdUrl = pMenu->GetItemCommand( nId );
@@ -1784,7 +1787,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEv
         CheckAndUpdateImages();
     }
 
-    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
         const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 5c89dfaf5648..2973b2cca3f4 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -238,11 +238,11 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
     ReferenceToolbarPathInfo aResult;
     aResult.bResult  = false;
     aResult.pToolbar = pToolbar;
-    aResult.nPos     = TOOLBOX_ITEM_NOTFOUND;
+    aResult.nPos     = ToolBox::ITEM_NOTFOUND;
 
-    const sal_uInt16 nSize( pToolbar->GetItemCount() );
+    const ToolBox::ImplToolItems::size_type nSize( pToolbar->GetItemCount() );
 
-    for ( sal_uInt16 i = 0; i < nSize; i++ )
+    for ( ToolBox::ImplToolItems::size_type i = 0; i < nSize; i++ )
     {
         const sal_uInt16 nItemId = pToolbar->GetItemId( i );
         if ( nItemId > 0 )
@@ -308,7 +308,7 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
 */
 bool ToolBarMerger::ProcessMergeOperation(
     ToolBox*                               pToolbar,
-    sal_uInt16                             nPos,
+    ToolBox::ImplToolItems::size_type      nPos,
     sal_uInt16&                            rItemId,
     CommandToInfoMap&                      rCommandMap,
     const OUString&                        rModuleIdentifier,
@@ -371,7 +371,7 @@ bool ToolBarMerger::ProcessMergeOperation(
 */
 bool ToolBarMerger::ProcessMergeFallback(
     ToolBox*                         pToolbar,
-    sal_uInt16                       /*nPos*/,
+    ToolBox::ImplToolItems::size_type /*nPos*/,
     sal_uInt16&                      rItemId,
     CommandToInfoMap&                rCommandMap,
     const OUString&           rModuleIdentifier,
@@ -391,7 +391,7 @@ bool ToolBarMerger::ProcessMergeFallback(
         if ( rMergeFallback == MERGEFALLBACK_ADDFIRST )
             return MergeItems( pToolbar, 0, 0, rItemId, rCommandMap, rModuleIdentifier, rItems );
         else if ( rMergeFallback == MERGEFALLBACK_ADDLAST )
-            return MergeItems( pToolbar, TOOLBOX_APPEND, 0, rItemId, rCommandMap, rModuleIdentifier, rItems );
+            return MergeItems( pToolbar, ToolBox::APPEND, 0, rItemId, rCommandMap, rModuleIdentifier, rItems );
     }
 
     return false;
@@ -435,7 +435,7 @@ bool ToolBarMerger::ProcessMergeFallback(
 */
 bool ToolBarMerger::MergeItems(
     ToolBox*                               pToolbar,
-    sal_uInt16                             nPos,
+    ToolBox::ImplToolItems::size_type      nPos,
     sal_uInt16                             nModIndex,
     sal_uInt16&                            rItemId,
     CommandToInfoMap&                      rCommandMap,
@@ -450,12 +450,16 @@ bool ToolBarMerger::MergeItems(
         const AddonToolbarItem& rItem = rAddonToolbarItems[i];
         if ( IsCorrectContext( rItem.aContext, rModuleIdentifier ))
         {
-            sal_Int32 nInsPos = nPos+nModIndex+i;
-            if ( nInsPos > sal_Int32( pToolbar->GetItemCount() ))
-                nInsPos = TOOLBOX_APPEND;
+            ToolBox::ImplToolItems::size_type nInsPos = nPos;
+            if (nInsPos != ToolBox::APPEND)
+            {
+                nInsPos += nModIndex+i;
+                if ( nInsPos > pToolbar->GetItemCount() )
+                    nInsPos = ToolBox::APPEND;
+            }
 
             if ( rItem.aCommandURL == TOOLBOXITEM_SEPARATOR_STR )
-                pToolbar->InsertSeparator( sal_uInt16( nInsPos ));
+                pToolbar->InsertSeparator( nInsPos );
             else
             {
                 CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
@@ -471,7 +475,7 @@ bool ToolBarMerger::MergeItems(
                     pIter->second.aIds.push_back( rItemId );
                 }
 
-                ToolBarMerger::CreateToolbarItem( pToolbar, sal_uInt16( nInsPos ), rItemId, rItem );
+                ToolBarMerger::CreateToolbarItem( pToolbar, nInsPos, rItemId, rItem );
             }
 
             ++nIndex;
@@ -521,7 +525,7 @@ bool ToolBarMerger::MergeItems(
 */
 bool ToolBarMerger::ReplaceItem(
     ToolBox*                               pToolbar,
-    sal_uInt16                             nPos,
+    ToolBox::ImplToolItems::size_type      nPos,
     sal_uInt16&                            rItemId,
     CommandToInfoMap&                      rCommandMap,
     const OUString&                        rModuleIdentifier,
@@ -558,7 +562,7 @@ bool ToolBarMerger::ReplaceItem(
 */
 bool ToolBarMerger::RemoveItems(
     ToolBox*                  pToolbar,
-    sal_uInt16                nPos,
+    ToolBox::ImplToolItems::size_type nPos,
     const OUString&    rMergeCommandParameter )
 {
     sal_Int32 nCount = rMergeCommandParameter.toInt32();
@@ -633,7 +637,7 @@ bool ToolBarMerger::RemoveItems(
     return pResult;
 }
 
-void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
+void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems::size_type nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
 {
     pToolbar->InsertItem( nItemId, rItem.aLabel, ToolBoxItemBits::NONE, nPos );
     pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );