add <!-- n-columns=1 n-rows=1 --> before every GtkGrid

for a in `git ls-files '*.ui'`; do sed -i 's/^\( *\)\(<object class="GtkGrid".*\)/\1<!-- n-columns=1 n-rows=1 -->\n\1\2/' $a; done

so we get the same behavior in glade as before 3.38 in that the grid preview
don't show any unoccupied grid squares

replace all existing n-columns=X n-rows=Y lines because they are
all wrong, except for
cui/uiconfig/ui/additionsfragment.ui
sw/uiconfig/swriter/ui/pageheaderpanel.ui
sw/uiconfig/swriter/ui/pagefooterpanel.ui
which are correct.

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

30 files changed, 86 insertions, 0 deletions

diff --git a/chart2/uiconfig/ui/chardialog.ui b/chart2/uiconfig/ui/chardialog.ui
index 10eb21d49396..b2e8d2c52fbe 100644
--- a/chart2/uiconfig/ui/chardialog.ui
+++ b/chart2/uiconfig/ui/chardialog.ui
@@ -95,6 +95,7 @@
             <property name="scrollable">True</property>
             <property name="enable_popup">True</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -138,6 +139,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -185,6 +187,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/chartdatadialog.ui b/chart2/uiconfig/ui/chartdatadialog.ui
index f95117617f0c..3832dcdee47e 100644
--- a/chart2/uiconfig/ui/chartdatadialog.ui
+++ b/chart2/uiconfig/ui/chartdatadialog.ui
@@ -55,6 +55,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/datarangedialog.ui b/chart2/uiconfig/ui/datarangedialog.ui
index e7bdb7e11d81..0720a557e46c 100644
--- a/chart2/uiconfig/ui/datarangedialog.ui
+++ b/chart2/uiconfig/ui/datarangedialog.ui
@@ -85,6 +85,7 @@
             <property name="scrollable">True</property>
             <property name="enable_popup">True</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -128,6 +129,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index d1483dc1e198..7eca7ab7a067 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -94,6 +94,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
index b70ea3804060..2ac56a4ad0fd 100644
--- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
+++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
@@ -299,6 +299,7 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index fe23cbd7d124..8481f21a29af 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -118,6 +118,7 @@
                           </packing>
                         </child>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui
index 14d6f09f62a2..06e3c66352d7 100644
--- a/chart2/uiconfig/ui/inserttitledlg.ui
+++ b/chart2/uiconfig/ui/inserttitledlg.ui
@@ -79,6 +79,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -166,6 +167,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -298,6 +300,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui
index 5142aec6fbc1..604ce3f9500b 100644
--- a/chart2/uiconfig/ui/paradialog.ui
+++ b/chart2/uiconfig/ui/paradialog.ui
@@ -95,6 +95,7 @@
             <property name="scrollable">True</property>
             <property name="enable_popup">True</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -138,6 +139,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -186,6 +188,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -233,6 +236,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui b/chart2/uiconfig/ui/sidebaraxis.ui
index 64184344e9a5..b5b8a4adf03b 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -6,12 +6,14 @@
     <property name="upper">359</property>
     <property name="step_increment">5</property>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartAxisPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="row_spacing">6</property>
     <property name="column_spacing">6</property>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -48,6 +50,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="label_props">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui
index bcbcb5106c0a..fabf57068eec 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -2,6 +2,7 @@
 <!-- Generated with glade 3.22.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartElementsPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -26,6 +27,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -247,6 +249,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -432,6 +435,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -519,6 +523,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="grid4">
             <property name="can_focus">False</property>
             <child>
diff --git a/chart2/uiconfig/ui/sidebarerrorbar.ui b/chart2/uiconfig/ui/sidebarerrorbar.ui
index 22376982f46c..ce219874c323 100644
--- a/chart2/uiconfig/ui/sidebarerrorbar.ui
+++ b/chart2/uiconfig/ui/sidebarerrorbar.ui
@@ -27,6 +27,7 @@
     <property name="can_focus">False</property>
     <property name="icon_name">chart2/res/errordown_30.png</property>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartErrorBarPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -45,6 +46,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/sidebarseries.ui b/chart2/uiconfig/ui/sidebarseries.ui
index 4c3e0504d8bf..4a11d076d7eb 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -2,6 +2,7 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartSeriesPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/sidebartype.ui b/chart2/uiconfig/ui/sidebartype.ui
index 198cfa94bd6e..eea7fc426873 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -26,11 +26,13 @@
       <column type="GdkPixbuf"/>
     </columns>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartTypePanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -66,11 +68,13 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="3dblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="row_spacing">3</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -175,6 +179,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="stackblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -199,6 +204,7 @@
                 <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -257,6 +263,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -323,6 +330,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -369,6 +377,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="charttypeblock">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index 6a036344cf20..3721363465e7 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -157,6 +157,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui
index 7e9ed4e68f1e..ebc9df9eaebc 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -88,6 +88,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui
index 54600c657601..dbc0dbe08412 100644
--- a/chart2/uiconfig/ui/titlerotationtabpage.ui
+++ b/chart2/uiconfig/ui/titlerotationtabpage.ui
@@ -20,6 +20,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="grid10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -27,6 +28,7 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -82,6 +84,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index 478876257789..c3badf6494a7 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -25,6 +25,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="tp_3DSceneGeometry">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 1ca7f3a88fa4..8bb0f7c94711 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -82,6 +82,7 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -426,6 +427,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_AxisPositions.ui b/chart2/uiconfig/ui/tp_AxisPositions.ui
index 9b8c44146a47..73f44d5e065c 100644
--- a/chart2/uiconfig/ui/tp_AxisPositions.ui
+++ b/chart2/uiconfig/ui/tp_AxisPositions.ui
@@ -176,6 +176,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -389,6 +390,7 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -607,6 +609,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui
index c97e2070a576..5a4fb82c5294 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -58,6 +58,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -65,6 +66,7 @@
             <property name="vexpand">True</property>
             <property name="column_spacing">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -105,11 +107,13 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="3dblock">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">3</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -228,6 +232,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="stackblock">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -257,6 +262,7 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -325,6 +331,7 @@
                       </packing>
                     </child>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -404,6 +411,7 @@
                       </packing>
                     </child>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui
index 2e30faf5c7f5..a0e1963bef2b 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -26,6 +26,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index 6fb66d94f09c..33178c950637 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -42,6 +42,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="tp_DataSource">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -50,6 +51,7 @@
     <property name="border_width">6</property>
     <property name="column_spacing">6</property>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -57,6 +59,7 @@
         <property name="vexpand">True</property>
         <property name="column_spacing">12</property>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -122,6 +125,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -217,12 +221,14 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -314,6 +320,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="box5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -360,6 +367,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="box4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -398,6 +406,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="box6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui
index 5d2999f7f3bb..66e0d068d855 100644
--- a/chart2/uiconfig/ui/tp_ErrorBars.ui
+++ b/chart2/uiconfig/ui/tp_ErrorBars.ui
@@ -234,6 +234,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui
index ec4e1b1213aa..6741ba4e1e63 100644
--- a/chart2/uiconfig/ui/tp_LegendPosition.ui
+++ b/chart2/uiconfig/ui/tp_LegendPosition.ui
@@ -21,6 +21,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui
index c19f8bf62bab..4fe9dd41527a 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -8,12 +8,14 @@
     <property name="tooltip_text" translatable="yes" context="tp_RangeChooser|imageIB_RANGE|tooltip_text">Select data range</property>
     <property name="icon_name">chart2/res/selectrange.png</property>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="tp_RangeChooser">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="border_width">6</property>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -35,6 +37,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -203,6 +206,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui
index 9d560851e7bc..32691450bd9c 100644
--- a/chart2/uiconfig/ui/tp_Scale.ui
+++ b/chart2/uiconfig/ui/tp_Scale.ui
@@ -152,6 +152,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="gridMINMAX">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index 50dd256e048d..c0295a418522 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -123,6 +123,7 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="gridSettings">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -275,6 +276,7 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="gridPLOT_OPTIONS">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui
index e245087316e0..e7103623d956 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -53,6 +53,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -192,6 +193,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -238,6 +240,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -389,6 +392,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
index 990491aecb1d..980e74264417 100644
--- a/chart2/uiconfig/ui/tp_axisLabel.ui
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -276,6 +276,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -283,6 +284,7 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -339,6 +341,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/wizelementspage.ui b/chart2/uiconfig/ui/wizelementspage.ui
index 51d9faf61f5a..9b1cd00a6df2 100644
--- a/chart2/uiconfig/ui/wizelementspage.ui
+++ b/chart2/uiconfig/ui/wizelementspage.ui
@@ -24,12 +24,14 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="column_spacing">18</property>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -255,6 +257,7 @@
                   </packing>
                 </child>
                 <child>
+                  <!-- n-columns=1 n-rows=1 -->
                   <object class="GtkGrid" id="grid5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -285,6 +288,7 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -421,6 +425,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>