From 412ff42bf0a6d078b9a6fd1daa8d0eb0b9a78c4a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 27 May 2020 21:20:32 +0200 Subject: sw: handle PropLineSpacingShrinksFirstLine when replacing compat options This was added in commit 9605763e3dc8c85137787c77c31e8639553a35ed (fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLine, 2014-10-30), it's on by default and off for old ODF documents. See tdf#124790 for motivation. Change-Id: If12447825ee9ed3094c5487e354eb7a0af5a46a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95004 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sw/source/core/doc/DocumentSettingManager.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sw') diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index 82b958a64d5a..4b4f6ff27e9e 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -625,15 +625,14 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti mbTabOverMargin = rSource.mbTabOverMargin; // No mbTreatSingleColumnBreakAsPageBreak // No mbSurroundTextWrapSmall - // No mbPropLineSpacingShrinksFirstLine + mbPropLineSpacingShrinksFirstLine = rSource.mbPropLineSpacingShrinksFirstLine; mbSubtractFlys = rSource.mbSubtractFlys; - // No mbLastBrowseMode + // No mbLastBrowseMode: this is false by default everywhere mbDisableOffPagePositioning = rSource.mbDisableOffPagePositioning; - // No mbEmptyDbFieldHidesPara mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara; mbContinuousEndnotes = rSource.mbContinuousEndnotes; - // No mbProtectBookmarks - // No mbProtectFields + // No mbProtectBookmarks: this is false by default everywhere + // No mbProtectFields: this is false by default everywhere } sal_uInt32 sw::DocumentSettingManager::Getn32DummyCompatibilityOptions1() const -- cgit