[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 b42fe2e2653775743d20f02356a73aa8e3c2696a
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jul 15 20:06:05 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jul 16 08:40:16 2021 +0200

    sw: handle mbProtectForm when replacing compat options
    
    This is off by default and it may be in for Word documents.
    
    Change-Id: I5f694bb505c2b43bea67712a2076dc5f370d03b0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118994
    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 c418e7560451..f6304724a95f 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -653,7 +653,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     mbClipAsCharacterAnchoredWriterFlyFrames = rSource.mbClipAsCharacterAnchoredWriterFlyFrames;
     mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading;
     mbTabRelativeToIndent = rSource.mbTabRelativeToIndent;
-    // No mbProtectForm
+    mbProtectForm = rSource.mbProtectForm;
     mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
     mbMsWordCompMinLineHeightByFly = rSource.mbMsWordCompMinLineHeightByFly;
     mbInvertBorderSpacing = rSource.mbInvertBorderSpacing;