sw/source/core/doc/DocumentSettingManager.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 539a5501e6732b5083e112e76511024c8ce9678a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 22 21:06:58 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Apr 23 09:20:40 2020 +0200
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 <vmik...@collabora.com>
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index dcff4b1742dd..60cbae457508 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -626,7 +626,7 @@ void
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
// No mbTreatSingleColumnBreakAsPageBreak
// No mbSurroundTextWrapSmall
// No mbPropLineSpacingShrinksFirstLine
- // No mbSubtractFlys
+ mbSubtractFlys = rSource.mbSubtractFlys;
// No mbLastBrowseMode
mbDisableOffPagePositioning = rSource.mbDisableOffPagePositioning;
// No mbEmptyDbFieldHidesPara
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
