1 files changed, 95 insertions, 102 deletions
diff --git a/sc/uiconfig/scalc/ui/selectdatasource.ui b/sc/uiconfig/scalc/ui/selectdatasource.ui
index 85957b5b939d..204f4276db9e 100644
--- a/sc/uiconfig/scalc/ui/selectdatasource.ui
+++ b/sc/uiconfig/scalc/ui/selectdatasource.ui
@@ -80,124 +80,117 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment3">
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="selectdatasource|label2">_Database:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">database</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="selectdatasource|label4">_Type:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">type</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="database">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="selectdatasource|label2">_Database:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">database</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="selectdatasource|label4">_Type:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">type</property>
-                        <property name="xalign">0</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="database-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|database">Select the database that contains the data source that you want to use.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="database">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="database-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|database">Select the database that contains the data source that you want to use.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="type">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <items>
-                          <item translatable="yes" context="selectdatasource|type">Table</item>
-                          <item translatable="yes" context="selectdatasource|type">Query</item>
-                          <item translatable="yes" context="selectdatasource|type">Sql</item>
-                          <item translatable="yes" context="selectdatasource|type">Sql [Native]</item>
-                        </items>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="type-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|type">Click the source type of for the selected data source.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="type">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <items>
+                      <item translatable="yes" context="selectdatasource|type">Table</item>
+                      <item translatable="yes" context="selectdatasource|type">Query</item>
+                      <item translatable="yes" context="selectdatasource|type">Sql</item>
+                      <item translatable="yes" context="selectdatasource|type">Sql [Native]</item>
+                    </items>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="type-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|type">Click the source type of for the selected data source.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="selectdatasource|label3">Data so_urce:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">datasource</property>
-                        <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="selectdatasource|label3">Data so_urce:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">datasource</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="datasource">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="comboboxtext-entry">
+                        <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="datasource">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="has_entry">True</property>
-                        <child internal-child="entry">
-                          <object class="GtkEntry" id="comboboxtext-entry">
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="datasource-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|datasource">Select the data source that you want to use.</property>
-                          </object>
-                        </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="datasource-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="selectdatasource|extended_tip|datasource">Select the data source that you want to use.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
                 </child>
               </object>
             </child>