sw/source/core/undo/untbl.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 2b27404184688cc5bdfd68ed15da5159950a318d
Author: Caolán McNamara <[email protected]>
Date: Mon Aug 26 14:32:41 2013 +0100
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 <[email protected]>
Tested-by: Michael Stahl <[email protected]>
(cherry picked from commit 34f09dadd99a15aaad7fc8b982e01d6ec764c74c)
Signed-off-by: Michael Stahl <[email protected]>
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a3793d2..4ed6fa7 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; )
{
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
