[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 86280100cb4d558e2c1a4f67aa6e3ce7fdfb87b1
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Apr 15 20:55:05 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 16 09:55:04 2020 +0200

    sw: handle DisableOffPagePositioning when replacing compat options
    
    This was added in commit 8d62b79f168180c6992eb483ec864d473050635f
    (tdf#112443 disable off-page content positioning, 2017-11-29), it's off
    by default and on for DOCX files.
    
    Change-Id: Ic42d652fd92931b98979defd5060bf6e8f7c47d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92320
    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 24616650c450..dcff4b1742dd 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -628,7 +628,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     // No mbPropLineSpacingShrinksFirstLine
     // No mbSubtractFlys
     // No mbLastBrowseMode
-    // No mbDisableOffPagePositioning
+    mbDisableOffPagePositioning = rSource.mbDisableOffPagePositioning;
     // No mbEmptyDbFieldHidesPara
     mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara;
     mbContinuousEndnotes = rSource.mbContinuousEndnotes;