[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig

[heiko tietze]

 sc/uiconfig/scalc/ui/mergecellsdialog.ui |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ff4144cff2faafd7ebd0268c1bc29e55ebf7971f
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Tue Jun 5 10:01:21 2018 +0200

    Fixes svg vs. png issue for some icons
    
    Change-Id: Ia2c4a6a2888ef223655a61cf8ace11276739615f
    Reviewed-on: https://gerrit.libreoffice.org/55312
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    (cherry picked from commit a0fdfe83bd5530aa49028c13ce71723030367407)
    Reviewed-on: https://gerrit.libreoffice.org/55318

diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index 028b56862846..d646474ca7f2 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="MergeCellsDialog">
@@ -10,6 +10,9 @@
     <property name="default_width">0</property>
     <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -147,7 +150,7 @@
                 <property name="margin_left">24</property>
                 <property name="margin_bottom">6</property>
                 <property name="hexpand">False</property>
-                <property name="icon_name">vcl/res/MergeFirstCell.svg</property>
+                <property name="icon_name">vcl/res/MergeFirstCell.png</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -162,7 +165,7 @@
                 <property name="margin_left">24</property>
                 <property name="margin_bottom">6</property>
                 <property name="hexpand">True</property>
-                <property name="icon_name">vcl/res/MergeKeepHidden.svg</property>
+                <property name="icon_name">vcl/res/MergeKeepHidden.png</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -176,7 +179,7 @@
                 <property name="halign">start</property>
                 <property name="margin_left">24</property>
                 <property name="hexpand">True</property>
-                <property name="icon_name">vcl/res/MergeEmptyHidden.svg</property>
+                <property name="icon_name">vcl/res/MergeEmptyHidden.png</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -197,8 +200,5 @@
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>