diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-15 13:00:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-15 13:01:06 +0100 |
commit | 8f60697cf8e5227d503738e3c186433ac5dacfc8 (patch) | |
tree | 7e496fc770ceff9beb8bb03f57149df6eabac125 | |
parent | af8f938531909122ff7a056c2206af857324fdf3 (diff) |
fix indent
Change-Id: I3dd04cd9d8e33d24c42e55b24c4f5e265e6265c2
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 47fb01754026..2321dccdc567 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1185,25 +1185,25 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, // copy the source document xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( true ); - //create a view frame for the document - pWorkView = static_cast< SwView* >( SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )->GetViewShell() ); - //request the layout calculation - SwWrtShell& rWorkShell = pWorkView->GetWrtShell(); - pWorkView->AttrChangedNotify( &rWorkShell );// in order for SelectShell to be called - - pWorkDoc = rWorkShell.GetDoc(); - pWorkDoc->ReplaceDocumentProperties( *pSourceDocSh->GetDoc()); - if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) ) - lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo ); - pOldDBManager = pWorkDoc->GetDBManager(); - pWorkDoc->SetDBManager( this ); - pWorkDoc->getIDocumentLinksAdministration().EmbedAllLinks(); - - // #i69458# lock fields to prevent access to the result set while calculating layout - rWorkShell.LockExpFields(); - rWorkShell.CalcLayout(); - rWorkShell.UnlockExpFields(); - } + //create a view frame for the document + pWorkView = static_cast< SwView* >( SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )->GetViewShell() ); + //request the layout calculation + SwWrtShell& rWorkShell = pWorkView->GetWrtShell(); + pWorkView->AttrChangedNotify( &rWorkShell );// in order for SelectShell to be called + + pWorkDoc = rWorkShell.GetDoc(); + pWorkDoc->ReplaceDocumentProperties( *pSourceDocSh->GetDoc()); + if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) ) + lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo ); + pOldDBManager = pWorkDoc->GetDBManager(); + pWorkDoc->SetDBManager( this ); + pWorkDoc->getIDocumentLinksAdministration().EmbedAllLinks(); + + // #i69458# lock fields to prevent access to the result set while calculating layout + rWorkShell.LockExpFields(); + rWorkShell.CalcLayout(); + rWorkShell.UnlockExpFields(); + } SwWrtShell& rWorkShell = pWorkView->GetWrtShell(); SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh)); |