diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-04 11:37:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-04 12:12:12 +0100 |
| commit | 334601603aa04ea968e8a850f4e7f6cf52f7735b (patch) | |
| tree | 6dc0bc02b83b4b618b059391b99c31b83d1c2b2e /sw/source/core/edit | |
| parent | 1bf8c74c0d0a78086b0688070bd375567344bb35 (diff) | |
sw: move some globals in fetab.cxx into SwFEShell
It looks like the main point of these being globals is so that they can
be cleared from various places when tables or table frames are destroyed.
Add a SwDoc parameter to ClearFEShellTabCols() and just iterate
over all shells.
Change-Id: I75ad6b695ee1bfa76b9a05c606b07a3574c70ac4
Diffstat (limited to 'sw/source/core/edit')
| -rw-r--r-- | sw/source/core/edit/edtab.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 83f91423c1e0..57440eec3bc9 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -436,7 +436,7 @@ bool SwEditShell::SplitTable( SplitTable_HeadlineOption eMode ) bRet = GetDoc()->SplitTable( *pCursor->GetPoint(), eMode, true ); GetDoc()->GetIDocumentUndoRedo().EndUndo(SwUndoId::EMPTY, nullptr); - ClearFEShellTabCols(); + ClearFEShellTabCols(*GetDoc(), nullptr); EndAllAction(); } return bRet; @@ -454,7 +454,7 @@ bool SwEditShell::MergeTable( bool bWithPrev ) bRet = GetDoc()->MergeTable( *pCursor->GetPoint(), bWithPrev ); GetDoc()->GetIDocumentUndoRedo().EndUndo(SwUndoId::EMPTY, nullptr); - ClearFEShellTabCols(); + ClearFEShellTabCols(*GetDoc(), nullptr); EndAllAction(); } return bRet; |