[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 08166a27b1c1fb1b2058a3bfc4304cbfc7bad258
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon May 23 12:23:22 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Jun 23 13:33:27 2022 +0200

    gtk: fix leak in treeview tooltip
    
    Change-Id: Ib268729abf501da7e9f217ac3c3700cd853dfd43
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134781
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index e71e5d7c0673..9529668c5639 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -13906,12 +13906,13 @@ private:
             return false;
 #endif
         OUString aTooltip = 
pThis->signal_query_tooltip(GtkInstanceTreeIter(iter));
-        if (aTooltip.isEmpty())
-            return false;
-        gtk_tooltip_set_text(tooltip, OUStringToOString(aTooltip, 
RTL_TEXTENCODING_UTF8).getStr());
-        gtk_tree_view_set_tooltip_row(pTreeView, tooltip, pPath);
+        if (!aTooltip.isEmpty())
+        {
+            gtk_tooltip_set_text(tooltip, OUStringToOString(aTooltip, 
RTL_TEXTENCODING_UTF8).getStr());
+            gtk_tree_view_set_tooltip_row(pTreeView, tooltip, pPath);
+        }
         gtk_tree_path_free(pPath);
-        return true;
+        return !aTooltip.isEmpty();
     }
 
     void last_child(GtkTreeModel* pModel, GtkTreeIter* result, GtkTreeIter* 
pParent, int nChildren) const