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