[Libreoffice-commits] core.git: sw/source

[Vitaliy Anderson]

 sw/source/core/doc/DocumentSettingManager.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6eecd89ee0798925be69fcf23e8daa3bc643458d
Author: Vitaliy Anderson <vanderson at smartru.com>
Date:   Mon Aug 21 21:41:19 2017 +0000

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

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