summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-06-03 21:07:40 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-06-04 09:09:37 +0200
commitd321f7c56b7b509cd041c58fffe2da3257ceec47 (patch)
treecf0c8c5024a5c2649d5704cf9892f3201c834529 /sw
parentddb1bbf0ab481d143aedb9346115d65e797b704b (diff)
sw: handle SurroundTextWrapSmall when replacing compat options
This was added in commit 8f8b31abd02876c3601e343b8b3274754f8a61b6 (compatibility setting for MS Word wrapping text in less space (bnc#822908), 2013-08-06), it's off by default and on for old DOC/DOCX/RTF documents. See tdf#124790 for motivation. Change-Id: I786ea1de3feae25775055a2fb50c688ef6a6cd52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95453 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 4b4f6ff27e9e..279e4850b944 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -624,7 +624,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
// No mbBackgroundParaOverDrawings
mbTabOverMargin = rSource.mbTabOverMargin;
// No mbTreatSingleColumnBreakAsPageBreak
- // No mbSurroundTextWrapSmall
+ mbSurroundTextWrapSmall = rSource.mbSurroundTextWrapSmall;
mbPropLineSpacingShrinksFirstLine = rSource.mbPropLineSpacingShrinksFirstLine;
mbSubtractFlys = rSource.mbSubtractFlys;
// No mbLastBrowseMode: this is false by default everywhere