From 6a8e7fde5084b46d62c99aae91e4e6f78c14f178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 30 May 2014 09:20:33 +0100 Subject: [PATCH] coverity#705861 Dereference before null check Change-Id: Ia027a5990769413dff323ff0e0b6fd66633b9339 --- sd/source/ui/func/fudraw.cxx | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index fdc6ea1f3219..f06425d24c5a 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -325,32 +325,35 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt) bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { - if ( mpView->IsDragHelpLine() ) + if (mpView && mpView->IsDragHelpLine()) mpView->EndDragHelpLine(); if ( bDragHelpLine ) { Rectangle aOutputArea(Point(0,0), mpWindow->GetOutputSizePixel()); - if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) ) + if (mpView && !aOutputArea.IsInside(rMEvt.GetPosPixel())) mpView->GetSdrPageView()->DeleteHelpLine(nHelpLine); mpWindow->ReleaseMouse(); } - FrameView* pFrameView = mpViewShell->GetFrameView(); - mpView->SetOrtho( pFrameView->IsOrtho() ); - mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() ); - mpView->SetSnapEnabled(true); - mpView->SetCreate1stPointAsCenter(false); - mpView->SetResizeAtCenter(false); - mpView->SetDragWithCopy(pFrameView->IsDragWithCopy()); - mpView->SetGridSnap(pFrameView->IsGridSnap()); - mpView->SetBordSnap(pFrameView->IsBordSnap()); - mpView->SetHlplSnap(pFrameView->IsHlplSnap()); - mpView->SetOFrmSnap(pFrameView->IsOFrmSnap()); - mpView->SetOPntSnap(pFrameView->IsOPntSnap()); - mpView->SetOConSnap(pFrameView->IsOConSnap()); + if (mpView) + { + FrameView* pFrameView = mpViewShell->GetFrameView(); + mpView->SetOrtho( pFrameView->IsOrtho() ); + mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() ); + mpView->SetSnapEnabled(true); + mpView->SetCreate1stPointAsCenter(false); + mpView->SetResizeAtCenter(false); + mpView->SetDragWithCopy(pFrameView->IsDragWithCopy()); + mpView->SetGridSnap(pFrameView->IsGridSnap()); + mpView->SetBordSnap(pFrameView->IsBordSnap()); + mpView->SetHlplSnap(pFrameView->IsHlplSnap()); + mpView->SetOFrmSnap(pFrameView->IsOFrmSnap()); + mpView->SetOPntSnap(pFrameView->IsOPntSnap()); + mpView->SetOConSnap(pFrameView->IsOConSnap()); + } bIsInDragMode = false; ForcePointer(&rMEvt);