[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry

[Libreoffice Gerrit user]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4b832567dafc2f0095330bdc42ed9c0745d6aba
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 19 16:56:42 2017 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jul 13 18:46:42 2018 +0200

    Change merge cell defaults for Collabora Office
    
    Change-Id: Ib0f96e52f268df999fde34ea7bcf9ea9706ea11a
    Reviewed-on: https://gerrit.libreoffice.org/57399
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index c5cc7584ff83..1cbc251d9992 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1876,14 +1876,14 @@
             <desc>Specifies whether the Merge Cells dialog box is shown, when some cells are not empty.</desc>
             <label>Show Merge Cells dialog</label>
           </info>
-          <value>true</value>
+          <value>false</value>
         </prop>
         <prop oor:name="EmptyMergedCells" oor:type="xs:boolean" oor:nillable="false">
           <info>
             <desc>Specifies whether to empty the contents of the hidden cells (like Excel does).</desc>
             <label>Empty merged cells</label>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
       </group>
       <group oor:name="KeyBindings">