[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/DocumentSettingManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d321f7c56b7b509cd041c58fffe2da3257ceec47
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jun 3 21:07:40 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jun 4 09:09:37 2020 +0200

    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 at collabora.com>

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