summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-04 13:10:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-04 13:12:49 +0000
commitf141505929c95c97ae4765d7c7221f07e41ef8e7 (patch)
tree93221207ac1f8a187f94b17ad2c71deb335d8221 /sw
parent0d9bd19c5b1740b41581faba9f78e7ea56143c83 (diff)
Relater: rhbz#903281 NULL follow frames on drag/drop
Change-Id: I50319fb218518edd23ff8c859c355265595050d6
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/access/accmap.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a79b2d6e2f71..ce9d912b5b2f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -815,12 +815,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);
}