From 1405c123157406e601adbea2c5f13e62c70f0ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 4 Dec 2013 13:10:16 +0000 Subject: [PATCH 039/109] Relater: rhbz#903281 NULL follow frames on drag/drop Change-Id: I50319fb218518edd23ff8c859c355265595050d6 (cherry picked from commit f141505929c95c97ae4765d7c7221f07e41ef8e7) Reviewed-on: https://gerrit.libreoffice.org/6926 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- sw/source/core/access/accmap.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 5435961..5b81a26 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -747,12 +747,18 @@ static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc, if( pAccImpl->GetFrm()->IsCellFrm() ) { const SwTabFrm *pTabFrm1 = pAccImpl->GetFrm()->FindTabFrm(); - while( pTabFrm1->GetFollow() ) - pTabFrm1 = pTabFrm1->GetFollow(); + if (pTabFrm1) + { + while (pTabFrm1->GetFollow()) + pTabFrm1 = pTabFrm1->GetFollow(); + } const SwTabFrm *pTabFrm2 = pFrm->FindTabFrm(); - while( pTabFrm2->GetFollow() ) - pTabFrm2 = pTabFrm2->GetFollow(); + if (pTabFrm2) + { + while (pTabFrm2->GetFollow()) + pTabFrm2 = pTabFrm2->GetFollow(); + } bRet = (pTabFrm1 == pTabFrm2); } -- 1.8.4.2