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

[Caolán McNamara (via logerrit)]

 bin/ui-rules-enforcer.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0044349b4617d90419113d0fea6be5b53c429fc4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 23 08:59:08 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 23 11:02:34 2021 +0200

    allow entry-text-column and id-column
    
    as later versions of glade write by default
    
    Change-Id: Icb26774553fb8c6bbb1399e3503bd0b6237767ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122511
    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 1a7c814eb52a..a344c88d6c2e 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -400,9 +400,9 @@ def enforce_entry_text_column_id_column_for_gtkcombobox(current):
     if child.tag == "property":
       insertpos = insertpos + 1;
       attributes = child.attrib
-      if attributes.get("name") == "entry_text_column":
+      if attributes.get("name") == "entry_text_column" or attributes.get("name") == "entry-text-column":
         entrytextcolumn = child
-      if attributes.get("name") == "id_column":
+      if attributes.get("name") == "id_column" or attributes.get("name") == "id-column":
         idcolumn = child
 
   if isgtkcombobox:
@@ -414,7 +414,7 @@ def enforce_entry_text_column_id_column_for_gtkcombobox(current):
       # if there is no entry_text_column, create one
       entrytextcolumn = etree.Element("property")
       attributes = entrytextcolumn.attrib
-      attributes["name"] = "entry_text_column"
+      attributes["name"] = "entry-text-column"
       entrytextcolumn.text = "0"
       current.insert(insertpos, entrytextcolumn)
       insertpos = insertpos + 1;
@@ -422,7 +422,7 @@ def enforce_entry_text_column_id_column_for_gtkcombobox(current):
       # if there is no id_column, create one
       idcolumn = etree.Element("property")
       attributes = idcolumn.attrib
-      attributes["name"] = "id_column"
+      attributes["name"] = "id-column"
       idcolumn.text = "1"
       current.insert(insertpos, idcolumn)