diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-12-04 13:10:16 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-04 13:13:47 +0000 |
commit | 2bb2c1ee976aacf7d07e00e123c34c58d3c2bd5e (patch) | |
tree | eb5dda04e4a8049e0092cf66a83760556cdf1e77 /sw | |
parent | d517ac379f0fa6ee77bdbb3940c6ffb840032c0b (diff) |
Relater: rhbz#903281 NULL follow frames on drag/drop
Change-Id: I50319fb218518edd23ff8c859c355265595050d6
(cherry picked from commit f141505929c95c97ae4765d7c7221f07e41ef8e7)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/access/accmap.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index b8a2ce56a8fa..882921420906 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -744,12 +744,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); } |