|
 |
f0633d |
From fcd101173cd3436f17a57dbe116f2ed35219a1e5 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f0633d |
Date: Wed, 11 Dec 2013 11:57:34 +0000
|
|
|
f0633d |
Subject: [PATCH 064/109] disposed but not dtored
|
|
|
f0633d |
|
|
|
f0633d |
just die when you are supposed to, without this endless amounts of accessiblity
|
|
|
f0633d |
cells remain after sorting slides with tables in them
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit 1c28065d8fe3e9a1394a7ecfc29e95a9639a1012)
|
|
|
f0633d |
|
|
|
f0633d |
Conflicts:
|
|
|
f0633d |
svx/source/table/accessibletableshape.cxx
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ice9a86b8b806e58f9bf871341a38f7729798dda9
|
|
|
f0633d |
(cherry picked from commit a90e08cb15e712e1d15a16de9a2677e57d81fd13)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7052
|
|
|
f0633d |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
---
|
|
|
f0633d |
svx/source/table/accessibletableshape.cxx | 6 ++++++
|
|
|
f0633d |
1 file changed, 6 insertions(+)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
|
|
|
f0633d |
index a5e910e..8872591 100644
|
|
|
f0633d |
--- a/svx/source/table/accessibletableshape.cxx
|
|
|
f0633d |
+++ b/svx/source/table/accessibletableshape.cxx
|
|
|
f0633d |
@@ -113,6 +113,12 @@ void AccessibleTableShapeImpl::dispose()
|
|
|
f0633d |
{
|
|
|
f0633d |
if( mxTable.is() )
|
|
|
f0633d |
{
|
|
|
f0633d |
+ //remove all the cell's acc object in table's dispose.
|
|
|
f0633d |
+ for( AccessibleCellMap::iterator iter( maChildMap.begin() ); iter != maChildMap.end(); iter++ )
|
|
|
f0633d |
+ {
|
|
|
f0633d |
+ (*iter).second->dispose();
|
|
|
f0633d |
+ }
|
|
|
f0633d |
+ maChildMap.clear();
|
|
|
f0633d |
Reference< XModifyListener > xListener( this );
|
|
|
f0633d |
mxTable->removeModifyListener( xListener );
|
|
|
f0633d |
mxTable.clear();
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|