commit c72db4fada4afe7769666528b5bc6954f468d258
author Miklos Vajna <vmiklos@collabora.com> Wed Apr 22 21:06:58 2020 +0200
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Jun 02 10:30:50 2020 +0200
tree 33527b6ca7607970ce5909aeeb64e9267532042b
parent 59a896d80feee9f4c25b931c77aee281da189868

tdf#124790: sw: handle SubtractFlys when replacing compat options

This was added in commit c5cf8824a619401627f18abc7b3049551c71ac2a
(tdf#86578: sw: fix rendering of legacy documents with fly achored at
fly), it's off by default and on for legacy ODT files.

Change-Id: I8a08106bed8b12c173d47ed66efe54fd71953c99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92731
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95298

sw/source/core/doc/DocumentSettingManager.cxx

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index fe13a6b5..0d2a8fb 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -592,6 +592,7 @@
    mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading;
    mbTabRelativeToIndent = rSource.mbTabRelativeToIndent;
    mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList;
    mbSubtractFlys = rSource.mbSubtractFlys;
    mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
    mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara;
}