Skip to content

C
core
Kaydet (Commit) 98357752 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: rhbz#1033108 how did pAnchoredObj end up as NULL 

Change-Id: If7d442567d9cea4e3f4d3d68689d11fad0dc930b
üst 5620f5ba
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
sw/source/core/text/txtfly.cxx
Dosyayı görüntüle @ 98357752
...@@ -923,7 +923,9 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() ...@@ -923,7 +923,9 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
// the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()> // the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()>
// #i20505# Do not consider oversized objects // #i20505# Do not consider oversized objects
SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ]; SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ];
if ( !pIDDMA->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) || assert(pAnchoredObj);
if ( !pAnchoredObj ||
!pIDDMA->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) ||
!pAnchoredObj->ConsiderForTextWrap() || !pAnchoredObj->ConsiderForTextWrap() ||
( mbIgnoreObjsInHeaderFooter && !bFooterHeader && ( mbIgnoreObjsInHeaderFooter && !bFooterHeader &&
pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() ) ) pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment