diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-23 21:08:45 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-24 10:07:59 +0200 |
commit | 8f1a64bb0627dc82fce127a723d2e391bf9ddf0d (patch) | |
tree | 734cb489a995ed694c8228e8de6c9d32bb8ea3f3 /sc/source/ui/drawfunc/fusel.cxx | |
parent | 47c830d2ffc641aa0ae359a99ae38f17a1f1090e (diff) |
coverity#704702 Dereference after null check
Change-Id: I876ffc1511b2115562039b97961c28d7b30e2c06
Reviewed-on: https://gerrit.libreoffice.org/54730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/drawfunc/fusel.cxx')
-rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 3ca765679ddc..f5a710a20800 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -56,9 +56,9 @@ using namespace com::sun::star; -FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, const SfxRequest& rReq ) : - FuDraw(pViewSh, pWin, pViewP, pDoc, rReq) +FuSelection::FuSelection(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, + SdrModel* pDoc, const SfxRequest& rReq) + : FuDraw(&rViewSh, pWin, pViewP, pDoc, rReq) { } @@ -329,7 +329,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); bool bReturn = FuDraw::MouseButtonUp(rMEvt); - bool bOle = pViewShell && pViewShell->GetViewFrame()->GetFrame().IsInPlace(); + bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); SdrObject* pObj = nullptr; if (aDragTimer.IsActive() ) @@ -341,8 +341,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); bool bCopy = false; - ScViewData* pViewData = ( pViewShell ? &pViewShell->GetViewData() : nullptr ); - ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : nullptr ); + ScViewData& rViewData = pViewShell->GetViewData(); + ScDocument* pDocument = rViewData.GetDocument(); SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : nullptr ); SdrPage* pPage = ( pPageView ? pPageView->GetPage() : nullptr ); ::std::vector< OUString > aExcludedChartNames; @@ -428,7 +428,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } // maybe consider OLE object - SfxInPlaceClient* pIPClient = pViewShell ? pViewShell->GetIPClient() : nullptr; + SfxInPlaceClient* pIPClient = pViewShell->GetIPClient(); if (pIPClient) { @@ -454,7 +454,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SdrViewEvent aVEvt; SdrHitKind eHit = pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ); - if (eHit != SdrHitKind::NONE && aVEvt.pObj == pObj && pViewShell) + if (eHit != SdrHitKind::NONE && aVEvt.pObj == pObj) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); @@ -513,13 +513,13 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pViewShell->GetViewData().GetDispatcher(). Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD); - if ( bCopy && pViewData && pDocument && pPage ) + if ( bCopy && pDocument && pPage ) { - ScDocShell* pDocShell = pViewData->GetDocShell(); + ScDocShell* pDocShell = rViewData.GetDocShell(); ScModelObj* pModelObj = ( pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : nullptr ); if ( pModelObj ) { - SCTAB nTab = pViewData->GetTabNo(); + SCTAB nTab = rViewData.GetTabNo(); ScChartHelper::CreateProtectedChartListenersAndNotify( pDocument, pPage, pModelObj, nTab, aProtectedChartRangesVector, aExcludedChartNames ); } |