cui/uiconfig/ui/lineendstabpage.ui | 1 +
cui/uiconfig/ui/linestyletabpage.ui | 1 +
cui/uiconfig/ui/linetabpage.ui | 3 +++
3 files changed, 5 insertions(+)
New commits:
commit d70746d17b1baa610eae0ec0088388b95bf30b11
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 5 16:40:01 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 5 21:59:12 2018 +0200
Resolves: tdf#120345 wrong text model column used for line GtkComboBox
Change-Id: I6804fea72e105b118c8ef0228ca295ddfc0b1454
Reviewed-on: https://gerrit.libreoffice.org/61427
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/lineendstabpage.ui
b/cui/uiconfig/ui/lineendstabpage.ui
index b41fb00462e8..cc9a600d5a33 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -109,6 +109,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="model">liststore4</property>
+ <property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext3"/>
diff --git a/cui/uiconfig/ui/linestyletabpage.ui
b/cui/uiconfig/ui/linestyletabpage.ui
index 6d5cc023c02a..7b22bc37763d 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -115,6 +115,7 @@
<property name="halign">start</property>
<property name="model">liststore4</property>
<property name="active">0</property>
+ <property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext3"/>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index f6e7ec430155..fff6e55459eb 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -181,6 +181,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore5</property>
+ <property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext7"/>
@@ -403,6 +404,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore4</property>
+ <property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext1"/>
@@ -427,6 +429,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore6</property>
+ <property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext3"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
