diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-03-08 21:37:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-11 14:10:30 +0100 |
| commit | 1692998399eecb79e7b59456cff805bcb77aece4 (patch) | |
| tree | 8cc22c633e88f19c39f5736e87a0934f041729de /basctl | |
| parent | 665a2b477dd4f412b42ffb58a183f7a702cd7645 (diff) | |
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>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/IDEComboBox.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/inc/IDEComboBox.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index 5063eb4f45a9..cff0e58a206e 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno; */ SFX_IMPL_TOOLBOX_CONTROL(LibBoxControl, SfxStringItem); -LibBoxControl::LibBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) +LibBoxControl::LibBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx) : SfxToolBoxControl(nSlotId, nId, rTbx) { } @@ -359,7 +359,7 @@ void LibBox::ClearBox() */ SFX_IMPL_TOOLBOX_CONTROL(LanguageBoxControl, SfxStringItem); -LanguageBoxControl::LanguageBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) +LanguageBoxControl::LanguageBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx) : SfxToolBoxControl(nSlotId, nId, rTbx) { } diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index 76d73cdf8eec..1420feecd2d5 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -52,7 +52,7 @@ public: * @param nId -- this item's unique id in ToolBox * @param rTbx -- the ToolBox which contains this ComboBox */ - LibBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + LibBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); /*! * Triggered if state was changed @@ -198,7 +198,7 @@ public: * @param nId -- this item's unique id in ToolBox * @param rTbx -- the ToolBox which contains this ComboBox */ - LanguageBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + LanguageBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); /*! * Triggered if state was changed |