diff options
| -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 |