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

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/DocumentSettingManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0db7e46536fc23d5201ed9ff610a8ae0efd09a96
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Oct 7 20:03:41 2021 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Oct 8 08:08:40 2021 +0200

    sw: handle mbIsLabelDoc when replacing compat options
    
    This describes if the document contains labels for printing, surely we
    want to keep that when copying the contents of the document to an empty
    document. (Mail merge scenario.)
    
    With this, finally
    sw::DocumentSettingManager::ReplaceCompatibilityOptions() replaces all
    options where it makes sense to do so.
    
    Change-Id: Ic0be340578e9a01fac7e8c08fe2e6b6ffbb30039
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123230
    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 47c7d2837ddb..883ab4736e73 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -624,7 +624,7 @@ void 
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     // for non-SwWebDocShells.
     // No mbIsGlobalDoc: this is true for SwGlobalDocShells.
     mbGlblDocSaveLinks = rSource.mbGlblDocSaveLinks;
-    // No mbIsLabelDoc
+    mbIsLabelDoc = rSource.mbIsLabelDoc;
     mbPurgeOLE = rSource.mbPurgeOLE;
     mbKernAsianPunctuation = rSource.mbKernAsianPunctuation;
     mbParaSpaceMax = rSource.mbParaSpaceMax;