cui/uiconfig/ui/widgettestdialog.ui | 108 +++++++++++++++++++-----------------
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
2 files changed, 60 insertions(+), 50 deletions(-)
New commits:
commit d3c2ae1bb0913bcb2a28b2243e62f38016ddf7b0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 10 16:37:19 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 10 22:27:33 2023 +0200
attempt to select non-existing index -2 in combobox
regression since:
commit be1fe4418caa8c26ea53fe1f9acbe36096d5e3a9
Date: Mon Mar 27 14:28:45 2023 +0200
tdf#150652 Column Type being disabled makes UX unintuitive
Columntype is no longer disabled by default.
Change-Id: I607fc6481dd1d81d8deb440317dbfeffc9ec30dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151640
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 9f510c9d7e3d..8fd50c1b2431 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -933,7 +933,7 @@ IMPL_LINK( ScImportAsciiDlg, ColTypeHdl, ScCsvTableBox&,
rTableBox, void )
if (bEmpty)
mxLbType->set_active(-1);
- else
+ else if (bEnable)
mxLbType->set_active(nType);
}
commit 9a8b367f5d34b59ccdba0cf9336fb1e59bc4a8e5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 10 15:13:36 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 10 22:27:25 2023 +0200
add a liststore4 to widgettestdialog.ui
Change-Id: I241675dc236867e1efc2730e70e21568910f37b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151637
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/widgettestdialog.ui
b/cui/uiconfig/ui/widgettestdialog.ui
index 00333de38075..4bb3adc2d85c 100644
--- a/cui/uiconfig/ui/widgettestdialog.ui
+++ b/cui/uiconfig/ui/widgettestdialog.ui
@@ -2,6 +2,65 @@
<!-- Generated with glade 3.38.2 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="no">Test 1</col>
+ </row>
+ <row>
+ <col id="0" translatable="no">Test 2</col>
+ </row>
+ <row>
+ <col id="0" translatable="no">Test 3</col>
+ </row>
+ <row>
+ <col id="0" translatable="no">Test 4</col>
+ </row>
+ <row>
+ <col id="0" translatable="no">Test 5</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkTreeStore" id="liststore2">
+ <columns>
+ <!-- column-name expander -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ <!-- column-name weight -->
+ <column type="gint"/>
+ <!-- column-name sensitive -->
+ <column type="gboolean"/>
+ <!-- column-name extraindent -->
+ <column type="gint"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="liststore3">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name text1 -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore4">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="WidgetTestDialog">
<property name="can-focus">False</property>
<property name="title" translatable="yes"
context="widgettestdialog|WidgetTestDialog">Test Widgets</property>
@@ -613,53 +672,4 @@ t ever since the 1500s, when an unknown printer took a
galley of type and scramb
Ipsum passages, and more recently with desktop publishing
software like Aldus PageMaker including versions of Lorem Ipsum.</property>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="no">Test 1</col>
- </row>
- <row>
- <col id="0" translatable="no">Test 2</col>
- </row>
- <row>
- <col id="0" translatable="no">Test 3</col>
- </row>
- <row>
- <col id="0" translatable="no">Test 4</col>
- </row>
- <row>
- <col id="0" translatable="no">Test 5</col>
- </row>
- </data>
- </object>
- <object class="GtkTreeStore" id="liststore2">
- <columns>
- <!-- column-name expander -->
- <column type="GdkPixbuf"/>
- <!-- column-name text -->
- <column type="gchararray"/>
- <!-- column-name id -->
- <column type="gchararray"/>
- <!-- column-name weight -->
- <column type="gint"/>
- <!-- column-name sensitive -->
- <column type="gboolean"/>
- <!-- column-name extraindent -->
- <column type="gint"/>
- </columns>
- </object>
- <object class="GtkTreeStore" id="liststore3">
- <columns>
- <!-- column-name text -->
- <column type="gchararray"/>
- <!-- column-name text1 -->
- <column type="gchararray"/>
- <!-- column-name id -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
