[ooo-build-commit] .: sw/source

[Caolán McNamara]

 sw/source/core/layout/trvlfrm.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c1415a360210c581064f5f4a22cc307767526459
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 16:31:33 2010 +0100

    #i95369# avoid crash related to input fields if pointers are wrongly NULL

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 380a6bf..7c7f17c 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2061,9 +2061,11 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
     if ( pStartFrm->IsInFly() )
     {
         const SwAnchoredObject* pObj = pStartFrm->FindFlyFrm();
-        aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj)) );
+        ASSERT( pObj, "No Start Object." );
+        if (pObj) aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj)) );
         const SwAnchoredObject* pObj2 = pEndFrm->FindFlyFrm();
-        aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj2)) );
+        ASSERT( pObj2, "No Start Object." );
+        if (pObj2) aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj2)) );
     }
 
     //Fall 4: Tabellenselection