From 1692998399eecb79e7b59456cff805bcb77aece4 Mon Sep 17 00:00:00 2001 From: Noel Date: Mon, 8 Mar 2021 21:37:43 +0200 Subject: 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 --- sd/source/ui/inc/diactrl.hxx | 2 +- sd/source/ui/inc/gluectrl.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 850779a4b4be..63786b962312 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -62,7 +62,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlDiaPages(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + SdTbxCtlDiaPages(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); virtual ~SdTbxCtlDiaPages() override; }; diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 5176c980f402..c5a9b79fb901 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -63,7 +63,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlGlueEscDir(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + SdTbxCtlGlueEscDir(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); }; #endif // INCLUDED_SD_SOURCE_UI_INC_GLUECTRL_HXX -- cgit