diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-30 13:17:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-30 13:34:23 +0000 |
| commit | 1876d9a807ee0b3480ab108273930897cc697d88 (patch) | |
| tree | d1f72c370b68bf921696bdd8949a08f3ed6261f7 /sw | |
| parent | 87584ed0f292e79669a74d2040d668f11fdc2c2b (diff) | |
coverity#1346891 Unused value
Change-Id: Id46a93a8dd1baadf062ea4e5aa471d42aa04468d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 3074fde75728..6fcd7b5634b5 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1048,7 +1048,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if( createTempFile && ( 1 == nDocNo || !bCreateSingleFile )) bNoError = CreateNewTemp(sPath, sAddress, aTempFile, rMergeDescriptor, pStoreToFilter); - if( !bCancel ) + if (!bCancel && bNoError) { std::unique_ptr< INetURLObject > aTempFileURL; if( createTempFile ) @@ -1226,7 +1226,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, FreezeLayouts(pTargetShell, true); bFreezedLayouts = true; } - } while( !bCancel && + } while( !bCancel && bNoError && (bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord())); FinishMailMergeFile(xWorkDocSh, pWorkView, pTargetDoc, pTargetShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER, @@ -1235,10 +1235,12 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, pProgressDlg.disposeAndClear(); // save the single output document - bNoError = SavePrintDoc(xTargetDocShell, pTargetView, rMergeDescriptor, aTempFile, - pStoreToFilter, pStoreToFilterOptions, - bMergeShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER); - + if (bNoError) + { + bNoError = SavePrintDoc(xTargetDocShell, pTargetView, rMergeDescriptor, aTempFile, + pStoreToFilter, pStoreToFilterOptions, + bMergeShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER); + } //remove the temporary files RemoveTmpFiles(aFilesToRemove); |