sw/source/ui/dbui/mmresultdialogs.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 7d7f024f23024374219a9485a9e1893a221a30fa Author: Michael Weghorn <[email protected]> AuthorDate: Fri Sep 6 15:41:45 2019 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Sep 8 09:17:35 2019 +0200 tdf#127409 Use document-specific value for "Print empty pages" The check whether or not to print empty pages introduced by commit cc46e7b9c75ddbcaaefde5f396ba76b0b866fa58 ("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 8385e511aa400e9bd99fd0ca1c5bd5d130277b8a ("tdf#117664: mailmerge: copy printer settings to new mailmerge document"). Change-Id: I3ccc97e260e3bb9e08aa74a305bfda30656a322f Reviewed-on: https://gerrit.libreoffice.org/78713 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index f107758feda0..18af8ebd1752 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -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); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
