summaryrefslogtreecommitdiff
path: root/sw/source/core/layout
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-14 09:42:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-14 10:59:43 +0100
commit2a8559769ed807eb6384d1ea9ceb275d60924337 (patch)
tree6a4e8d73113985d883b189f1ed68415d5afe38fa /sw/source/core/layout
parent0aca6eb71c148f1c3a72df9c2f6da6d4364106b8 (diff)
coverity#1326206 Dereference after null check
Change-Id: I187c182a1645cdd38c81bc72b3c836ab21725173
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r--sw/source/core/layout/frmtool.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 1b5e10d7f6bf..bf38170751c8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -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." );