diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 15:19:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 20:08:19 +0000 |
| commit | 757871e78130511f7578350fb50e0de089d32788 (patch) | |
| tree | e8d51f19fb90bbddf5270ca41811e6c7f60237d5 /sc/source/ui | |
| parent | fb2bc8d9aa6e265c0be8f70a759be4c37e27228d (diff) | |
coverity#704719 Dereference after null check
Change-Id: I99855ab0a79ea653177fba85089253b01b73b8c8
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e41a07c83212..d05aaa063b70 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -378,9 +378,9 @@ static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) return (aCell.meType == CELLTYPE_FORMULA && aCell.mpFormula->GetMatrixOrigin(aPos) && aPos == rRange.aStart); } -static void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, const Point& rPos, ScViewData* pViewData ) +static void lcl_UnLockComment( ScDrawView* pView, const Point& rPos, ScViewData* pViewData ) { - if (!pView && !pPV && !pDrDoc && !pViewData) + if (!pView || !pViewData) return; ScDocument& rDoc = *pViewData->GetDocument(); @@ -3216,7 +3216,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, pDrawView->UnmarkAllObj(); // Unlock the Internal Layer in order to activate the context menu. // re-lock in ScDrawView::MarkListHasChanged() - lcl_UnLockComment( pDrawView, pDrawView->GetSdrPageView(), pDrawView->GetModel(), aLogicPos ,pViewData); + lcl_UnLockComment( pDrawView, aLogicPos ,pViewData); bHitDraw = pDrawView->MarkObj( aLogicPos ); // draw shell is activated in MarkListHasChanged } |