commit 539a5501e6732b5083e112e76511024c8ce9678a
author Miklos Vajna <vmiklos@collabora.com> Wed Apr 22 21:06:58 2020 +0200
committer Miklos Vajna <vmiklos@collabora.com> Thu Apr 23 09:20:40 2020 +0200
tree 3cc09baf677f5388faaa2867ceb22977743482e0
parent 7a714957f28758f9b112abc1bda8f502052c7b01

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>

sw/source/core/doc/DocumentSettingManager.cxx

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index dcff4b1..60cbae4 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -626,7 +626,7 @@
    // No mbTreatSingleColumnBreakAsPageBreak
    // No mbSurroundTextWrapSmall
    // No mbPropLineSpacingShrinksFirstLine
    // No mbSubtractFlys
    mbSubtractFlys = rSource.mbSubtractFlys;
    // No mbLastBrowseMode
    mbDisableOffPagePositioning = rSource.mbDisableOffPagePositioning;
    // No mbEmptyDbFieldHidesPara