On at least the GTK and gen plugins, iter_n_children was returning 1 when the node has children on demand but then iter_children will return false in order to ignore the dummy node. This was causing an infinite recursion when iter_previous is called and the previous node has on-demand children because that uses the result of iter_n_children to determine if the node has children and then uses iter_children to move to a child node without checking the return value. That meant the iterator wouldn’t move and it would keep searching from the same place forever. This patch fixes it by making iter_n_children non-virtual and making it bail out early with 0 if the node has children on demand. Otherwise it will ask the backend via a virtual function which has been renamed to do_iter_n_children so that it is similar to how do_iter_children works. Change-Id: Ie9a3d5d51c9eae0789048fa5240441663642595d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207589 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
74 lines
2.6 KiB
XML
74 lines
2.6 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- Generated with glade 3.40.0 -->
|
|
<interface domain="vcl">
|
|
<requires lib="gtk+" version="3.24"/>
|
|
<object class="GtkDialog">
|
|
<property name="can-focus">False</property>
|
|
<property name="type-hint">dialog</property>
|
|
<child internal-child="vbox">
|
|
<object class="GtkBox">
|
|
<property name="can-focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
<property name="spacing">2</property>
|
|
<child internal-child="action_area">
|
|
<object class="GtkButtonBox">
|
|
<property name="can-focus">False</property>
|
|
<property name="layout-style">end</property>
|
|
<child>
|
|
<placeholder/>
|
|
</child>
|
|
<child>
|
|
<placeholder/>
|
|
</child>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">False</property>
|
|
<property name="position">1</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkTreeView" id="treeview">
|
|
<property name="visible">True</property>
|
|
<property name="can-focus">True</property>
|
|
<property name="model">liststore1</property>
|
|
<property name="headers-visible">False</property>
|
|
<child>
|
|
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
|
|
<property name="spacing">6</property>
|
|
<child>
|
|
<object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
|
|
<attributes>
|
|
<attribute name="pixbuf">0</attribute>
|
|
</attributes>
|
|
</child>
|
|
<child>
|
|
<object class="GtkCellRendererText" id="cellrenderertext2"/>
|
|
<attributes>
|
|
<attribute name="text">1</attribute>
|
|
</attributes>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">0</property>
|
|
</packing>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
<object class="GtkTreeStore" id="liststore1">
|
|
<columns>
|
|
<!-- column-name expander -->
|
|
<column type="GdkPixbuf"/>
|
|
<!-- column-name text -->
|
|
<column type="gchararray"/>
|
|
<!-- column-name id -->
|
|
<column type="gchararray"/>
|
|
</columns>
|
|
</object>
|
|
</interface>
|