summaryrefslogtreecommitdiff
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
commit7f75773f59f4e755c8e18b8f604d3ac56d94914e (patch)
treeee392814219e44b77b033591c5ac3cc1c98dd618
parentb7f27c7847827069d1a0280b35ddcac2e335c2c6 (diff)
Resolves: rhbz#657718# Crash in SwObjectFormatterTxtFrm::CreateObjFormatter
-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 472db36318..db63431767 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();
}