diff options
| author | Vitaliy Anderson <vanderson@smartru.com> | 2017-08-21 21:41:19 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-22 16:15:54 +0200 |
| commit | 6eecd89ee0798925be69fcf23e8daa3bc643458d (patch) | |
| tree | 9dbec73ac04d0e390228527ee29eadbca918c2c1 /sw | |
| parent | ebd0f06d87d7db3015a29c4f6f895db6ac998c38 (diff) | |
tdf#110355: loading options from default config
Enable loading the "Protect Form" and "Use LibreOffice 4.3
anchoring paint order (in current document)" compatibility options from
default config
Change-Id: Ibb0cd4b66516a8b054974d458edf9f28a4b4743d
Reviewed-on: https://gerrit.libreoffice.org/41400
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/DocumentSettingManager.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index ee28751a6cdb..127609ecdc09 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -110,7 +110,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) mbUseFormerTextWrapping = aOptions.GetDefault( SvtCompatibilityEntry::Index::UseOurTextWrapping ); mbConsiderWrapOnObjPos = aOptions.GetDefault( SvtCompatibilityEntry::Index::ConsiderWrappingStyle ); mbDoNotJustifyLinesWithManualBreak = !aOptions.GetDefault( SvtCompatibilityEntry::Index::ExpandWordSpace ); + mbProtectForm = aOptions.GetDefault( SvtCompatibilityEntry::Index::ProtectForm ); mbMsWordCompTrailingBlanks = aOptions.GetDefault( SvtCompatibilityEntry::Index::MsWordTrailingBlanks ); + mbSubtractFlys = aOptions.GetDefault( SvtCompatibilityEntry::Index::SubtractFlysAnchoredAtFlys ); } else { @@ -125,7 +127,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) mbUseFormerTextWrapping = false; mbConsiderWrapOnObjPos = false; mbDoNotJustifyLinesWithManualBreak = true; + mbProtectForm = false; mbMsWordCompTrailingBlanks = false; + mbSubtractFlys = false; } // COMPATIBILITY FLAGS END |