diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-01-06 10:05:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-18 09:13:56 +0100 |
| commit | 72b292106d5d66b794f98a85e1fe0c970302c913 (patch) | |
| tree | 8211330c0879874e8d570687913bd5f92ab67a5a /sw/source | |
| parent | 94779d7b72037a02e163e88c0832e23cad92ebee (diff) | |
This assert is useless.
Change-Id: I2a76f449d4fb3452583407dc3cbb73f10a3d1705
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 06f9b1f25ebb..33d55525d1dc 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1095,7 +1095,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, UpdateExpFields(rWorkShell, xWorkDocSh); - if(bCreateSingleFile) + if (bCreateSingleFile) { MergeSingleFiles(pWorkDoc, rWorkShell, pTargetShell, pTargetDoc, xWorkDocSh, xTargetDocShell, bPageStylesWithHeaderFooter, bSynchronizedDoc, sModifiedStartingPageDesc, @@ -1105,7 +1105,6 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } else if( rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER ) { - assert(!bCreateSingleFile); if( 1 == nDocNo ) // set up printing only once at the beginning { // printing should be done synchronously otherwise the document |