Skip to content

C
core
Kaydet (Commit) d5c93ccc authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

SwDBManager::MergeMailFiles: merge two bCreateSingleFile blocks 

Change-Id: Ia4290a8bfafc88c8e8e7601d62781c0da250824e
üst 138d29aa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
sw/source/uibase/dbui/dbmgr.cxx
Dosyayı görüntüle @ d5c93ccc
...@@ -1141,9 +1141,6 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1141,9 +1141,6 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
rWorkShell.SwViewShell::UpdateFlds(); rWorkShell.SwViewShell::UpdateFlds();
SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh)); 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 // launch MailMergeEvent if required
const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc();
if(pEvtSrc) if(pEvtSrc)
...@@ -1155,6 +1152,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1155,6 +1152,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if(bCreateSingleFile) if(bCreateSingleFile)
{ {
pWorkDoc->RemoveInvisibleContent();
OSL_ENSURE( pTargetShell, "no target shell available!" ); OSL_ENSURE( pTargetShell, "no target shell available!" );
// copy created file into the target document // copy created file into the target document
rWorkShell.ConvertFieldsToText(); rWorkShell.ConvertFieldsToText();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment