[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/sidebar/shapes/DefaultShapesPanel.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ea48cb21bb3b5f8a4f1a01987d393bddb9985a8e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 14 14:39:05 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 15 09:41:09 2021 +0200

    Resolves: tdf#142767 cannot use itemid of 0 in ValueSets
    
    Change-Id: I2c2b655b512e4e7869fe3784f1b073ecdbd0dac9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117123
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 3d52ae23fb0d..cbbde9196953 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -130,8 +130,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();
@@ -152,7 +152,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);
         }
     }
 }