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>

9 files changed, 22 insertions, 0 deletions

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 339b9e47d0bf..d2cd0cdb0ffb 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -119,6 +119,7 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</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="can_focus">False</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>
@@ -1350,6 +1352,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="orientation">vertical</property>
                                 <child>
+                                  <!-- n-columns=1 n-rows=1 -->
                                   <object class="GtkGrid" id="grid3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -1662,6 +1665,7 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1847,6 +1851,7 @@
                 <property name="can_focus">True</property>
                 <property name="resize_toplevel">True</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/vcl/uiconfig/ui/aboutbox.ui b/vcl/uiconfig/ui/aboutbox.ui
index fa96170804b5..560c84d89dc1 100644
--- a/vcl/uiconfig/ui/aboutbox.ui
+++ b/vcl/uiconfig/ui/aboutbox.ui
@@ -42,6 +42,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>
@@ -98,6 +99,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>
diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui b/vcl/uiconfig/ui/cupspassworddialog.ui
index c23f41b3c75b..4a210b327acb 100644
--- a/vcl/uiconfig/ui/cupspassworddialog.ui
+++ b/vcl/uiconfig/ui/cupspassworddialog.ui
@@ -61,6 +61,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/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index ffcf04f6fda4..8f7a3e148fee 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -501,11 +501,13 @@
                                     <property name="top_padding">6</property>
                                     <property name="left_padding">12</property>
                                     <child>
+                                      <!-- n-columns=1 n-rows=1 -->
                                       <object class="GtkGrid">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="row_spacing">6</property>
                                         <child>
+                                          <!-- n-columns=1 n-rows=1 -->
                                           <object class="GtkGrid" id="rangegrid">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
@@ -636,6 +638,7 @@
                                             <property name="can_focus">True</property>
                                             <property name="hexpand">True</property>
                                             <child>
+                                              <!-- n-columns=1 n-rows=1 -->
                                               <object class="GtkGrid" id="gdCopiesExtra">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
@@ -892,11 +895,13 @@
                                     <property name="top_padding">6</property>
                                     <property name="left_padding">12</property>
                                     <child>
+                                      <!-- n-columns=1 n-rows=1 -->
                                       <object class="GtkGrid">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="row_spacing">6</property>
                                         <child>
+                                          <!-- n-columns=1 n-rows=1 -->
                                           <object class="GtkGrid" id="pagegrid">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
@@ -982,6 +987,7 @@
                                             <property name="can_focus">True</property>
                                             <property name="hexpand">True</property>
                                             <child>
+                                              <!-- n-columns=1 n-rows=1 -->
                                               <object class="GtkGrid" id="expandpagegrid">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
diff --git a/vcl/uiconfig/ui/printerdevicepage.ui b/vcl/uiconfig/ui/printerdevicepage.ui
index 6c5f756790a6..993a5deebb00 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -18,6 +18,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="PrinterDevicePage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -95,6 +96,7 @@
       </packing>
     </child>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid" id="valuegrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -158,6 +160,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/vcl/uiconfig/ui/printerpaperpage.ui b/vcl/uiconfig/ui/printerpaperpage.ui
index 1f3155fea591..9b2ef1e04d20 100644
--- a/vcl/uiconfig/ui/printerpaperpage.ui
+++ b/vcl/uiconfig/ui/printerpaperpage.ui
@@ -2,6 +2,7 @@
 <!-- Generated with glade 3.20.4 -->
 <interface domain="vcl">
   <requires lib="gtk+" version="3.20"/>
+  <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="PrinterPaperPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/vcl/uiconfig/ui/printerpropertiesdialog.ui b/vcl/uiconfig/ui/printerpropertiesdialog.ui
index 3e16f3358cbc..c66f652f1955 100644
--- a/vcl/uiconfig/ui/printerpropertiesdialog.ui
+++ b/vcl/uiconfig/ui/printerpropertiesdialog.ui
@@ -66,6 +66,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>
@@ -110,6 +111,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/vcl/uiconfig/ui/printprogressdialog.ui b/vcl/uiconfig/ui/printprogressdialog.ui
index ae27a6dfb6f0..16ba55629e4c 100644
--- a/vcl/uiconfig/ui/printprogressdialog.ui
+++ b/vcl/uiconfig/ui/printprogressdialog.ui
@@ -42,6 +42,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/vcl/uiconfig/ui/querydialog.ui b/vcl/uiconfig/ui/querydialog.ui
index 89cc95c7dd88..901512a54bff 100644
--- a/vcl/uiconfig/ui/querydialog.ui
+++ b/vcl/uiconfig/ui/querydialog.ui
@@ -58,6 +58,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>