summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-11 11:57:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-11 13:01:30 +0000
commita90e08cb15e712e1d15a16de9a2677e57d81fd13 (patch)
treeece83f3d19a8d0363705ab7ccb71e95f043cb306
parent3d742188d402b294af9a06ba15bc16d19966bd6f (diff)
disposed but not dtored
just die when you are supposed to, without this endless amounts of accessiblity cells remain after sorting slides with tables in them (cherry picked from commit 1c28065d8fe3e9a1394a7ecfc29e95a9639a1012) Conflicts: svx/source/table/accessibletableshape.cxx Change-Id: Ice9a86b8b806e58f9bf871341a38f7729798dda9
-rw-r--r--svx/source/table/accessibletableshape.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index a5e910e4e692..887259127de2 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -113,6 +113,12 @@ void AccessibleTableShapeImpl::dispose()
{
if( mxTable.is() )
{
+ //remove all the cell's acc object in table's dispose.
+ for( AccessibleCellMap::iterator iter( maChildMap.begin() ); iter != maChildMap.end(); iter++ )
+ {
+ (*iter).second->dispose();
+ }
+ maChildMap.clear();
Reference< XModifyListener > xListener( this );
mxTable->removeModifyListener( xListener );
mxTable.clear();