diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-11 16:03:25 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-11 16:21:59 +0100 |
| commit | d5c93cccaebf92b7f99e174552a7c84a5c652690 (patch) | |
| tree | a36b9396b7e597827017d3bbe0ee4778eaad1ba8 | |
| parent | 138d29aa09417eba4d15ade4c9f4dab2620b6326 (diff) | |
SwDBManager::MergeMailFiles: merge two bCreateSingleFile blocks
Change-Id: Ia4290a8bfafc88c8e8e7601d62781c0da250824e
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index b01e2b29369f..85f7fa854b76 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1141,9 +1141,6 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, rWorkShell.SwViewShell::UpdateFlds(); SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh)); - if( bCreateSingleFile ) - pWorkDoc->RemoveInvisibleContent(); - // launch MailMergeEvent if required const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); if(pEvtSrc) @@ -1155,6 +1152,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if(bCreateSingleFile) { + pWorkDoc->RemoveInvisibleContent(); + OSL_ENSURE( pTargetShell, "no target shell available!" ); // copy created file into the target document rWorkShell.ConvertFieldsToText(); |