[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Caolán McNamara]

 sw/source/core/access/accmap.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 2bb2c1ee976aacf7d07e00e123c34c58d3c2bd5e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 4 13:10:16 2013 +0000

    Relater: rhbz#903281 NULL follow frames on drag/drop
    
    Change-Id: I50319fb218518edd23ff8c859c355265595050d6
    (cherry picked from commit f141505929c95c97ae4765d7c7221f07e41ef8e7)

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b8a2ce5..8829214 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);
         }