diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-06-14 14:39:05 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-14 19:33:23 +0200 |
| commit | 29433516e58514b92e3ca3aab965f69c641012a7 (patch) | |
| tree | af55b813f33a77b1c9297ac5d562fed4afea34d2 /svx | |
| parent | 6373e9ca55394f498db0f84396492bb3fab63963 (diff) | |
Resolves: tdf#142767 cannot use itemid of 0 in ValueSets
Change-Id: I2c2b655b512e4e7869fe3784f1b073ecdbd0dac9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117122
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 8b97bb5ee4d1..5bdf70ff6e68 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -121,8 +121,8 @@ IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) { if(rValueSet == aSetMap.first) { - int aSelection = aSetMap.first->GetSelectedItemId(); - comphelper::dispatchCommand(aSetMap.second[aSelection], {}); + sal_uInt16 nSelectionId = aSetMap.first->GetSelectedItemId(); + comphelper::dispatchCommand(aSetMap.second[nSelectionId - 1], {}); } else aSetMap.first->SetNoSelection(); @@ -143,7 +143,8 @@ void DefaultShapesPanel::populateShapes() auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(sSlotStr, vcl::CommandInfoProvider::GetModuleIdentifier(mxFrame)); sLabel = vcl::CommandInfoProvider::GetTooltipForCommand(sSlotStr, aProperties, mxFrame); - aSet.first->InsertItem(i, aSlotImage, sLabel); + sal_uInt16 nSelectionId = i + 1; // tdf#142767 id 0 is reserved for nothing-selected + aSet.first->InsertItem(nSelectionId, aSlotImage, sLabel); } } } |