tdf#127409 Use document-specific value for "Print empty pages"

The check whether or not to print empty pages introduced by
commit cc46e7b9c7
("tdf#116537: use page #s excluding empty pages when they
are ignored") used the config option, while the option
actually being used during mail merge can be overriden by
the document settings, s. commit
8385e511aa
("tdf#117664: mailmerge: copy printer settings to new mailmerge
document").

Change-Id: I3ccc97e260e3bb9e08aa74a305bfda30656a322f
Reviewed-on: https://gerrit.libreoffice.org/78713
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2019-09-06 15:41:45 +02:00
parent e4cea049c8
commit 7d7f024f23

View File

@@ -22,6 +22,7 @@
#include <mmconfigitem.hxx>
#include <mailconfigpage.hxx>
#include "mmgreetingspage.hxx"
#include <printdata.hxx>
#include <swmessdialog.hxx>
#include <cmdid.h>
#include <swtypes.hxx>
@@ -750,7 +751,8 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl, weld::Button&, void)
// If we skip autoinserted blanks, then the page numbers used in the print range string
// refer to the non-blank pages as they appear in the document (see tdf#89708).
const bool bIgnoreEmptyPages = !officecfg::Office::Writer::Print::EmptyPages::get();
const bool bIgnoreEmptyPages =
!pTargetView->GetDocShell()->GetDoc()->getIDocumentDeviceAccess().getPrintData().IsPrintEmptyPages();
const int nStartPage = documentStartPageNumber(xConfigItem.get(), nBegin, bIgnoreEmptyPages);
const int nEndPage = documentEndPageNumber(xConfigItem.get(), nEnd - 1, bIgnoreEmptyPages);