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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit c9b19f69e658f1114f1b8fc0ae62b6edd6d33e3f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 22 16:26:00 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 22 20:20:09 2021 +0200

    Resolves: tdf#142704 %PRODUCTNAME shown in gtk3 extended tips
    
    Change-Id: I61d8b83ce326816c498f54e3cfc053270d82c1a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122475
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 2131dbabb24a..babd59e3403f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21788,6 +21788,18 @@ private:
                 gtk_widget_hide(pWidget);
         }
 
+#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;
+        if (pDesc && pDesc[0])
+        {
+            OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
+            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))
         {