commit 29433516e58514b92e3ca3aab965f69c641012a7
author Caolán McNamara <caolanm@redhat.com> Mon Jun 14 14:39:05 2021 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Mon Jun 14 19:33:23 2021 +0200
tree af55b813f33a77b1c9297ac5d562fed4afea34d2
parent 6373e9ca55394f498db0f84396492bb3fab63963

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>

svx/source/sidebar/shapes/DefaultShapesPanel.cxx

diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 8b97bb5..5bdf70f 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);
        }
    }
}