diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-26 14:32:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-26 22:36:51 +0200 |
| commit | 2b27404184688cc5bdfd68ed15da5159950a318d (patch) | |
| tree | d771669ee77b36f13441fbca3cda4cdf1dc99e9e /sw | |
| parent | dbce1c855a9a8a61f1636b1e37bd83e176eb8e2a (diff) | |
Resolves: fdo#59048 crash on text-to-table undo
Delete the SwCellFrms attached to the layout of this SwTableNode early,
otherwise the SwCellFrms will dereference the SwTableNode after it is deleted
in _DeleteBox during the DelFrms of the DeleteSection in _DeleteBox when
invalidating following SwFrms.
SwUndoInsTbl::UndoImpl calls SwTableNode::DelFrms so presumably this is the
right way to go about it.
Change-Id: I6e088a30500d721bd18c57ced5c8ec331bb567eb
Reviewed-on: https://gerrit.libreoffice.org/5634
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 34f09dadd99a15aaad7fc8b982e01d6ec764c74c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index a3793d26a3d5..4ed6fa724a0e 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -734,6 +734,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext) if( pDelBoxes ) { + pTNd->DelFrms(); SwTable& rTbl = pTNd->GetTable(); for( sal_uInt16 n = pDelBoxes->size(); n; ) { |