sw/source/core/doc/DocumentSettingManager.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit c72db4fada4afe7769666528b5bc6954f468d258
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 22 21:06:58 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 2 10:30:50 2020 +0200
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 <vmik...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95298
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index fe13a6b569f6..0d2a8fb99808 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -592,6 +592,7 @@ void
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading;
mbTabRelativeToIndent = rSource.mbTabRelativeToIndent;
mbTabAtLeftIndentForParagraphsInList =
rSource.mbTabAtLeftIndentForParagraphsInList;
+ mbSubtractFlys = rSource.mbSubtractFlys;
mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
