From f9c31bf18461d9d713929d74623d964dab8ae1f9 Mon Sep 17 00:00:00 2001
From: Jim Raykowski <raykowj@gmail.com>
Date: Thu, 20 Jun 2024 17:04:11 -0800
Subject: tdf#161537 fix Filter Navigator no longer shows the name of the field

Change-Id: I3dae3458ac5795b217743b1e6897345a22f1bf61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169310
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Tested-by: Jenkins
(cherry picked from commit c5bbbe987321d8f9e101fab9d67ddbf3d4f8dfca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169486
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
 svx/source/form/filtnav.cxx        |  2 +-
 svx/uiconfig/ui/filternavigator.ui | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'svx')

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 722deefaca35..fe633e9fdd20 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1061,7 +1061,7 @@ FmFilterNavigator::FmFilterNavigator(vcl::Window* pTopLevel, std::unique_ptr<wel
 
     m_xTreeView->connect_custom_get_size(LINK(this, FmFilterNavigator, CustomGetSizeHdl));
     m_xTreeView->connect_custom_render(LINK(this, FmFilterNavigator, CustomRenderHdl));
-    m_xTreeView->set_column_custom_renderer(0, true);
+    m_xTreeView->set_column_custom_renderer(1, true);
 
     m_xTreeView->connect_changed(LINK(this, FmFilterNavigator, SelectHdl));
     m_xTreeView->connect_key_press(LINK(this, FmFilterNavigator, KeyInputHdl));
diff --git a/svx/uiconfig/ui/filternavigator.ui b/svx/uiconfig/ui/filternavigator.ui
index 99297b0dc10f..5b7512f0376b 100644
--- a/svx/uiconfig/ui/filternavigator.ui
+++ b/svx/uiconfig/ui/filternavigator.ui
@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
-      <!-- column-name expander -->
+      <!-- column-name icon -->
       <column type="GdkPixbuf"/>
       <!-- column-name text -->
       <column type="gchararray"/>
@@ -43,16 +43,21 @@
               <object class="GtkTreeSelection"/>
             </child>
             <child>
-              <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+              <object class="GtkTreeViewColumn" id="treeviewcolumn0">
+                <property name="visible">False</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
+                  <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf"/>
                   <attributes>
                     <attribute name="pixbuf">0</attribute>
                   </attributes>
                 </child>
                 <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext2">
+                  <object class="GtkCellRendererText" id="cellrenderertext">
                     <property name="editable">True</property>
                   </object>
                   <attributes>
-- 
cgit