[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 e37b8c6ec39d505570113328185ed3e6a017179f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jun 17 21:06:21 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jun 18 09:09:53 2020 +0200

    sw: handle TreatSingleColumnBreakAsPageBreak when replacing compat options
    
    This was added in commit 93d7fc90b57bb08052299c94fa0a28bb8f494a9c
    (tdf#76349 writer: make 1column-as-page break a compatibility option,
    2016-08-30), it's off by default and on for DOCX documents.
    
    Change-Id: I60f6d23feb278e8a234f5c571f9b647c2c08c491
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96561
    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 797e9024abb2..30be92c69122 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 mbClippedPictures
     // No mbBackgroundParaOverDrawings
     mbTabOverMargin = rSource.mbTabOverMargin;
-    // No mbTreatSingleColumnBreakAsPageBreak
+    mbTreatSingleColumnBreakAsPageBreak = rSource.mbTreatSingleColumnBreakAsPageBreak;
     mbSurroundTextWrapSmall = rSource.mbSurroundTextWrapSmall;
     mbPropLineSpacingShrinksFirstLine = rSource.mbPropLineSpacingShrinksFirstLine;
     mbSubtractFlys = rSource.mbSubtractFlys;