commit a928c968dc21d7e73172ebd6a55c4f4fae5a992d
author Caolán McNamara <caolanm@redhat.com> Tue Oct 19 08:44:43 2021 +0100
committer Michael Stahl <michael.stahl@allotropia.de> Tue Oct 19 11:18:26 2021 +0200
tree e209eb7d4ed8927b06b22e4879de684397d1f2c7
parent 8aaeea3c505c59bb2509924b527434ccf4152598

Resolves: tdf#136498 %PRODUCTNAME shown in tool tips

Change-Id: Id9640f9b5f85a98a510307bc7debf51448c716e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123776
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins

vcl/unx/gtk3/gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 727b6b5..6bfef76 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21633,9 +21633,18 @@ private:
                gtk_widget_hide(pWidget);
        }

#if !GTK_CHECK_VERSION(4, 0, 0)
        if (m_pStringReplace)
        {
            // tdf#136498 %PRODUCTNAME shown in tool tips
            const char* pTooltip = gtk_widget_get_tooltip_text(pWidget);
            if (pTooltip && pTooltip[0])
            {
                OUString aTooltip(pTooltip, strlen(pTooltip), RTL_TEXTENCODING_UTF8);
                aTooltip = (*m_pStringReplace)(aTooltip);
                gtk_widget_set_tooltip_text(pWidget, OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr());
            }

#if !GTK_CHECK_VERSION(4, 0, 0)
            // tdf#142704 %PRODUCTNAME shown in extended tips
            AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
            const char* pDesc = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr;
@@ -21645,8 +21654,8 @@ private:
                aDesc = (*m_pStringReplace)(aDesc);
                atk_object_set_description(pAtkObject, OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
            }
        }
#endif
        }

        // expand placeholder and collect potentially missing mnemonics
        if (GTK_IS_BUTTON(pWidget))