commit c764b37489fb5f639c9e1c4faba64ebe405cc347
author Miklos Vajna <vmiklos@collabora.com> Wed May 20 21:15:07 2020 +0200
committer Miklos Vajna <vmiklos@collabora.com> Thu May 21 09:27:54 2020 +0200
tree 5d08386165520cdae4a23f0837054ac1e97669b2
parent 9cca15204af9cc44a8a9528ccf2f36616fb70e69

sw: handle CollapseEmptyCellPara when replacing compat options

This was added in commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c
(sw-collapse-empty-table-par-like-html.diff:, 2010-09-14), it's on by
default and off for old ODF documents.

Change-Id: I372c3447b0f8d63a4608543bb466817d694cbff4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94599
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sw/source/core/doc/DocumentSettingManager.cxx

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index a4776f9..82b958a 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -615,7 +615,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
    // No mbProtectForm
    mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
    // No mbInvertBorderSpacing
    // No mbCollapseEmptyCellPara
    mbCollapseEmptyCellPara = rSource.mbCollapseEmptyCellPara;
    mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList;
    // No mbSmallCapsPercentage66
    // No mbTabOverflow