summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-11-30 13:52:10 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-11-30 13:52:10 +0000
commit276c2a21860c78ff370b2b6c2212dc46ec3d9080 (patch)
tree5d78b882ed493d357b347334134c966f7f6f0f34 /sw/source
parent2a1b62dd9325b51925396741425d9b5f51af9c5f (diff)
Resolves: rhbz#657718# Crash in SwObjectFormatterTxtFrm::CreateObjFormatter
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index ea61fb6b2b58..b71529f97739 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -103,7 +103,7 @@ SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter(
if ( _rAnchorTxtFrm.IsFollow() )
{
pMasterOfAnchorFrm = _rAnchorTxtFrm.FindMaster();
- while ( pMasterOfAnchorFrm->IsFollow() )
+ while ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->IsFollow() )
{
pMasterOfAnchorFrm = pMasterOfAnchorFrm->FindMaster();
}