ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#130857 Drop extra toggle renderer in MS Office Load/Save options

Browse Source 
Only a single checkbox is actually used in the first
column ("[L]") in this dialog, so drop the other one
and corresponding model columns.

Before

    Change-Id: Ic5bbe4ab71ba255ba16bb0a9176ee4c3a8827fe8
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Wed Jun 24 16:36:20 2026 +0200

        tdf#130857 gtk weld: Don't interpret toggle renderer by itself as expander col

, a single toggle renderer in the first column would
have been interpreted as enabling the special expander toggle
column feature for the gtk3 implementation and thus it couldn't
have been used for the weld API column index 0, but that is
possible now without requiring another dummy renderer in the .ui file.

The use of multiple same renderers in the first column
was identified by ui-rules-enforcer with upcoming commit

    Change-Id: I637e50477ce41a7ceca8f9cf5830e383b5393c69
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Thu Jun 25 11:15:58 2026 +0200

        tdf#130857 ui-rules-enforcer: Check column doesn't have multiple same renderers

in place.

The tab page can be triggered like this:

* start Writer
* "Tools" -> "Options"
* "Load/Save" -> "Microsoft Office"

Change-Id: I4d7ce5b0472e3a22c441b49dcd54ba2b068702e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207308
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2026-06-26 10:45:35 +02:00
parent 536d79b517
commit bbf734abee
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/uiconfig/ui/optfltrembedpage.ui
+6 -22
View File
@@ -8,8 +8,6 @@
<column type="gboolean"/>
<!-- column-name check2 -->
<column type="gboolean"/>
<!-- column-name check3 -->
<column type="gboolean"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
@@ -18,22 +16,16 @@
<column type="gboolean"/>
<!-- column-name checkvis2 -->
<column type="gboolean"/>
<!-- column-name checkvis3 -->
<column type="gboolean"/>
<!-- column-name checktri1 -->
<column type="gboolean"/>
<!-- column-name checktri2 -->
<column type="gboolean"/>
<!-- column-name checktri3 -->
<column type="gboolean"/>
<!-- column-name weight1 -->
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
<!-- column-name sensitive2 -->
<column type="gboolean"/>
<!-- column-name sensitive3 -->
<column type="gboolean"/>
</columns>
</object>
<!-- n-columns=2 n-rows=2 -->
@@ -92,19 +84,11 @@
<child>
<object class="GtkCellRendererToggle" id="cellrenderer5"/>
<attributes>
<attribute name="sensitive">12</attribute>
<attribute name="visible">5</attribute>
<attribute name="sensitive">9</attribute>
<attribute name="visible">4</attribute>
<attribute name="active">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererToggle" id="cellrenderer8"/>
<attributes>
<attribute name="sensitive">13</attribute>
<attribute name="visible">6</attribute>
<attribute name="active">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
@@ -116,9 +100,9 @@
<child>
<object class="GtkCellRendererToggle" id="cellrenderer7"/>
<attributes>
<attribute name="sensitive">14</attribute>
<attribute name="visible">7</attribute>
<attribute name="active">2</attribute>
<attribute name="sensitive">10</attribute>
<attribute name="visible">5</attribute>
<attribute name="active">1</attribute>
</attributes>
</child>
</object>
@@ -130,7 +114,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderer4"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>