weld TreeView

a) use GtkTreeStores for GtkTreeViews
b) ironically can't store GtkTreeStore contents in .ui apparently
c) set show_expanders for all non-trees and unconverted cases
d) on-demand subtrees

Change-Id: I3c1036a222daba2c129b1a22ffeb3fe35005ae31
Reviewed-on: https://gerrit.libreoffice.org/63336
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

30 files changed, 173 insertions, 103 deletions

diff --git a/sw/inc/flddinf.hrc b/sw/inc/flddinf.hrc
new file mode 100644
index 000000000000..c9b1f3f6ac43
--- /dev/null
+++ b/sw/inc/flddinf.hrc
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SW_INC_FLDDINF_HRC
+#define INCLUDED_SW_INC_FLDDINF_HRC
+
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+
+const char* FLD_SELECT[] =
+{
+    NC_("flddocinfopage|liststore1", "Author"),
+    NC_("flddocinfopage|liststore1", "Time"),
+    NC_("flddocinfopage|liststore1", "Date"),
+    NC_("flddocinfopage|liststore1", "Date Time Author"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fldref.hrc b/sw/inc/fldref.hrc
new file mode 100644
index 000000000000..9dca24fa88c1
--- /dev/null
+++ b/sw/inc/fldref.hrc
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SW_INC_FLDREF_HRC
+#define INCLUDED_SW_INC_FLDREF_HRC
+
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+
+const char* FLD_REF_PAGE_TYPES[] =
+{
+    NC_("fldrefpage|liststore1", "Bookmarks"),
+    NC_("fldrefpage|liststore1", "Footnotes"),
+    NC_("fldrefpage|liststore1", "Endnotes"),
+    NC_("fldrefpage|liststore1", "Headings"),
+    NC_("fldrefpage|liststore1", "Numbered Paragraphs"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/outline.hrc b/sw/inc/outline.hrc
new file mode 100644
index 000000000000..c3202a39e404
--- /dev/null
+++ b/sw/inc/outline.hrc
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SW_INC_OUTLINE_HRC
+#define INCLUDED_SW_INC_OUTLINE_HRC
+
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+
+const char* OUTLINE_STYLE[] =
+{
+    NC_("numberingnamedialog|liststore1", "Untitled 1"),
+    NC_("numberingnamedialog|liststore1", "Untitled 2"),
+    NC_("numberingnamedialog|liststore1", "Untitled 3"),
+    NC_("numberingnamedialog|liststore1", "Untitled 4"),
+    NC_("numberingnamedialog|liststore1", "Untitled 5"),
+    NC_("numberingnamedialog|liststore1", "Untitled 6"),
+    NC_("numberingnamedialog|liststore1", "Untitled 7"),
+    NC_("numberingnamedialog|liststore1", "Untitled 8"),
+    NC_("numberingnamedialog|liststore1", "Untitled 9"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 9b8f1b6a4d8a..5eafa45d4a36 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -25,6 +25,7 @@
 #include <vcl/treelistentry.hxx>
 
 #include <swtypes.hxx>
+#include <flddinf.hrc>
 #include <globals.hrc>
 #include <strings.hrc>
 #include <fldbas.hxx>
@@ -45,6 +46,12 @@
 using namespace nsSwDocInfoSubType;
 using namespace com::sun::star;
 
+void FillFieldSelect(ListBox& rListBox)
+{
+    for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_SELECT); ++i)
+        rListBox.InsertEntry(SwResId(FLD_SELECT[i]));
+}
+
 SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet *const pCoreSet)
     :  SwFieldPage(pParent, "FieldDocInfoPage",
         "modules/swriter/ui/flddocinfopage.ui", pCoreSet)
@@ -56,6 +63,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet *con
     get(m_pSelection, "selectframe");
     get(m_pFormat, "formatframe");
     get(m_pSelectionLB, "select");
+    FillFieldSelect(*m_pSelectionLB);
     get(m_pFormatLB, "format");
     get(m_pFixedCB, "fixed");
 
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 5353cd8b620d..2347a6d15611 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -71,6 +71,8 @@ public:
     virtual void        FillUserData() override;
 };
 
+void FillFieldSelect(ListBox& rListBox);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 05c17ab172fa..f70a551c3034 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -30,6 +30,7 @@
 #include <wrtsh.hxx>
 #include <swmodule.hxx>
 #include "fldfunc.hxx"
+#include "flddinf.hxx"
 #include <flddropdown.hxx>
 
 #define USER_DATA_VERSION_1 "1"
@@ -46,7 +47,9 @@ SwFieldFuncPage::SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet *const p
     get(m_pTypeLB, "type");
     get(m_pFormat, "formatframe");
     get(m_pSelectionLB, "select");
+    FillFieldSelect(*m_pSelectionLB);
     get(m_pFormatLB, "format");
+    FillFieldSelect(*m_pFormatLB);
     get(m_pNameFT, "nameft");
     get(m_pNameED, "condFunction");
     get(m_pValueGroup, "valuegroup");
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 47f5cc9b1692..71afb52f2277 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -26,6 +26,7 @@
 #include <reffld.hxx>
 #include <wrtsh.hxx>
 
+#include <fldref.hrc>
 #include <globals.hrc>
 #include <strings.hrc>
 #include <SwNodeNum.hxx>
@@ -68,6 +69,11 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet *const pCo
     get(m_pSelectionToolTipLB, "selecttip");
     get(m_pFormat, "formatframe");
     get(m_pFormatLB, "format");
+    for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_REF_PAGE_TYPES); ++i)
+    {
+        m_pTypeLB->InsertEntry(SwResId(FLD_REF_PAGE_TYPES[i]));
+        m_pFormatLB->InsertEntry(SwResId(FLD_REF_PAGE_TYPES[i]));
+    }
     get(m_pNameFT, "nameft");
     get(m_pNameED, "name");
     get(m_pValueED, "value");
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 4f38ce446a76..1bc8682b8276 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -31,6 +31,7 @@
 #include <docary.hxx>
 #include <swmodule.hxx>
 #include "fldvar.hxx"
+#include "flddinf.hxx"
 #include <calc.hxx>
 #include <svl/zformat.hxx>
 #include <globals.hrc>
@@ -46,6 +47,7 @@ SwFieldVarPage::SwFieldVarPage(vcl::Window* pParent, const SfxItemSet *const pCo
     , bInit(true)
 {
     get(m_pTypeLB, "type");
+    FillFieldSelect(*m_pTypeLB);
     get(m_pSelection, "selectframe");
     get(m_pSelectionLB, "select");
     m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() | WB_SORT);
@@ -57,6 +59,7 @@ SwFieldVarPage::SwFieldVarPage(vcl::Window* pParent, const SfxItemSet *const pCo
     get(m_pValueED, "value");
     get(m_pNumFormatLB, "numformat");
     get(m_pFormatLB, "format");
+    FillFieldSelect(*m_pFormatLB);
     get(m_pChapterLevelLB, "level");
     get(m_pInvisibleCB, "invisible");
     get(m_pSeparatorFT, "separatorft");
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index d0588a3d9a73..39fa5cfd4749 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -43,6 +43,7 @@
 #include <viewopt.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <globals.hrc>
+#include <outline.hrc>
 #include <strings.hrc>
 #include <paratr.hxx>
 
@@ -120,6 +121,9 @@ SwNumNamesDlg::SwNumNamesDlg(weld::Window *pParent)
     , m_xFormBox(m_xBuilder->weld_tree_view("form"))
     , m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
+    for (size_t i = 0; i < SAL_N_ELEMENTS(OUTLINE_STYLE); ++i)
+        m_xFormBox->append_text(SwResId(OUTLINE_STYLE[i]));
+
     m_xFormEdit->connect_changed(LINK(this, SwNumNamesDlg, ModifyHdl));
     m_xFormBox->connect_changed(LINK(this, SwNumNamesDlg, SelectHdl));
     m_xFormBox->connect_row_activated(LINK(this, SwNumNamesDlg, DoubleClickHdl));
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index 65e4b8896058..2455c9bb515f 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.20.2 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui
index 8d762304e4af..fc1bc0d554d1 100644
--- a/sw/uiconfig/swriter/ui/conditionpage.ui
+++ b/sw/uiconfig/swriter/ui/conditionpage.ui
@@ -178,6 +178,7 @@
                         <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection1"/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
index e4dda172e8fd..46fa20f28b68 100644
--- a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
+++ b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
@@ -12,7 +12,7 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-down</property>
   </object>
-  <object class="GtkListStore" id="liststore2">
+  <object class="GtkTreeStore" id="liststore2">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index df026feace08..6b5bb1911539 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui
index 3c8975cef798..6c0d90835d49 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -42,6 +42,7 @@
                         <property name="can_focus">True</property>
                         <property name="vexpand">True</property>
                         <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection"/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index a4c1e7e23933..f27cc6776d27 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -73,6 +73,7 @@
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="model">liststore1</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection3"/>
                 </child>
@@ -173,25 +174,11 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Author</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Time</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date Time Author</col>
-      </row>
-    </data>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">both</property>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index f00188e82293..ff1a8dead329 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -35,6 +35,7 @@
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="search_column">0</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
@@ -80,6 +81,7 @@
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection3"/>
                 </child>
@@ -141,6 +143,7 @@
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection5"/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index e41e952234a4..b8ba4c084ccc 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -27,6 +27,7 @@
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
@@ -74,6 +75,7 @@
                 <property name="vexpand">True</property>
                 <property name="model">liststore1</property>
                 <property name="search_column">0</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection4"/>
                 </child>
@@ -120,6 +122,7 @@
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="model">liststore1</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection3"/>
                 </child>
@@ -429,6 +432,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <property name="show_expanders">False</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="treeview-selection5"/>
                     </child>
@@ -565,25 +569,11 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Author</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Time</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date Time Author</col>
-      </row>
-    </data>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">both</property>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui
index a7340b3a8f69..042b373f88f4 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -3,28 +3,11 @@
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="fldrefpage|liststore1">Bookmarks</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldrefpage|liststore1">Footnotes</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldrefpage|liststore1">Endnotes</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldrefpage|liststore1">Headings</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldrefpage|liststore1">Numbered Paragraphs</col>
-      </row>
-    </data>
   </object>
   <object class="GtkBox" id="FieldRefPage">
     <property name="visible">True</property>
@@ -66,6 +49,7 @@
                         <property name="can_focus">True</property>
                         <property name="model">liststore1</property>
                         <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection"/>
                         </child>
@@ -111,6 +95,7 @@
                         <property name="can_focus">True</property>
                         <property name="model">liststore1</property>
                         <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection2"/>
                         </child>
@@ -247,6 +232,7 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
+                            <property name="show_expanders">False</property>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection" id="treeview-selection4"/>
                             </child>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index a4a8111ff898..8ce32e327494 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -37,6 +37,7 @@
                     <property name="vexpand">True</property>
                     <property name="model">liststore1</property>
                     <property name="search_column">0</property>
+                    <property name="show_expanders">False</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="treeview-selection3"/>
                     </child>
@@ -271,6 +272,7 @@
                             <property name="vexpand">True</property>
                             <property name="model">liststore1</property>
                             <property name="search_column">0</property>
+                            <property name="show_expanders">False</property>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection" id="treeview-selection2"/>
                             </child>
@@ -513,25 +515,11 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="fldvarpage|liststore1">Author</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldvarpage|liststore1">Time</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldvarpage|liststore1">Date</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="fldvarpage|liststore1">Date Time Author</col>
-      </row>
-    </data>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">both</property>
diff --git a/sw/uiconfig/swriter/ui/insertautotextdialog.ui b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
index 78441586690e..f7eb03e1ca35 100644
--- a/sw/uiconfig/swriter/ui/insertautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
@@ -103,6 +103,7 @@
                         <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection1"/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
index f869c06c7a61..d632c097b58a 100644
--- a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
@@ -333,6 +333,7 @@
                                 <property name="no_show_all">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
+                                <property name="show_expanders">False</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeview-selection2"/>
                                 </child>
@@ -384,6 +385,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
+                                <property name="show_expanders">False</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeview-selection4"/>
                                 </child>
@@ -400,6 +402,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
+                                <property name="show_expanders">False</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeview-selection3"/>
                                 </child>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index 3128884df743..7ce4f860fcce 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -23,7 +23,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/numberingnamedialog.ui b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
index 003f0bf082f2..97f450909812 100644
--- a/sw/uiconfig/swriter/ui/numberingnamedialog.ui
+++ b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
@@ -2,42 +2,13 @@
 <!-- Generated with glade 3.20.4 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
       <!-- column-name id -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 5</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 7</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 8</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 9</col>
-      </row>
-    </data>
   </object>
   <object class="GtkDialog" id="NumberingNameDialog">
     <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 63ca632a366b..b1984453e670 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -14,7 +14,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">1</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index d0f356a36a33..e5ba315c6b37 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -33,7 +33,7 @@
     <property name="step_increment">0.01</property>
     <property name="page_increment">1</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/selectautotextdialog.ui b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
index 973b6dc6c826..c07749323a45 100644
--- a/sw/uiconfig/swriter/ui/selectautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.20.4 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/selectindexdialog.ui b/sw/uiconfig/swriter/ui/selectindexdialog.ui
index 50b940124a27..ebd59fd594ea 100644
--- a/sw/uiconfig/swriter/ui/selectindexdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectindexdialog.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.20.4 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
diff --git a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
index 4a4e0d1af911..170df5515cea 100644
--- a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
+++ b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
@@ -23,6 +23,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
diff --git a/sw/uiconfig/swriter/ui/sidebartheme.ui b/sw/uiconfig/swriter/ui/sidebartheme.ui
index 5cc4309ff823..b93c6504345d 100644
--- a/sw/uiconfig/swriter/ui/sidebartheme.ui
+++ b/sw/uiconfig/swriter/ui/sidebartheme.ui
@@ -36,6 +36,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
diff --git a/sw/uiconfig/swriter/ui/tocstylespage.ui b/sw/uiconfig/swriter/ui/tocstylespage.ui
index 95decc9dae3d..5d340676b88a 100644
--- a/sw/uiconfig/swriter/ui/tocstylespage.ui
+++ b/sw/uiconfig/swriter/ui/tocstylespage.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="icon_name">sw/res/one_left.png</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
@@ -15,7 +15,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="liststore2">
+  <object class="GtkTreeStore" id="liststore2">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>