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

[Andras Timar (via logerrit)]

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

New commits:
commit 12905be66272fb4144be6d1c654a412c37ac030f
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 19 16:56:42 2017 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Nov 17 11:46:06 2019 +0100

    [cp] 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>
    Reviewed-on: https://gerrit.libreoffice.org/78423
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index e5b3318ff701..27c1fc67a8cb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1911,14 +1911,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">