diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-28 09:05:18 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-28 09:26:39 +0200 |
commit | 6a9f985ea698355f38c1681c1eb276f8b9dd859c (patch) | |
tree | ccb70dd2a380bd4dd25e2cfcbe6a1f492d3517db | |
parent | b54966401d9af466120e05daa81f1ec47a43353b (diff) |
sd tiled rendering: avoid passing explicit 0 vcl::Window
Seen as dereferenced in svx for Impress table handling, and doing some
logic <-> pixel conversion -- and mpActiveWindow not being 0 in that
case.
Change-Id: I7f7c41a7d366704f6f8b9a7971f763c6661c8799
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index a582896c6d09..de5ebb183369 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -506,7 +506,7 @@ void ViewShell::LogicMouseButtonDown(const MouseEvent& rMouseEvent) Point aPoint = mpActiveWindow->GetPointerPosPixel(); mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel()); - MouseButtonDown(rMouseEvent, 0); + MouseButtonDown(rMouseEvent, mpActiveWindow); mpActiveWindow->SetPointerPosPixel(aPoint); } @@ -519,7 +519,7 @@ void ViewShell::LogicMouseButtonUp(const MouseEvent& rMouseEvent) Point aPoint = mpActiveWindow->GetPointerPosPixel(); mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel()); - MouseButtonUp(rMouseEvent, 0); + MouseButtonUp(rMouseEvent, mpActiveWindow); mpActiveWindow->SetPointerPosPixel(aPoint); } @@ -532,7 +532,7 @@ void ViewShell::LogicMouseMove(const MouseEvent& rMouseEvent) Point aPoint = mpActiveWindow->GetPointerPosPixel(); mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel()); - MouseMove(rMouseEvent, 0); + MouseMove(rMouseEvent, mpActiveWindow); mpActiveWindow->SetPointerPosPixel(aPoint); } @@ -616,16 +616,16 @@ void ViewShell::SetGraphicMm100Position(bool bStart, const Point& rPosition) if (bStart) { MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT); - MouseButtonDown(aClickEvent, 0); + MouseButtonDown(aClickEvent, mpActiveWindow); MouseEvent aMoveEvent(Point(rPosition.getX(), rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT); - MouseMove(aMoveEvent, 0); + MouseMove(aMoveEvent, mpActiveWindow); } else { MouseEvent aMoveEvent(Point(rPosition.getX(), rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT); - MouseMove(aMoveEvent, 0); + MouseMove(aMoveEvent, mpActiveWindow); MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT); - MouseButtonUp(aClickEvent, 0); + MouseButtonUp(aClickEvent, mpActiveWindow); } } |