summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/calcmove.cxx6
1 files changed, 3 insertions, 3 deletions
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;