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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 4ff91bb2065b6a603f2fb8692c81911f0cdd58a8
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Sep 23 20:00:35 2021 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Sep 24 08:44:08 2021 +0200

    sw: handle mbGlblDocSaveLinks when replacing compat options
    
    This controls if the content of linked sections is saved in a
    master/global text document.
    
    Change-Id: I104dfef9d16278f4cce7e6f7942c8f4b2bdd5134
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122541
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 6f215ede3412..47c7d2837ddb 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -620,9 +620,10 @@ void 
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     Setn32DummyCompatibilityOptions1( 
rSource.Getn32DummyCompatibilityOptions1() );
     Setn32DummyCompatibilityOptions2( 
rSource.Getn32DummyCompatibilityOptions2() );
 
-    // No mbHTMLMode
-    // No mbIsGlobalDoc
-    // No mbGlblDocSaveLinks
+    // No mbHTMLMode: this is the subset of mbLastBrowseMode, which can be 
temporarily enabled even
+    // for non-SwWebDocShells.
+    // No mbIsGlobalDoc: this is true for SwGlobalDocShells.
+    mbGlblDocSaveLinks = rSource.mbGlblDocSaveLinks;
     // No mbIsLabelDoc
     mbPurgeOLE = rSource.mbPurgeOLE;
     mbKernAsianPunctuation = rSource.mbKernAsianPunctuation;