diff options
Diffstat (limited to 'sw/source/uibase/dbui/dbmgr.cxx')
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 86e2d7e171ca..a9a6da81aaf8 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1589,14 +1589,15 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, lcl_PreparePrinterOptions( rMergeDescriptor.aPrintOptions, true, aOptions ); pTargetView->ExecPrint( aOptions, bIsMergeSilent, false/*bPrintAsync*/ ); } - - if( IsMergeOk() && bMT_SHELL ) - // leave docshell available for caller (e.g. MM wizard) - rMergeDescriptor.pMailMergeConfigItem->SetTargetView( pTargetView ); - else - xTargetDocShell->DoClose(); } + // we also show canceled documents, as long as there was no error + if( !IsMergeError() && bMT_SHELL ) + // leave docshell available for caller (e.g. MM wizard) + rMergeDescriptor.pMailMergeConfigItem->SetTargetView( pTargetView ); + else if( xTargetDocShell ) + xTargetDocShell->DoClose(); + rescheduleGui(); pProgressDlg.disposeAndClear(); |