summaryrefslogtreecommitdiff
path: root/vcl/source/window/menu.cxx
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-11-20 07:44:17 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-11-20 09:03:55 +0000
commite58120920f5dd978213ea4387a42ae7e376b2922 (patch)
treee0f2333fff5d1d6fa3d7e0fb3133797186a476fc /vcl/source/window/menu.cxx
parent20b279e134e6d6d60f0ea46c5e000303e869d241 (diff)
tdf#95938 Toolbar context menu has no commands
because of an integer overflow Change-Id: I75103450d0af59fd6f3196f451984e0dce45c693 Reviewed-on: https://gerrit.libreoffice.org/20072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl/source/window/menu.cxx')
-rw-r--r--vcl/source/window/menu.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 803c8a456a1a..3a6e54c67f03 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -533,9 +533,7 @@ void Menu::InsertItem(const OUString& rCommand, const uno::Reference<frame::XFra
OUString aTooltip(CommandInfoProvider::Instance().GetTooltipForCommand(rCommand, rFrame));
Image aImage(CommandInfoProvider::Instance().GetImageForCommand(rCommand, /*bLarge=*/ false, rFrame));
- // let's invent an ItemId
- const sal_uInt16 COMMAND_ITEMID_START = 30000;
- sal_uInt16 nItemId = COMMAND_ITEMID_START + GetItemCount();
+ sal_uInt16 nItemId = GetItemCount() + 1;
InsertItem(nItemId, aLabel, aImage, nBits, rIdent, nPos);
SetItemCommand(nItemId, rCommand);