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

[Caolán McNamara (via logerrit)]

 bin/ui-rules-enforcer.py                 |   13 +++++++++++++
 cui/uiconfig/ui/certdialog.ui            |    1 -
 sfx2/uiconfig/ui/notebookbarpopup.ui     |    1 -
 vcl/uiconfig/ui/interimdockparent.ui     |    1 -
 vcl/uiconfig/ui/interimtearableparent.ui |    1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 09a5a04628eeadaef297e1c14009939c1f5dd564
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 16:38:44 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 6 20:54:50 2021 +0200

    drop stray skip-pager-hint properties
    
    Change-Id: I54f4bba95773797f19290fb357225f9726b2ce72
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118517
    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 020c10cd14a4..359f9c1231fb 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -267,6 +267,18 @@ def remove_double_buffered(current):
   if double_buffered != None:
     current.remove(double_buffered)
 
+def remove_skip_pager_hint(current):
+  skip_pager_hint = None
+  for child in current:
+    remove_skip_pager_hint(child)
+    if child.tag == "property":
+      attributes = child.attrib
+      if attributes.get("name") == "skip_pager_hint" or attributes.get("name") == "skip-pager-hint":
+        skip_pager_hint = child
+
+  if skip_pager_hint != None:
+    current.remove(skip_pager_hint)
+
 def remove_expander_label_fill(current):
   label_fill = None
   isexpander = current.get('class') == "GtkExpander"
@@ -389,6 +401,7 @@ remove_expander_spacing(root)
 enforce_menubutton_indicator_consistency(root)
 enforce_active_in_group_consistency(root)
 remove_double_buffered(root)
+remove_skip_pager_hint(root)
 
 with open(sys.argv[1], 'wb') as o:
   # without encoding='unicode' (and the matching encode("utf8")) we get &#XXXX replacements for non-ascii characters
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index b5db2a2619bb..8f3545e3176a 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -25,7 +25,6 @@
     <property name="modal">True</property>
     <property name="default_width">0</property>
     <property name="type_hint">normal</property>
-    <property name="skip_pager_hint">True</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/notebookbarpopup.ui b/sfx2/uiconfig/ui/notebookbarpopup.ui
index 8a8916bd0d9c..297c5093d5fd 100644
--- a/sfx2/uiconfig/ui/notebookbarpopup.ui
+++ b/sfx2/uiconfig/ui/notebookbarpopup.ui
@@ -10,7 +10,6 @@
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
-    <property name="skip_pager_hint">True</property>
     <property name="deletable">False</property>
     <child>
       <object class="GtkBox" id="box">
diff --git a/vcl/uiconfig/ui/interimdockparent.ui b/vcl/uiconfig/ui/interimdockparent.ui
index b729787efa28..146973b6c134 100644
--- a/vcl/uiconfig/ui/interimdockparent.ui
+++ b/vcl/uiconfig/ui/interimdockparent.ui
@@ -10,7 +10,6 @@
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
-    <property name="skip_pager_hint">True</property>
     <property name="deletable">False</property>
     <child>
       <placeholder/>
diff --git a/vcl/uiconfig/ui/interimtearableparent.ui b/vcl/uiconfig/ui/interimtearableparent.ui
index a042827d9a4f..ad8e952b3582 100644
--- a/vcl/uiconfig/ui/interimtearableparent.ui
+++ b/vcl/uiconfig/ui/interimtearableparent.ui
@@ -10,7 +10,6 @@
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dock</property>
-    <property name="skip_pager_hint">True</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">True</property>