sw/source/uibase/dbui/dbmgr.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2dc493b2ad57573d60b66a633b6fcccdbe0a3678
Author: Juergen Funk <juergen.funk...@cib.de>
Date: Thu Sep 3 15:18:58 2015 +0200
tdf#93246: pass on cancel state in mail merge dialog
The return result was not used for the CUPS case before, leading to
un-cancelled printing / document generation in the file->print
mail merge case.
Change-Id: I470293755c6696fca6d1b97fa1dac7854b4f7107
Reviewed-on: https://gerrit.libreoffice.org/18302
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/18329
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f116153..69c027c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1244,12 +1244,13 @@ bool SwDBManager::MergeMailFiles(SwWrtShell*
pSourceShell,
pWorkView->StartPrint( aOptions,
IsMergeSilent(), rMergeDescriptor.bPrintAsync );
SfxPrinter* pDocPrt =
pWorkView->GetPrinter(false);
JobSetup aJobSetup = pDocPrt ?
pDocPrt->GetJobSetup() : SfxViewShell::GetJobSetup();
- Printer::PreparePrintJob(
pWorkView->GetPrinterController(), aJobSetup );
+ bCancel = !Printer::PreparePrintJob(
pWorkView->GetPrinterController(), aJobSetup );
#if ENABLE_CUPS && !defined(MACOSX)
-
psp::PrinterInfoManager::get().startBatchPrint();
+ if( !bCancel )
+
psp::PrinterInfoManager::get().startBatchPrint();
#endif
}
- if( !Printer::ExecutePrintJob(
pWorkView->GetPrinterController()))
+ if( !bCancel && !Printer::ExecutePrintJob(
pWorkView->GetPrinterController()))
bCancel = true;
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
