[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 19 15:27:01 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 52fef8096a03b0cc25bf053e6caca7670325d56f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 19 11:40:57 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 19 16:26:17 2020 +0100

    Update ident<->toolitem mapping in set_item_ident
    
    Change-Id: I477b2171bf8da38fb6f403d8618c0f3815fdd984
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106160
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index be37b2b49c02..67839fc77f79 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8572,8 +8572,12 @@ public:
 
     virtual void set_item_ident(int nIndex, const OString& rIdent) override
     {
+        m_aMap.erase(m_aMap.find(get_item_ident(nIndex)));
+
         GtkToolItem* pItem = gtk_toolbar_get_nth_item(m_pToolbar, nIndex);
         gtk_buildable_set_name(GTK_BUILDABLE(pItem), rIdent.getStr());
+
+        m_aMap[rIdent] = pItem;
     }
 
     virtual void set_item_label(int nIndex, const OUString& rLabel) override


More information about the Libreoffice-commits mailing list