diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-30 13:52:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-01 12:58:26 +0000 |
| commit | 520eb9a251e557ffbebfc79deb5ee0cb55600d9e (patch) | |
| tree | 6ae9cfe36949ea631a6fe76cc3d9eab0ab59d016 /sw | |
| parent | bda5fdb90bb31542c203124e1addcbb48e41f186 (diff) | |
Resolves: rhbz#657718# Crash in SwObjectFormatterTxtFrm::CreateObjFormatter
(cherry picked from commit 7f75773f59f4e755c8e18b8f604d3ac56d94914e)
Notes
split repo tag: writer_LIBREOFFICE_3_3_0_1
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.cxx | 2 |
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(); } |