diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-11 20:37:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-11 21:06:01 +0100 |
| commit | c47f9cc18769d253dc2d060011806195d247c288 (patch) | |
| tree | 83b430c10d07f67ad1cc15a37ea502cc0dfa604c /sd | |
| parent | 00c6053bd337eee26453fb783a90346a41cb0f27 (diff) | |
coverity#705853 Dereference before null check
Change-Id: I0ef6645725699004d3ec93737135fe18640b1079
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e2f782ad8fdb..477ea485179c 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -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 |