diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 13:42:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 14:24:21 +0000 |
| commit | ba9c2376f14c2c07f4449bcf6d1345e9d82c343d (patch) | |
| tree | 4314c03d1315588a209dbc716035832a9b4438bb | |
| parent | 2d66de44ea456e5525ee5515c4bef1421a26c0b9 (diff) | |
OSL_ENSURE->assert when followed by unconditional deref
Change-Id: If2130dbbb7b4afd3d88553da449163f60cdc0c1e
| -rw-r--r-- | sw/source/core/draw/dview.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index e0a75d25cc51..77355c3ec781 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -346,8 +346,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, std::list<SwAnchoredObject*> aAnchoredObjs; { const SwContact* pContact = ::GetUserCall( _rMovedAnchoredObj.GetDrawObj() ); - OSL_ENSURE( pContact, - "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash." ); + assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash."); pContact->GetAnchoredObjs( aAnchoredObjs ); } @@ -389,8 +388,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, SdrObject* pChildObj = (*aObjIter); { const SwContact* pContact = ::GetUserCall( pChildObj ); - OSL_ENSURE( pContact, - "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash." ); + assert(pContact && "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash."); pContact->GetAnchoredObjs( aAnchoredObjs ); } // move 'repeated' ones to the same order number as the already moved one. |