diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-20 08:41:46 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-06-15 17:26:50 +0200 |
| commit | d0f8e4693120f9c7e7d4ec83cd6ad5d9af349587 (patch) | |
| tree | 3dd76942522246fde9fd9f5126e6f89e4273e859 /sw/source/core/doc/DocumentSettingManager.cxx | |
| parent | 34dbd676ffb38fdd2f3a49dcff54925b98486eb2 (diff) | |
tdf#128195 Keep spacing below last paragraph in header (docx)
Add a layout compat option to keep the spacing below the last paragraph
in the header in doc/docx files
(cherry picked from commit 9b5805d1ef2b9e9c4e8f389c069807bf4489ea95)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/source/core/doc/DocumentSettingManager.cxx
sw/source/core/inc/DocumentSettingManager.hxx
sw/source/core/layout/flowfrm.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/uibase/uno/SwXDocumentSettings.cxx
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I259511183a8252e04d9951357dbdd4f4832523ec
Diffstat (limited to 'sw/source/core/doc/DocumentSettingManager.cxx')
| -rw-r--r-- | sw/source/core/doc/DocumentSettingManager.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index 0d2a8fb99808..3d31102f602d 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -91,7 +91,8 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) mbSubtractFlys(false), mApplyParagraphMarkFormatToNumbering(false), mbLastBrowseMode( false ), - mbDisableOffPagePositioning ( false ) + mbDisableOffPagePositioning ( false ), + mbHeaderSpacingBelowLastPara(false) // COMPATIBILITY FLAGS END { @@ -217,6 +218,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ DocumentSettingId id) const case DocumentSettingId::EMPTY_DB_FIELD_HIDES_PARA: return mbEmptyDbFieldHidesPara; case DocumentSettingId::CONTINUOUS_ENDNOTES: return mbContinuousEndnotes; + case DocumentSettingId::HEADER_SPACING_BELOW_LAST_PARA: return mbHeaderSpacingBelowLastPara; default: OSL_FAIL("Invalid setting id"); } @@ -452,6 +454,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo case DocumentSettingId::CONTINUOUS_ENDNOTES: mbContinuousEndnotes = value; break; + case DocumentSettingId::HEADER_SPACING_BELOW_LAST_PARA: + mbHeaderSpacingBelowLastPara = value; + break; default: OSL_FAIL("Invalid setting id"); } @@ -595,6 +600,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti mbSubtractFlys = rSource.mbSubtractFlys; mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks; mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara; + mbHeaderSpacingBelowLastPara = rSource.mbHeaderSpacingBelowLastPara; } sal_uInt32 sw::DocumentSettingManager::Getn32DummyCompatibilityOptions1() const |