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 /sc/inc | |
| 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 'sc/inc')
| -rw-r--r-- | sc/inc/NumberFormatControl.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/sc.hrc | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx index 77e3843613cd..55002b48d686 100644 --- a/sc/inc/NumberFormatControl.hxx +++ b/sc/inc/NumberFormatControl.hxx @@ -29,7 +29,7 @@ class ScNumberFormatControl final : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - ScNumberFormatControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + ScNumberFormatControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); virtual ~ScNumberFormatControl() override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4e0001d3f1ff..d553c82e2cbe 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -94,11 +94,7 @@ #define SID_NUMBER_PERCENT (SC_VIEW_START + 46) // "slot" IDs for input images: -#define SID_INPUT_FUNCTION (SC_VIEW_START + 47) -#define SID_INPUT_SUM (SC_VIEW_START + 48) -#define SID_INPUT_EQUAL (SC_VIEW_START + 49) -#define SID_INPUT_CANCEL (SC_VIEW_START + 50) -#define SID_INPUT_OK (SC_VIEW_START + 51) +// 47..51 are used for toolbox ids #define SID_NUMBER_STANDARD (SC_VIEW_START + 52) #define SID_NUMBER_DATE (SC_VIEW_START + 53) |