From a64094c6ffe399655272daf7f9fcd57027252900 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laverdiere <marc-andre@atc.tcs.com>
Date: Mon, 25 Jul 2011 14:07:58 +0530
Subject: Fixed invalid pointer dereference

---
 sw/source/core/layout/calcmove.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sw')

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b0c0d7e383d4..bb9047c00a96 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -313,9 +313,9 @@ void SwFrm::PrepareMake()
         else if ( bCnt && sal_True == (bFoll = pThis->IsFollow()) &&
              GetPrev() )
         {
-            //Wenn der Master gereade ein CalcFollow ruft braucht die Kette
-            //nicht durchlaufen werden. Das spart Zeit und vermeidet Probleme.
-            if ( ((SwTxtFrm*)((SwTxtFrm*)this)->FindMaster())->IsLocked() )
+            //Do not follow the chain when we need only one instance
+            const SwTxtFrm* pMaster = ((SwCntntFrm*)this)->FindMaster();
+            if ( pMaster && pMaster->IsLocked() )
             {
                 MakeAll();
                 return;
-- 
cgit