Kaydet (Commit) 8f60697c authored tarafından Caolán McNamara's avatar Caolán McNamara

fix indent

Change-Id: I3dd04cd9d8e33d24c42e55b24c4f5e265e6265c2
üst af8f9385
...@@ -1185,25 +1185,25 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1185,25 +1185,25 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
// copy the source document // copy the source document
xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( true ); xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( true );
//create a view frame for the document //create a view frame for the document
pWorkView = static_cast< SwView* >( SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )->GetViewShell() ); pWorkView = static_cast< SwView* >( SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )->GetViewShell() );
//request the layout calculation //request the layout calculation
SwWrtShell& rWorkShell = pWorkView->GetWrtShell(); SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
pWorkView->AttrChangedNotify( &rWorkShell );// in order for SelectShell to be called pWorkView->AttrChangedNotify( &rWorkShell );// in order for SelectShell to be called
pWorkDoc = rWorkShell.GetDoc(); pWorkDoc = rWorkShell.GetDoc();
pWorkDoc->ReplaceDocumentProperties( *pSourceDocSh->GetDoc()); pWorkDoc->ReplaceDocumentProperties( *pSourceDocSh->GetDoc());
if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) ) if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) )
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo ); lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
pOldDBManager = pWorkDoc->GetDBManager(); pOldDBManager = pWorkDoc->GetDBManager();
pWorkDoc->SetDBManager( this ); pWorkDoc->SetDBManager( this );
pWorkDoc->getIDocumentLinksAdministration().EmbedAllLinks(); pWorkDoc->getIDocumentLinksAdministration().EmbedAllLinks();
// #i69458# lock fields to prevent access to the result set while calculating layout // #i69458# lock fields to prevent access to the result set while calculating layout
rWorkShell.LockExpFields(); rWorkShell.LockExpFields();
rWorkShell.CalcLayout(); rWorkShell.CalcLayout();
rWorkShell.UnlockExpFields(); rWorkShell.UnlockExpFields();
} }
SwWrtShell& rWorkShell = pWorkView->GetWrtShell(); SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh)); SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
......
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