Skip to content

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

OSL_ENSURE->assert when followed by unconditional dereference 

Change-Id: Id3072473c1a4f52f606dbcfc87aa4a69ab2c012d
üst 0a6a151c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sw/source/core/doc/docfly.cxx
Dosyayı görüntüle @ 0dec8ad8
...@@ -910,10 +910,10 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, ...@@ -910,10 +910,10 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// the attribute. // the attribute.
const sal_Int32 nIndx( xOldAsCharAnchorPos->nContent.GetIndex() ); const sal_Int32 nIndx( xOldAsCharAnchorPos->nContent.GetIndex() );
SwTxtNode* pTxtNode( xOldAsCharAnchorPos->nNode.GetNode().GetTxtNode() ); SwTxtNode* pTxtNode( xOldAsCharAnchorPos->nNode.GetNode().GetTxtNode() );
OSL_ENSURE( pTxtNode, "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object" ); assert(pTxtNode && "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object");
OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
SwTxtAttr * const pHnt = SwTxtAttr * const pHnt =
pTxtNode->GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT ); pTxtNode->GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
assert(pHnt && "Missing FlyInCnt-Hint.");
const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt(); const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
// They are disconnected. We now have to destroy the attribute. // They are disconnected. We now have to destroy the attribute.
......
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