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>

6 files changed, 20 insertions, 0 deletions

diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 9c3e39ad35d4..1ad79067b02e 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -74,6 +74,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>
@@ -94,6 +95,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>
@@ -242,10 +244,12 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
+                              <!-- n-columns=1 n-rows=1 -->
                               <object class="GtkGrid" id="grid">
                                 <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>
@@ -254,6 +258,7 @@
                                     <property name="column_spacing">18</property>
                                     <property name="column_homogeneous">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>
@@ -393,6 +398,7 @@
                                       </packing>
                                     </child>
                                     <child>
+                                      <!-- n-columns=1 n-rows=1 -->
                                       <object class="GtkGrid" id="grid6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui
index a78f6da7b020..8838088e1d62 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -120,6 +120,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>
@@ -342,6 +343,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>
@@ -411,6 +413,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
+                      <!-- n-columns=1 n-rows=1 -->
                       <object class="GtkGrid" id="grid9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -621,6 +624,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>
@@ -688,6 +692,7 @@
               </packing>
             </child>
             <child>
+              <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="epsgrid">
                 <property name="can_focus">False</property>
                 <child>
@@ -703,6 +708,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>
@@ -780,6 +786,7 @@
                         <property name="top_padding">6</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>
@@ -858,6 +865,7 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
+                          <!-- n-columns=1 n-rows=1 -->
                           <object class="GtkGrid" id="grid7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -936,6 +944,7 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <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/svtools/uiconfig/ui/inputbox.ui b/svtools/uiconfig/ui/inputbox.ui
index 45c2e4103c22..fc8ec47795b7 100644
--- a/svtools/uiconfig/ui/inputbox.ui
+++ b/svtools/uiconfig/ui/inputbox.ui
@@ -60,6 +60,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>
diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index d71c76201e04..d066e1cf4fa9 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -98,6 +98,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="TypeGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -142,6 +143,7 @@
           </packing>
         </child>
         <child>
+          <!-- n-columns=1 n-rows=1 -->
           <object class="GtkGrid" id="Details">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
diff --git a/svtools/uiconfig/ui/printersetupdialog.ui b/svtools/uiconfig/ui/printersetupdialog.ui
index 3466d4652130..47b00e7925b7 100644
--- a/svtools/uiconfig/ui/printersetupdialog.ui
+++ b/svtools/uiconfig/ui/printersetupdialog.ui
@@ -104,6 +104,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/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui
index 6b1e2a121c4e..3cc9a89220a1 100644
--- a/svtools/uiconfig/ui/thineditcontrol.ui
+++ b/svtools/uiconfig/ui/thineditcontrol.ui
@@ -15,6 +15,7 @@
     <property name="vexpand">True</property>
     <property name="orientation">vertical</property>
     <child>
+      <!-- n-columns=1 n-rows=1 -->
       <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>