diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 15:43:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 15:43:53 +0000 |
| commit | 9835775259a92976e05451eef63a44b41126418d (patch) | |
| tree | 7cbd6ddbb694d98e41ea609e17209dd031183847 /sw | |
| parent | 5620f5ba2fa123f029ac449f69a89ffc5703c71e (diff) | |
Related: rhbz#1033108 how did pAnchoredObj end up as NULL
Change-Id: If7d442567d9cea4e3f4d3d68689d11fad0dc930b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/txtfly.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 1e6641275c59..7f577bdb31cc 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -923,7 +923,9 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() // the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()> // #i20505# Do not consider oversized objects SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ]; - if ( !pIDDMA->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) || + assert(pAnchoredObj); + if ( !pAnchoredObj || + !pIDDMA->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) || !pAnchoredObj->ConsiderForTextWrap() || ( mbIgnoreObjsInHeaderFooter && !bFooterHeader && pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() ) ) |