[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 a5606b69333a6f13cc8eec8f6f47db1a2fb5fb0c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jul 8 20:25:34 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jul 9 09:43:32 2021 +0200

    sw: handle mbAddVerticalFlyOffsets when replacing compat options
    
    This was added in commit 50223ea6e212b60b7d33839c2753c5601fb50f95
    (tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31),
    it's off by default and is in for Word documents.
    
    Change-Id: Ie3fdd0328e285de189d32edd73ea08e0938f6887
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118655
    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 8d9959631d7c..c418e7560451 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -631,7 +631,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     mbTabCompat = rSource.mbTabCompat;
     mbUseVirtualDevice = rSource.mbUseVirtualDevice;
     mbAddFlyOffsets = rSource.mbAddFlyOffsets;
-    // No mbAddVerticalFlyOffsets
+    mbAddVerticalFlyOffsets = rSource.mbAddVerticalFlyOffsets;
     mbAddExternalLeading = rSource.mbAddExternalLeading;
     mbUseHiResolutionVirtualDevice = rSource.mbUseHiResolutionVirtualDevice;
     mbOldLineSpacing = rSource.mbOldLineSpacing;