[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 4d9bff6e3c7bd9361bd1516c4ff266bab07c069f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jul 1 20:34:55 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jul 2 08:27:46 2021 +0200

    sw: handle FloattableNomargins when replacing compat options
    
    This was added in commit 50a1df360c907d8419ce49f098b6bc87a37a9956
    (n#775899 sw: add FloattableNomargins compat flag, 2012-08-23), it's off
    by default and is on for Word documents.
    
    Change-Id: Idc80737b63081bf366e2b4222d9383e7615961aa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118242
    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 a4251c4a110e..7752b97705fd 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -642,7 +642,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos;
     // No mbMathBaselineAlignment
     // No mbStylesNoDefault
-    // No mbFloattableNomargins
+    mbFloattableNomargins = rSource.mbFloattableNomargins;
     mbOldNumbering = rSource.mbOldNumbering;
     mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering;
     mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak;