[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/text/txtfly.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9835775259a92976e05451eef63a44b41126418d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 21 15:43:53 2013 +0000

    Related: rhbz#1033108 how did pAnchoredObj end up as NULL
    
    Change-Id: If7d442567d9cea4e3f4d3d68689d11fad0dc930b

diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 1e66412..7f577bd 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() ) )