[Libreoffice-commits] core.git: bin/ui-rules-enforcer.py sc/uiconfig

[Caolán McNamara (via logerrit)]

 bin/ui-rules-enforcer.py                     |   22 +++++++++++++++++++---
 sc/uiconfig/scalc/ui/advancedfilterdialog.ui |    1 -
 sc/uiconfig/scalc/ui/definename.ui           |    1 -
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui    |    1 -
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |    1 -
 5 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit a1ab9329bc15df3d3e0cac813784f83bea9aface
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 14 20:43:27 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 15 09:46:13 2021 +0200

    remove deprecated Expander spacing property
    
    which is the spacing between expander indicator and expander label
    
    Change-Id: Ib840cec6744bd7f0714d38b8296d2f17dc9a916d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117199
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index 984735d1a520..2624b441aa3b 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -219,11 +219,11 @@ def remove_double_buffered(current):
   if double_buffered != None:
     current.remove(double_buffered)
 
-def remove_label_fill(current):
+def remove_expander_label_fill(current):
   label_fill = None
   isexpander = current.get('class') == "GtkExpander"
   for child in current:
-    remove_label_fill(child)
+    remove_expander_label_fill(child)
     if not isexpander:
         continue
     if child.tag == "property":
@@ -234,6 +234,21 @@ def remove_label_fill(current):
   if label_fill != None:
     current.remove(label_fill)
 
+def remove_expander_spacing(current):
+  spacing = None
+  isexpander = current.get('class') == "GtkExpander"
+  for child in current:
+    remove_expander_spacing(child)
+    if not isexpander:
+        continue
+    if child.tag == "property":
+      attributes = child.attrib
+      if attributes.get("name") == "spacing":
+        spacing = child
+
+  if spacing != None:
+    current.remove(spacing)
+
 def enforce_menubutton_indicator_consistency(current):
   draw_indicator = None
   image = None
@@ -318,7 +333,8 @@ replace_button_use_stock(root)
 replace_image_stock(root)
 remove_check_button_align(root)
 remove_track_visited_links(root)
-remove_label_fill(root)
+remove_expander_label_fill(root)
+remove_expander_spacing(root)
 enforce_menubutton_indicator_consistency(root)
 enforce_active_in_group_consistency(root)
 remove_double_buffered(root)
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
index 5982024a5ec9..ce5b9ecaa89d 100644
--- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
@@ -185,7 +185,6 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
-            <property name="spacing">6</property>
             <property name="resize_toplevel">True</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
diff --git a/sc/uiconfig/scalc/ui/definename.ui b/sc/uiconfig/scalc/ui/definename.ui
index 6ab93caae82e..b33ed86a56e1 100644
--- a/sc/uiconfig/scalc/ui/definename.ui
+++ b/sc/uiconfig/scalc/ui/definename.ui
@@ -230,7 +230,6 @@
               <object class="GtkExpander" id="more">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="spacing">6</property>
                 <property name="resize_toplevel">True</property>
                 <child>
                   <!-- n-columns=1 n-rows=1 -->
diff --git a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
index ea17c747e239..5cd10a73a919 100644
--- a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
@@ -419,7 +419,6 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
-            <property name="spacing">6</property>
             <property name="resize_toplevel">True</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index be0ca369f2e2..82eca0210d13 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -706,7 +706,6 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
-            <property name="spacing">6</property>
             <property name="resize_toplevel">True</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->