commit 97cf76e9197a244a7d12f1f0a52074ccf36685e2
author Caolán McNamara <caolanm@redhat.com> Mon Jan 24 20:09:49 2022 +0000
committer Caolán McNamara <caolanm@redhat.com> Tue Jan 25 09:32:20 2022 +0100
tree 1b772ebacd17c48c4c76b9566f8d0670ba1b37c9
parent 9aa90da7e03b4b0806b27451665b7c41b8836bc0

tdf#146971 changing a11y desc to replace %PRODUCTNAME has perf issues

so leave it alone, and do the conversion just for the originally
report situation as a safely backportable change with a follow up
to not allow us to get into this situation in the first place

Change-Id: I4f95f85791d0f937e53d7541804870b2cbf62b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/unx/gtk3/gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 7183427..b3c4c0d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22042,7 +22042,15 @@ namespace {
            const char* pDesc = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr;
            if (pDesc && pDesc[0])
            {
                gtk_tooltip_set_text(tooltip, pDesc);
                if (ResHookProc pStringReplace = Translate::GetReadStringHook())
                {
                    // tdf#142704 %PRODUCTNAME shown in extended tips
                    OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
                    aDesc = (*pStringReplace)(aDesc);
                    gtk_tooltip_set_text(tooltip, OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
                }
                else
                    gtk_tooltip_set_text(tooltip, pDesc);
                return true;
            }
#endif
@@ -22605,18 +22613,6 @@ private:
                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;
            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