use strong_int for item ids in vcl::ToolBox

(*) fix bug in SfxToolBoxControl::StateChanged where it was using the slot id
    instead of the toolbox item id
(*) I left the logic in SbaTableQueryBrowser alone, but it looks suspicious,
    casting slot ids to toolbox ids

Change-Id: Ied229164c27fb4456b0515c6fdcbd1682766a1a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

29 files changed, 75 insertions, 73 deletions

diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx b/framework/inc/uielement/FixedImageToolbarController.hxx
index 66533fbc9cde..30359a051b20 100644
--- a/framework/inc/uielement/FixedImageToolbarController.hxx
+++ b/framework/inc/uielement/FixedImageToolbarController.hxx
@@ -36,7 +36,7 @@ class FixedImageToolbarController final : public ComplexToolbarController
 public:
     FixedImageToolbarController(const css::uno::Reference<css::uno::XComponentContext>& rxContext,
                                 const css::uno::Reference<css::frame::XFrame>& rFrame,
-                                ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand);
+                                ToolBox* pToolBar, ToolBoxItemId nID, const OUString& aCommand);
 
     // XComponent
     virtual void SAL_CALL dispose() override;
diff --git a/framework/inc/uielement/FixedTextToolbarController.hxx b/framework/inc/uielement/FixedTextToolbarController.hxx
index 3d257414b6d2..b51d0de53654 100644
--- a/framework/inc/uielement/FixedTextToolbarController.hxx
+++ b/framework/inc/uielement/FixedTextToolbarController.hxx
@@ -36,7 +36,7 @@ class FixedTextToolbarController final : public ComplexToolbarController
 public:
     FixedTextToolbarController(const css::uno::Reference<css::uno::XComponentContext>& rxContext,
                                const css::uno::Reference<css::frame::XFrame>& rFrame,
-                               ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand);
+                               ToolBox* pToolBar, ToolBoxItemId nID, const OUString& aCommand);
 
     // XComponent
     virtual void SAL_CALL dispose() override;
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 8dcf79b03510..4762d595ace9 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -36,7 +36,7 @@ class ComboboxToolbarController final : public ComplexToolbarController
         ComboboxToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                    const css::uno::Reference< css::frame::XFrame >& rFrame,
                                    ToolBox*     pToolBar,
-                                   sal_uInt16       nID,
+                                   ToolBoxItemId nID,
                                    sal_Int32    nWidth,
                                    const OUString& aCommand );
         virtual ~ComboboxToolbarController() override;
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index b2c7c3e880a9..de3bee8ee88f 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
 
 #include <rtl/ustring.hxx>
+#include <vcl/toolbox.hxx>
 
 #include <unordered_map>
 #include <vector>
@@ -33,8 +34,8 @@ struct CommandInfo
     CommandInfo() : nId( 0 ),
                     nImageInfo( 0 ) {}
 
-    sal_uInt16                  nId;
-    ::std::vector< sal_uInt16 > aIds;
+    ToolBoxItemId               nId;
+    ::std::vector< ToolBoxItemId > aIds;
     sal_Int16                   nImageInfo;
 };
 
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 5036943299e9..5855d2cb41b3 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -43,7 +43,7 @@ class ComplexToolbarController : public svt::ToolboxController
         ComplexToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                   const css::uno::Reference< css::frame::XFrame >& rFrame,
                                   ToolBox* pToolBar,
-                                  sal_uInt16       nID,
+                                  ToolBoxItemId   nID,
                                   const OUString& aCommand );
         virtual ~ComplexToolbarController() override;
 
@@ -88,7 +88,7 @@ class ComplexToolbarController : public svt::ToolboxController
         void notifyTextChanged( const OUString& aText );
 
         VclPtr<ToolBox>                                      m_xToolbar;
-        sal_uInt16                                           m_nID;
+        ToolBoxItemId                                        m_nID;
         bool                                                 m_bMadeInvisible;
         mutable css::util::URL                               m_aURL;
         css::uno::Reference< css::util::XURLTransformer >    m_xURLTransformer;
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index eb95c142cef3..d9f1664dfc87 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -39,7 +39,7 @@ class DropdownToolbarController final : public ComplexToolbarController
         DropdownToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                    const css::uno::Reference< css::frame::XFrame >& rFrame,
                                    ToolBox* pToolBar,
-                                   sal_uInt16 nID,
+                                   ToolBoxItemId nID,
                                    sal_Int32 nWidth,
                                    const OUString& aCommand );
         virtual ~DropdownToolbarController() override;
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 21e7f6935f6d..e7acaafe8aae 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -38,7 +38,7 @@ class EditToolbarController final : public ComplexToolbarController
         EditToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                const css::uno::Reference< css::frame::XFrame >& rFrame,
                                ToolBox* pToolBar,
-                               sal_uInt16 nID,
+                               ToolBoxItemId nID,
                                sal_Int32 nWidth,
                                const OUString& aCommand );
         virtual ~EditToolbarController() override;
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 9b625059717f..0888e390b037 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -37,7 +37,7 @@ class ImageButtonToolbarController final : public ComplexToolbarController
         ImageButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                       const css::uno::Reference< css::frame::XFrame >& rFrame,
                                       ToolBox* pToolBar,
-                                      sal_uInt16 nID,
+                                      ToolBoxItemId nID,
                                       const OUString& aCommand );
         virtual ~ImageButtonToolbarController() override;
 
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index beb95049a206..80a0d26ebdc0 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -39,7 +39,7 @@ class SpinfieldToolbarController final : public ComplexToolbarController
         SpinfieldToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                     const css::uno::Reference< css::frame::XFrame >& rFrame,
                                     ToolBox* pToolBar,
-                                    sal_uInt16 nID,
+                                    ToolBoxItemId nID,
                                     sal_Int32 nWidth,
                                     const OUString& aCommand );
         virtual ~SpinfieldToolbarController() override;
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 9e667da83ba0..aeab78785556 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -51,7 +51,7 @@ class ToggleButtonToolbarController final : public ComplexToolbarController
         ToggleButtonToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                        const css::uno::Reference< css::frame::XFrame >& rFrame,
                                        ToolBox* pToolBar,
-                                       sal_uInt16 nID,
+                                       ToolBoxItemId nID,
                                        Style eStyle,
                                        const OUString& aCommand );
         virtual ~ToggleButtonToolbarController() override;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index d77ae16312aa..3b5e37d8dbb0 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -41,6 +41,7 @@
 #include <tools/link.hxx>
 #include <vcl/window.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/toolbox.hxx>
 
 #include <unordered_map>
 
@@ -141,7 +142,7 @@ class ToolBarManager final : public ToolbarManager_Base
         void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
         void impl_elementChanged(bool _bRemove,const css::ui::ConfigurationEvent& Event );
 
-        typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::frame::XStatusListener > >  ToolBarControllerMap;
+        typedef std::unordered_map< ToolBoxItemId, css::uno::Reference< css::frame::XStatusListener > >  ToolBarControllerMap;
         typedef ::std::vector< css::uno::Reference< css::frame::XSubToolbarController > >             SubToolBarControllerVector;
         typedef std::unordered_map<OUString, SubToolBarControllerVector>                                                SubToolBarToSubToolBarControllerMap;
 
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index bd07bb17e7e4..01defd7b2e0f 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -81,7 +81,7 @@ class ToolBarMerger
 
         static bool       ProcessMergeOperation( ToolBox*                  pToolbar,
                                                  ToolBox::ImplToolItems::size_type nPos,
-                                                 sal_uInt16&               rItemId,
+                                                 ToolBoxItemId&            rItemId,
                                                  CommandToInfoMap&         rCommandMap,
                                                  std::u16string_view       rModuleIdentifier,
                                                  std::u16string_view       rMergeCommand,
@@ -89,7 +89,7 @@ class ToolBarMerger
                                                  const AddonToolbarItemContainer& rItems );
 
         static bool       ProcessMergeFallback( ToolBox*                         pToolbar,
-                                                sal_uInt16&                      rItemId,
+                                                ToolBoxItemId&                   rItemId,
                                                 CommandToInfoMap&                rCommandMap,
                                                 std::u16string_view       rModuleIdentifier,
                                                 std::u16string_view       rMergeCommand,
@@ -99,14 +99,14 @@ class ToolBarMerger
         static void       MergeItems( ToolBox*                  pToolbar,
                                       ToolBox::ImplToolItems::size_type nPos,
                                       sal_uInt16                nModIndex,
-                                      sal_uInt16&               rItemId,
+                                      ToolBoxItemId&            rItemId,
                                       CommandToInfoMap&         rCommandMap,
                                       std::u16string_view       rModuleIdentifier,
                                       const AddonToolbarItemContainer& rAddonToolbarItems );
 
         static void       ReplaceItem( ToolBox*                  pToolbar,
                                        ToolBox::ImplToolItems::size_type nPos,
-                                       sal_uInt16&               rItemId,
+                                       ToolBoxItemId&            rItemId,
                                        CommandToInfoMap&         rCommandMap,
                                        std::u16string_view       rModuleIdentifier,
                                        const AddonToolbarItemContainer& rAddonToolbarItems );
@@ -120,13 +120,13 @@ class ToolBarMerger
             const css::uno::Reference< css::frame::XFrame > & xFrame,
             ToolBox*        pToolbar,
             const OUString& rCommandURL,
-            sal_uInt16      nId,
+            ToolBoxItemId   nId,
             sal_uInt16      nWidth,
             std::u16string_view rControlType );
 
         static void CreateToolbarItem( ToolBox* pToolbox,
                                        ToolBox::ImplToolItems::size_type nPos,
-                                       sal_uInt16 nItemId,
+                                       ToolBoxItemId nItemId,
                                        const AddonToolbarItem& rAddonToolbarItem );
 
     private:
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index c96791c2f422..e456a7a42460 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -43,7 +43,7 @@ pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator( pfunc_setToolBoxC
     return pOldSetToolBoxControllerCreator;
 }
 
-rtl::Reference<svt::ToolboxController> CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
+rtl::Reference<svt::ToolboxController> CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, ToolBoxItemId nID, const OUString& aCommandURL )
 {
     pfunc_setToolBoxControllerCreator pFactory = nullptr;
     {
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 1f46f09e2274..9f79f0ac7a14 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -923,8 +923,8 @@ void ToolbarLayoutManager::childWindowEvent( VclSimpleEvent const * pEvent )
         if ( pToolBox )
         {
             aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
-            sal_uInt16 nId = pToolBox->GetCurItemId();
-            if ( nId > 0 )
+            ToolBoxItemId nId = pToolBox->GetCurItemId();
+            if ( nId > ToolBoxItemId(0) )
                 aCommand = pToolBox->GetItemCommand( nId );
         }
 
diff --git a/framework/source/uielement/FixedImageToolbarController.cxx b/framework/source/uielement/FixedImageToolbarController.cxx
index 49377db5e555..303913432cd1 100644
--- a/framework/source/uielement/FixedImageToolbarController.cxx
+++ b/framework/source/uielement/FixedImageToolbarController.cxx
@@ -80,7 +80,7 @@ void FixedImageControl::dispose()
 
 FixedImageToolbarController::FixedImageToolbarController(
     const Reference<XComponentContext>& rxContext, const Reference<XFrame>& rFrame,
-    ToolBox* pToolbar, sal_uInt16 nID, const OUString& rCommand)
+    ToolBox* pToolbar, ToolBoxItemId nID, const OUString& rCommand)
     : ComplexToolbarController(rxContext, rFrame, pToolbar, nID, rCommand)
     , m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize())
 {
diff --git a/framework/source/uielement/FixedTextToolbarController.cxx b/framework/source/uielement/FixedTextToolbarController.cxx
index 32b486379178..36a1061aa86f 100644
--- a/framework/source/uielement/FixedTextToolbarController.cxx
+++ b/framework/source/uielement/FixedTextToolbarController.cxx
@@ -71,7 +71,7 @@ void FixedTextControl::dispose()
 
 FixedTextToolbarController::FixedTextToolbarController(
     const Reference<XComponentContext>& rxContext, const Reference<XFrame>& rFrame,
-    ToolBox* pToolbar, sal_uInt16 nID, const OUString& aCommand)
+    ToolBox* pToolbar, ToolBoxItemId nID, const OUString& aCommand)
     : ComplexToolbarController(rxContext, rFrame, pToolbar, nID, aCommand)
 {
     m_pFixedTextControl = VclPtr<FixedTextControl>::Create(m_xToolbar);
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 745b25d2cf99..a54c78d0d774 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -145,7 +145,7 @@ ComboboxToolbarController::ComboboxToolbarController(
     const Reference< XComponentContext >& rxContext,
     const Reference< XFrame >&            rFrame,
     ToolBox*                              pToolbar,
-    sal_uInt16                            nID,
+    ToolBoxItemId                         nID,
     sal_Int32                             nWidth,
     const OUString&                       aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index b62febf87663..743306590056 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -49,7 +49,7 @@ ComplexToolbarController::ComplexToolbarController(
     const Reference< XComponentContext >& rxContext,
     const Reference< XFrame >&            rFrame,
     ToolBox*                              pToolbar,
-    sal_uInt16                            nID,
+    ToolBoxItemId                         nID,
     const OUString&                       aCommand ) :
     svt::ToolboxController( rxContext, rFrame, aCommand )
     ,   m_xToolbar( pToolbar )
@@ -72,7 +72,7 @@ void SAL_CALL ComplexToolbarController::dispose()
 
     m_xURLTransformer.clear();
     m_xToolbar.clear();
-    m_nID = 0;
+    m_nID = ToolBoxItemId(0);
 }
 
 Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index b694bca18ed6..00c14f2b0c7c 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -122,7 +122,7 @@ DropdownToolbarController::DropdownToolbarController(
     const Reference< XComponentContext >&    rxContext,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    sal_uInt16                                   nID,
+    ToolBoxItemId                            nID,
     sal_Int32                                nWidth,
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 3bbb3f9755cc..8bde909c703d 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -127,7 +127,7 @@ EditToolbarController::EditToolbarController(
     const Reference< XComponentContext >&    rxContext,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    sal_uInt16                                   nID,
+    ToolBoxItemId                            nID,
     sal_Int32                                nWidth,
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 31c22d03bbb1..004fcf80ce78 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -82,7 +82,7 @@ static OUString getMasterCommand( const OUString& rCommand )
 GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >&    rxContext,
                                                     const Reference< XFrame >&               rFrame,
                                                     ToolBox*                                 pToolbar,
-                                                    sal_uInt16                               nID,
+                                                    ToolBoxItemId                            nID,
                                                     const OUString&                          aCommand ) :
     svt::ToolboxController( rxContext, rFrame, aCommand )
     ,   m_xToolbar( pToolbar )
@@ -104,7 +104,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XComponentC
                                                     const Reference< XFrame >&               rFrame,
                                                     weld::Toolbar&                           rToolbar,
                                                     const OUString&                          aCommand ) :
-    GenericToolbarController( rxContext, rFrame, nullptr, 0, aCommand )
+    GenericToolbarController( rxContext, rFrame, nullptr, ToolBoxItemId(0), aCommand )
 {
     m_pToolbar = &rToolbar;
 }
@@ -121,7 +121,7 @@ void SAL_CALL GenericToolbarController::dispose()
 
     m_pToolbar = nullptr;
     m_xToolbar.clear();
-    m_nID = 0;
+    m_nID = ToolBoxItemId(0);
 }
 
 void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier )
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 19107d374019..e03a3cbc156a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -57,7 +57,7 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     const Reference< XComponentContext >&    rxContext,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    sal_uInt16                                   nID,
+    ToolBoxItemId                            nID,
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
 {
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 51fcd4f4ee13..7048778029e4 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -150,7 +150,7 @@ void SAL_CALL PopupMenuToolbarController::initialize(
 
     SolarMutexGuard aSolarLock;
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nItemId = 0;
+    ToolBoxItemId nItemId;
     if ( getToolboxId( nItemId, &pToolBox ) )
     {
         ToolBoxItemBits nCurStyle( pToolBox->GetItemBits( nItemId ) );
@@ -169,7 +169,7 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu
         return;
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nItemId = 0;
+    ToolBoxItemId nItemId;
     if ( getToolboxId( nItemId, &pToolBox ) )
     {
         SolarMutexGuard aSolarLock;
@@ -355,7 +355,7 @@ void GenericPopupToolbarController::statusChanged( const css::frame::FeatureStat
         Menu* pVclMenu = comphelper::getUnoTunnelImplementation<VCLXMenu>( m_xPopupMenu )->GetMenu();
 
         ToolBox* pToolBox = nullptr;
-        sal_uInt16 nId = 0;
+        ToolBoxItemId nId;
         if ( getToolboxId( nId, &pToolBox ) && pToolBox->IsItemEnabled( nId ) )
         {
             pVclMenu->Activate();
@@ -389,7 +389,7 @@ void GenericPopupToolbarController::functionExecuted( const OUString& rCommand )
     addStatusListener( m_aCommandURL );
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( getToolboxId( nId, &pToolBox ) )
     {
         pToolBox->SetItemCommand( nId, rCommand );
@@ -461,7 +461,7 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
     PopupMenuToolbarController::initialize( aArguments );
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( !getToolboxId( nId, &pToolBox ) )
         return;
 
@@ -504,7 +504,7 @@ void SaveToolbarController::updateImage()
 {
     SolarMutexGuard aGuard;
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( !getToolboxId( nId, &pToolBox ) )
         return;
 
@@ -536,7 +536,7 @@ void SaveToolbarController::updateImage()
 void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
 {
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( !getToolboxId( nId, &pToolBox ) )
         return;
 
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index d76db7516c88..cb5e16194193 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -168,7 +168,7 @@ SpinfieldToolbarController::SpinfieldToolbarController(
     const Reference< XComponentContext >&    rxContext,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    sal_uInt16                                   nID,
+    ToolBoxItemId                            nID,
     sal_Int32                                nWidth,
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/styletoolbarcontroller.cxx b/framework/source/uielement/styletoolbarcontroller.cxx
index a5c2715095ec..05af487ff48f 100644
--- a/framework/source/uielement/styletoolbarcontroller.cxx
+++ b/framework/source/uielement/styletoolbarcontroller.cxx
@@ -220,7 +220,7 @@ void StyleToolbarController::statusChanged( const css::frame::FeatureStateEvent&
         throw css::lang::DisposedException();
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nItemId = 0;
+    ToolBoxItemId nItemId;
     if ( getToolboxId( nItemId, &pToolBox ) )
     {
         bool bChecked = false;
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 6dcd8b67404a..489eb135593d 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -135,7 +135,7 @@ void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& E
         return;
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( !getToolboxId( nId, &pToolBox ) )
         return;
 
@@ -196,7 +196,7 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow
     SolarMutexGuard aGuard;
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( getToolboxId( nId, &pToolBox ) )
     {
         css::uno::Reference< css::frame::XFrame > xFrame ( getFrameInterface() );
@@ -284,7 +284,7 @@ void SubToolBarController::updateImage()
     if ( !m_aLastCommand.isEmpty() )
     {
         ToolBox* pToolBox = nullptr;
-        sal_uInt16 nId = 0;
+        ToolBoxItemId nId;
         if ( getToolboxId( nId, &pToolBox ) )
         {
             vcl::ImageType eImageType = pToolBox->GetImageSize();
@@ -400,7 +400,7 @@ void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >
     svt::ToolboxController::initialize( rxArgs );
 
     ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
+    ToolBoxItemId nId;
     if ( getToolboxId( nId, &pToolBox ) )
     {
         if ( m_aLastCommand.isEmpty() )
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index ee2cb30e9910..77bf14418ca5 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -38,7 +38,7 @@ ToggleButtonToolbarController::ToggleButtonToolbarController(
     const Reference< XComponentContext >&    rxContext,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    sal_uInt16                                   nID,
+    ToolBoxItemId                            nID,
     Style                                    eStyle,
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d88ba1384f39..c50d25650082 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -229,8 +229,8 @@ void ToolBarManager::Destroy()
     // Delete the additional add-ons data
     for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
-        sal_uInt16 nItemId = m_pToolBar->GetItemId( i );
-        if ( nItemId > 0 )
+        ToolBoxItemId nItemId = m_pToolBar->GetItemId( i );
+        if ( nItemId > ToolBoxItemId(0) )
             delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId ));
     }
 
@@ -604,7 +604,7 @@ void ToolBarManager::impl_elementChanged(bool const isRemove,
 void ToolBarManager::setToolBarImage(const Image& rImage,
         const CommandToInfoMap::const_iterator& rIter)
 {
-    const ::std::vector<sal_uInt16>& rIDs = rIter->second.aIds;
+    const ::std::vector<ToolBoxItemId>& rIDs = rIter->second.aIds;
     m_pToolBar->SetItemImage( rIter->second.nId, rImage );
     for (auto const& it : rIDs)
     {
@@ -631,8 +631,8 @@ void ToolBarManager::RemoveControllers()
     // dtors where the item window is already invalid!
     for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
-        sal_uInt16 nItemId = m_pToolBar->GetItemId( i );
-        if ( nItemId > 0 )
+        ToolBoxItemId nItemId = m_pToolBar->GetItemId( i );
+        if ( nItemId > ToolBoxItemId(0) )
         {
             Reference< XComponent > xComponent( m_aControllerMap[ nItemId ], UNO_QUERY );
             if ( xComponent.is() )
@@ -661,8 +661,8 @@ void ToolBarManager::CreateControllers()
 
     for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
-        sal_uInt16 nId = m_pToolBar->GetItemId( i );
-        if ( nId == 0 )
+        ToolBoxItemId nId = m_pToolBar->GetItemId( i );
+        if ( nId == ToolBoxItemId(0) )
             continue;
 
         bool                     bInit( true );
@@ -710,7 +710,7 @@ void ToolBarManager::CreateControllers()
             aPropValue.Value    <<= xToolbarWindow;
             aPropertyVector.push_back( makeAny( aPropValue ));
             aPropValue.Name     = "Identifier";
-            aPropValue.Value    <<= nId;
+            aPropValue.Value    <<= sal_uInt16(nId);
             aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
             Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -822,7 +822,7 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Value <<= m_aModuleIdentifier;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name     = "Identifier";
-                aPropValue.Value    <<= nId;
+                aPropValue.Value    <<= sal_uInt16(nId);
                 aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
                 Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -973,7 +973,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     m_aControllerMap.clear();
     m_aCommandMap.clear();
 
-    sal_uInt16 nId( 1 );
+    ToolBoxItemId nId( 1 );
     CommandInfo aCmdInfo;
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
@@ -1090,7 +1090,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
 
     if ( !aMergeInstructionContainer.empty() )
     {
-        sal_uInt16 nItemId( TOOLBAR_ITEM_STARTID );
+        ToolBoxItemId nItemId( TOOLBAR_ITEM_STARTID );
         const sal_uInt32 nCount = aMergeInstructionContainer.size();
         for ( sal_uInt32 i=0; i < nCount; i++ )
         {
@@ -1180,7 +1180,7 @@ void ToolBarManager::FillAddonToolbar( const Sequence< Sequence< PropertyValue >
     m_aControllerMap.clear();
     m_aCommandMap.clear();
 
-    sal_uInt16 nId( 1 );
+    ToolBoxItemId nId( 1 );
     CommandInfo aCmdInfo;
     for ( const Sequence< PropertyValue >& rSeq : rAddonToolbar )
     {
@@ -1248,7 +1248,7 @@ void ToolBarManager::FillOverflowToolbar( ToolBox const * pParent )
     bool bInsertSeparator = false;
     for ( ToolBox::ImplToolItems::size_type i = 0; i < pParent->GetItemCount(); ++i )
     {
-        sal_uInt16 nId = pParent->GetItemId( i );
+        ToolBoxItemId nId = pParent->GetItemId( i );
         if ( pParent->IsItemClipped( nId ) )
         {
             if ( bInsertSeparator )
@@ -1394,7 +1394,7 @@ void ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
     if ( m_bDisposed )
         return;
 
-    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
+    ToolBoxItemId nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1417,7 +1417,7 @@ IMPL_LINK_NOARG(ToolBarManager, DropdownClick, ToolBox *, void)
     if ( m_bDisposed )
         return;
 
-    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
+    ToolBoxItemId nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1569,7 +1569,7 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox const * pToolBar)
             {
                 if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
                 {
-                    sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
+                    ToolBoxItemId nId = m_pToolBar->GetItemId(nPos);
                     OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
                     xVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
                     xVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
@@ -1853,7 +1853,7 @@ IMPL_LINK_NOARG(ToolBarManager, Select, ToolBox *, void)
         return;
 
     sal_Int16   nKeyModifier( static_cast<sal_Int16>(m_pToolBar->GetModifier()) );
-    sal_uInt16      nId( m_pToolBar->GetCurItemId() );
+    ToolBoxItemId nId( m_pToolBar->GetCurItemId() );
 
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
@@ -1898,7 +1898,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEv
 
     for ( ToolBox::ImplToolItems::size_type nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
-        const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
+        const ToolBoxItemId nId = m_pToolBar->GetItemId(nPos);
         vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 297f38cba9ad..652383988bcd 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -238,8 +238,8 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
 
     for ( ToolBox::ImplToolItems::size_type i = 0; i < nSize; i++ )
     {
-        const sal_uInt16 nItemId = pToolbar->GetItemId( i );
-        if ( nItemId > 0 )
+        const ToolBoxItemId nItemId = pToolbar->GetItemId( i );
+        if ( nItemId > ToolBoxItemId(0) )
         {
             const OUString rCmd = pToolbar->GetItemCommand( nItemId );
             if ( rCmd == rReferencePoint )
@@ -303,7 +303,7 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
 bool ToolBarMerger::ProcessMergeOperation(
     ToolBox*                               pToolbar,
     ToolBox::ImplToolItems::size_type      nPos,
-    sal_uInt16&                            rItemId,
+    ToolBoxItemId&                         rItemId,
     CommandToInfoMap&                      rCommandMap,
     std::u16string_view                    rModuleIdentifier,
     std::u16string_view                    rMergeCommand,
@@ -366,7 +366,7 @@ bool ToolBarMerger::ProcessMergeOperation(
 */
 bool ToolBarMerger::ProcessMergeFallback(
     ToolBox*                         pToolbar,
-    sal_uInt16&                      rItemId,
+    ToolBoxItemId&                   rItemId,
     CommandToInfoMap&                rCommandMap,
     std::u16string_view       rModuleIdentifier,
     std::u16string_view       rMergeCommand,
@@ -430,7 +430,7 @@ void ToolBarMerger::MergeItems(
     ToolBox*                               pToolbar,
     ToolBox::ImplToolItems::size_type      nPos,
     sal_uInt16                             nModIndex,
-    sal_uInt16&                            rItemId,
+    ToolBoxItemId&                         rItemId,
     CommandToInfoMap&                      rCommandMap,
     std::u16string_view                    rModuleIdentifier,
     const AddonToolbarItemContainer&       rAddonToolbarItems )
@@ -511,7 +511,7 @@ void ToolBarMerger::MergeItems(
 void ToolBarMerger::ReplaceItem(
     ToolBox*                               pToolbar,
     ToolBox::ImplToolItems::size_type      nPos,
-    sal_uInt16&                            rItemId,
+    ToolBoxItemId&                         rItemId,
     CommandToInfoMap&                      rCommandMap,
     std::u16string_view                    rModuleIdentifier,
     const AddonToolbarItemContainer&       rAddonToolbarItems )
@@ -587,7 +587,7 @@ rtl::Reference<::cppu::OWeakObject> ToolBarMerger::CreateController(
     const uno::Reference< frame::XFrame > & xFrame,
     ToolBox*               pToolbar,
     const OUString& rCommandURL,
-    sal_uInt16             nId,
+    ToolBoxItemId          nId,
     sal_uInt16             nWidth,
     std::u16string_view rControlType )
 {
@@ -621,7 +621,7 @@ rtl::Reference<::cppu::OWeakObject> ToolBarMerger::CreateController(
     return pResult;
 }
 
-void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems::size_type nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
+void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems::size_type nPos, ToolBoxItemId nItemId, const AddonToolbarItem& rItem )
 {
     pToolbar->InsertItem( nItemId, rItem.aLabel, ToolBoxItemBits::NONE, nPos );
     pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );