[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source

[Michael Weghorn (via logerrit)]

 sw/source/uibase/dbui/dbmgr.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ac31e4443056bd09761cb9d57a87f0131adb4a84
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Sep 25 10:56:55 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Nov 5 16:11:49 2019 +0100

    tdf#114099 mail merge: Copy JobSetup to working doc
    
    This is needed for the print dialog to take the
    document-specific printer settings into account when
    using 'SwMailMergeDlg', where the print dialog is
    initialized based on the merged document.
    
    Change-Id: I1a1659d49b3b1267ea2a36a81a865837eb105905
    Reviewed-on: https://gerrit.libreoffice.org/79515
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit f4fd98fc9f1b38071a806e52c17d26725c6a33c5)
    Reviewed-on: https://gerrit.libreoffice.org/82066
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 59dae0bb3ac1..23304b977c54 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1068,6 +1068,9 @@ static SfxObjectShell* lcl_CreateWorkingDocument(
     // import print settings
     const SwPrintData &rPrintData = pSourceDoc->getIDocumentDeviceAccess().getPrintData();
     pWorkDoc->getIDocumentDeviceAccess().setPrintData(rPrintData);
+    const JobSetup *pJobSetup = pSourceDoc->getIDocumentDeviceAccess().getJobsetup();
+    if (pJobSetup)
+        pWorkDoc->getIDocumentDeviceAccess().setJobsetup(*pJobSetup);
 
     if( aType == WorkingDocType::TARGET )
     {