diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-12-18 21:52:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-18 23:09:11 +0100 |
| commit | 296e8b597c141b6b54cbf943871d6a6820c1779d (patch) | |
| tree | ad242bdf286ac6210a2663fda4944ed222a97f7e | |
| parent | 59c92736ab064c0bba628e680a5c444f9f1dcc1b (diff) | |
fdo#87199: sw: fix root cause of a11y crash when merging cells
Commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f is not quite right
because it will leave the mpNext chain unreachable; that could perhaps
be imporoved by calling RemoveFromLayout(), but...
Actually the problem is basically that one of the deleted SwCellFrms
points to a SwTableBox with getRowSpan() -1 (because it has been merged)
and thus IsInCoveredCell() returns true and that causes ~SwCellFrm() to
skip disposing the SwAccessible stuff, so the SwCellFrm is still
contained in the SwAccessibleMap.
Because it's rather hard to prevent this sort of thing in general,
better change SwAccessibleMap::Dispose() to assume that if it found its
way into the SwAccessibleMap it should be disposed and removed.
Change-Id: Ib4cec6924cb026ae30bdac6857957adf237b4d70
| -rw-r--r-- | sw/source/core/access/accmap.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index b3f2c54136f2..2d3cf8337cfd 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2263,7 +2263,9 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(), "non accessible frame should be disposed" ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) + if (aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) + // fdo#87199 dispose the darn thing if it ever was accessible + || (pFrm && mpFrmMap && mpFrmMap->find(pFrm) != mpFrmMap->end())) { ::rtl::Reference< SwAccessibleContext > xAccImpl; ::rtl::Reference< SwAccessibleContext > xParentAccImpl; diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index a4a90c004693..10ca392e10bf 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -367,12 +367,6 @@ void SwFrm::Destroy() delete mpDrawObjs; mpDrawObjs = 0; } - - SwLayoutFrm *pFrm = GetUpper(); - if (pFrm && pFrm->m_pLower == this) - { - pFrm->m_pLower = nullptr; - } } SwFrm::~SwFrm() |