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

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 23 06:46:02 UTC 2021


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

New commits:
commit 240bb9e223a7c22c02e8821d47f15b793f02e5a1
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jul 22 20:56:13 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jul 23 08:45:26 2021 +0200

    sw: handle mbStylesNoDefault when replacing compat options
    
    This is off by default and it may be in for Word documents.
    
    Change-Id: I5f350f42d795c4272e8b11fcc28a65265eff7243
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119381
    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 f6304724a95f..d786b9e52be5 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -641,7 +641,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     mbUseFormerTextWrapping = rSource.mbUseFormerTextWrapping;
     mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos;
     // No mbMathBaselineAlignment
-    // No mbStylesNoDefault
+    mbStylesNoDefault = rSource.mbStylesNoDefault;
     mbFloattableNomargins = rSource.mbFloattableNomargins;
     mbOldNumbering = rSource.mbOldNumbering;
     mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering;


More information about the Libreoffice-commits mailing list