Kaydet (Commit) 6eecd89e authored tarafından Vitaliy Anderson's avatar Vitaliy Anderson Kaydeden (comit) Michael Stahl

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/41400Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst ebd0f06d
...@@ -110,7 +110,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) ...@@ -110,7 +110,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
mbUseFormerTextWrapping = aOptions.GetDefault( SvtCompatibilityEntry::Index::UseOurTextWrapping ); mbUseFormerTextWrapping = aOptions.GetDefault( SvtCompatibilityEntry::Index::UseOurTextWrapping );
mbConsiderWrapOnObjPos = aOptions.GetDefault( SvtCompatibilityEntry::Index::ConsiderWrappingStyle ); mbConsiderWrapOnObjPos = aOptions.GetDefault( SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
mbDoNotJustifyLinesWithManualBreak = !aOptions.GetDefault( SvtCompatibilityEntry::Index::ExpandWordSpace ); mbDoNotJustifyLinesWithManualBreak = !aOptions.GetDefault( SvtCompatibilityEntry::Index::ExpandWordSpace );
mbProtectForm = aOptions.GetDefault( SvtCompatibilityEntry::Index::ProtectForm );
mbMsWordCompTrailingBlanks = aOptions.GetDefault( SvtCompatibilityEntry::Index::MsWordTrailingBlanks ); mbMsWordCompTrailingBlanks = aOptions.GetDefault( SvtCompatibilityEntry::Index::MsWordTrailingBlanks );
mbSubtractFlys = aOptions.GetDefault( SvtCompatibilityEntry::Index::SubtractFlysAnchoredAtFlys );
} }
else else
{ {
...@@ -125,7 +127,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) ...@@ -125,7 +127,9 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
mbUseFormerTextWrapping = false; mbUseFormerTextWrapping = false;
mbConsiderWrapOnObjPos = false; mbConsiderWrapOnObjPos = false;
mbDoNotJustifyLinesWithManualBreak = true; mbDoNotJustifyLinesWithManualBreak = true;
mbProtectForm = false;
mbMsWordCompTrailingBlanks = false; mbMsWordCompTrailingBlanks = false;
mbSubtractFlys = false;
} }
// COMPATIBILITY FLAGS END // COMPATIBILITY FLAGS END
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment