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

coverity#705853 Dereference before null check

Change-Id: I0ef6645725699004d3ec93737135fe18640b1079
üst 00c6053b
......@@ -694,7 +694,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
case SDRUSERCALL_MOVEONLY:
case SDRUSERCALL_RESIZE:
{
if( pModel->isLocked() )
if (!pModel || pModel->isLocked())
break;
SdrObject* pObj = (SdrObject*) &rObj;
......@@ -705,7 +705,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
{
if( pObj->GetUserCall() )
{
::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
::svl::IUndoManager* pUndoManager = static_cast<SdDrawDocument*>(pModel)->GetUndoManager();
const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
if( bUndo )
......@@ -715,7 +715,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
pObj->SetUserCall(0);
}
}
else if (pModel)
else
{
// Object of the master page changed, therefore adjust
// object on all pages
......
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