remove deprecated [x|y]align property for CheckBoxes and RadioButtons

the gtk default is left aligned, change the vcl one to match and drop
the deprecated and unnecessary [x|y]align

Unfortunately on load glade's inline preview shows centered alignment, though
its "true" preview tool shows left alignment and unsetting and resetting
draw-indicator will update the preview to show the alignment which will
be used: https://gitlab.gnome.org/GNOME/glade/-/issues/502

See https://gitlab.gnome.org/GNOME/glade/-/merge_requests/110 for my
stab at making glade do the right thing.

Change-Id: If454e9ce8462e6b271d2423fe7e8a55788e01fac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109487
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 2 insertions, 23 deletions

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index b9c1ff39f174..5638a7dc4294 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -275,7 +275,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                       </object>
@@ -292,7 +291,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw-indicator">True</property>
                       </object>
                       <packing>
@@ -497,7 +495,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">RB_INSERT_NEW_PAGES</property>
                           </object>
@@ -514,7 +511,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">RB_USE_EXISTING_PAGES</property>
                           </object>
@@ -531,7 +527,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">RB_PAGE_START</property>
                           </object>
@@ -548,7 +543,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">RB_DOCUMENT_START</property>
                             <accessibility>
@@ -599,7 +593,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                           </object>
                           <packing>
@@ -658,7 +651,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                           </object>
                           <packing>
@@ -812,7 +804,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                       </object>
@@ -829,7 +820,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw-indicator">True</property>
                         <property name="group">2</property>
                       </object>
@@ -846,7 +836,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw-indicator">True</property>
                         <property name="group">2</property>
                       </object>
@@ -889,7 +878,6 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="use-underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw-indicator">True</property>
                         <accessibility>
                           <relation type="label-for" target="8"/>
@@ -979,7 +967,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw-indicator">True</property>
                           </object>
@@ -996,7 +983,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">15</property>
                           </object>
@@ -1013,7 +999,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">15</property>
                           </object>
@@ -1030,7 +1015,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">15</property>
                           </object>
@@ -1051,7 +1035,6 @@
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">False</property>
                                 <property name="use-underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw-indicator">True</property>
                                 <property name="group">15</property>
                                 <accessibility>
@@ -1121,7 +1104,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw-indicator">True</property>
                           </object>
@@ -1138,7 +1120,6 @@
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">22</property>
                           </object>
@@ -1159,7 +1140,6 @@
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">False</property>
                                 <property name="use-underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw-indicator">True</property>
                                 <property name="group">22</property>
                                 <accessibility>
@@ -1202,7 +1182,6 @@
                             <property name="receives-default">False</property>
                             <property name="margin-start">10</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0</property>
                             <property name="draw-indicator">True</property>
                           </object>
                           <packing>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 34799354ae3e..a90efa8f9ce2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1771,14 +1771,14 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
     else if (name == "GtkRadioButton")
     {
         extractGroup(id, rMap);
-        WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
+        WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
         VclPtr<RadioButton> xButton = VclPtr<RadioButton>::Create(pParent, true, nBits);
         xButton->SetImageAlign(ImageAlign::Left); //default to left
         xWindow = xButton;
     }
     else if (name == "GtkCheckButton")
     {
-        WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
+        WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
         bool bIsTriState = extractInconsistent(rMap);
         VclPtr<CheckBox> xCheckBox = VclPtr<CheckBox>::Create(pParent, nBits);
         if (bIsTriState)