From 28e76f61ff3bb3d99329dc4157f5290d779402d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sat, 29 Jan 2022 16:00:12 +0000
Subject: [PATCH] gtk4: remove stray label_yalign
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia1eb3fe4fac9511c4d0b531bdbc722e420a96f1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129150
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 bin/ui-rules-enforcer.py     | 13 +++++++++++++
 sfx2/uiconfig/ui/cmisline.ui |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index d39cb39c85aa..6f2d56bf935f 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -368,6 +368,18 @@ def remove_double_buffered(current):
   if double_buffered != None:
     current.remove(double_buffered)
 
+def remove_label_yalign(current):
+  label_yalign = None
+  for child in current:
+    remove_label_yalign(child)
+    if child.tag == "property":
+      attributes = child.attrib
+      if attributes.get("name") == "label_yalign" or attributes.get("name") == "label-yalign":
+        label_yalign = child
+
+  if label_yalign != None:
+    current.remove(label_yalign)
+
 def remove_skip_pager_hint(current):
   skip_pager_hint = None
   for child in current:
@@ -628,6 +640,7 @@ enforce_active_in_group_consistency(root)
 enforce_entry_text_column_id_column_for_gtkcombobox(root)
 remove_entry_shadow_type(root)
 remove_double_buffered(root)
+remove_label_yalign(root)
 remove_skip_pager_hint(root)
 remove_gravity(root)
 remove_toolbutton_focus(root)
diff --git a/sfx2/uiconfig/ui/cmisline.ui b/sfx2/uiconfig/ui/cmisline.ui
index 609c04af0cb8..b933d5c0639f 100644
--- a/sfx2/uiconfig/ui/cmisline.ui
+++ b/sfx2/uiconfig/ui/cmisline.ui
@@ -12,7 +12,6 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="label_xalign">0</property>
-    <property name="label_yalign">0</property>
     <property name="shadow_type">none</property>
     <child>
       <!-- n-columns=1 n-rows=1 -->