diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2015-09-03 15:18:58 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-03 15:20:50 +0000 |
| commit | 88890c2a7522394f355a3f47a4dfb4608ac5a1cd (patch) | |
| tree | 6f18d4e48785c2102a32e25e302a52bca754d826 | |
| parent | 90ea1221856340860c406357e274000771b5b127 (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>
| -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 8f021cdc92c1..b0a4ae227b21 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1311,12 +1311,13 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, pWorkView->StartPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); SfxPrinter* pDocPrt = pWorkView->GetPrinter(); 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 |