diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-01-27 11:51:29 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-03-24 22:40:54 +0100 |
| commit | 2a6cd03fab17e503c9f98e6f4f2e35c43a383f5f (patch) | |
| tree | 717b2062ecc8dc168a84a53e0b371b322a8273f2 /sw | |
| parent | 83d747d59ab0785f654f007d7fb6638fa792e976 (diff) | |
MM: just show the print progress dialog for print
Change-Id: I75a33c14f4a2b5ab404ce937e5d23392f6021a1b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index f41ed2149469..36b6d3caac3c 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1167,9 +1167,9 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, { // construct the process dialog pSourceWindow = &pSourceShell->GetView().GetEditWin(); - if( ! pParent ) + if( !pParent ) pParent = pSourceWindow; - if( bMT_SHELL ) + if( !bMT_PRINTER ) pProgressDlg = VclPtr<CreateMonitor>::Create( pParent, pParent != pSourceWindow ); else { @@ -1226,7 +1226,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, // it can be manually computed from the source documents (for which we do layouts, so the page // count is known, and there is a blank page between each of them in the target document). int targetDocPageCount = 0; - if( !bIsMergeSilent && bMT_SHELL && + if( !bIsMergeSilent && !bMT_PRINTER && lcl_getCountFromResultSet( nDocCount, pImpl->pMergeData->xResultSet ) ) static_cast<CreateMonitor*>( pProgressDlg.get() )->SetTotalCount( nDocCount ); @@ -1292,7 +1292,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if( bNeedsTempFiles ) aTempFileURL.reset( new INetURLObject(aTempFile->GetURL())); if( !bIsMergeSilent ) { - if( bMT_SHELL ) + if( !bMT_PRINTER ) static_cast<CreateMonitor*>( pProgressDlg.get() )->SetCurrentPosition( nDocNo ); else { PrintMonitor *pPrintMonDlg = static_cast<PrintMonitor*>( pProgressDlg.get() ); |