Kaydet (Commit) 2a855976 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1326206 Dereference after null check

Change-Id: I187c182a1645cdd38c81bc72b3c836ab21725173
üst 0aca6eb7
......@@ -3098,19 +3098,19 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos )
return pFrm;
}
bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
bool Is_Lower_Of(const SwFrm *pCurrFrm, const SdrObject* pObj)
{
Point aPos;
const SwFrm* pFrm;
if( dynamic_cast<const SwVirtFlyDrawObj*>( pObj) != nullptr )
if (const SwVirtFlyDrawObj *pFlyDrawObj = dynamic_cast<const SwVirtFlyDrawObj*>(pObj))
{
const SwFlyFrm* pFly = static_cast<const SwVirtFlyDrawObj*>(pObj )->GetFlyFrm();
const SwFlyFrm* pFly = pFlyDrawObj->GetFlyFrm();
pFrm = pFly->GetAnchorFrm();
aPos = pFly->Frm().Pos();
}
else
{
pFrm = static_cast<SwDrawContact*>(GetUserCall(pObj) )->GetAnchorFrm(pObj);
pFrm = static_cast<SwDrawContact*>(GetUserCall(pObj))->GetAnchorFrm(pObj);
aPos = pObj->GetCurrentBoundRect().TopLeft();
}
OSL_ENSURE( pFrm, "8-( Fly is lost in Space." );
......
......@@ -665,10 +665,9 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
// #i26945#
const SdrObject* pNew = _pAnchoredObj->GetDrawObj();
// #102344# Ignore connectors which have one or more connections
if(pNew && dynamic_cast< const SdrEdgeObj *>( pNew ) != nullptr)
if (const SdrEdgeObj* pEdgeObj = dynamic_cast<const SdrEdgeObj*>(pNew))
{
if(static_cast<const SdrEdgeObj*>(pNew)->GetConnectedNode(true)
|| static_cast<const SdrEdgeObj*>(pNew)->GetConnectedNode(false))
if (pEdgeObj->GetConnectedNode(true) || pEdgeObj->GetConnectedNode(false))
{
return false;
}
......
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