diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2015-09-03 15:18:58 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-09-04 08:48:41 +0000 |
| commit | 2dc493b2ad57573d60b66a633b6fcccdbe0a3678 (patch) | |
| tree | 570dc5a29e91d8ade807840272b8f455fc6ae316 | |
| parent | 3dee927094efd8ee62274d703a8cb27c5b46f55c (diff) | |
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.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/18329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index f1161537206e..69c027c348a6 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 |