diff options
Diffstat (limited to 'sw/source/core/table/swtable.cxx')
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 5ea5db313b26..5784ada575c9 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1724,10 +1724,9 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableL rSrtArr.insert( p ); // insert } -SwTableBox::~SwTableBox() +void SwTableBox::RemoveFromTable() { - // box containing contents? - if( !GetFrmFmt()->GetDoc()->IsInDtor() && pSttNd ) + if (pSttNd) // box containing contents? { // remove from table const SwTableNode* pTblNd = pSttNd->FindTableNode(); @@ -1736,6 +1735,15 @@ SwTableBox::~SwTableBox() GetTabSortBoxes(); SwTableBox *p = this; // error: &this rSrtArr.erase( p ); // remove + pSttNd = 0; // clear it so this is only run once + } +} + +SwTableBox::~SwTableBox() +{ + if (!GetFrmFmt()->GetDoc()->IsInDtor()) + { + RemoveFromTable(); } // the TabelleBox can be deleted if it's the last client of the FrameFormat |