From 5432f81622409e99a465adddbabaa21e0acaa2ed Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 28 Sep 2015 09:05:18 +0200
Subject: [PATCH 162/398] 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
(cherry picked from commit 6a9f985ea698355f38c1681c1eb276f8b9dd859c)
---
 sd/source/ui/view/viewshel.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 51a049e4d66d..241950ce043c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -521,7 +521,7 @@ void ViewShell::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
     Point aPoint = mpActiveWindow->GetPointerPosPixel();
     mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
 
-    MouseButtonDown(rMouseEvent, 0);
+    MouseButtonDown(rMouseEvent, mpActiveWindow);
 
     mpActiveWindow->SetPointerPosPixel(aPoint);
 }
@@ -534,7 +534,7 @@ void ViewShell::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
     Point aPoint = mpActiveWindow->GetPointerPosPixel();
     mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
 
-    MouseButtonUp(rMouseEvent, 0);
+    MouseButtonUp(rMouseEvent, mpActiveWindow);
 
     mpActiveWindow->SetPointerPosPixel(aPoint);
 }
@@ -547,7 +547,7 @@ void ViewShell::LogicMouseMove(const MouseEvent& rMouseEvent)
     Point aPoint = mpActiveWindow->GetPointerPosPixel();
     mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
 
-    MouseMove(rMouseEvent, 0);
+    MouseMove(rMouseEvent, mpActiveWindow);
 
     mpActiveWindow->SetPointerPosPixel(aPoint);
 }
@@ -631,16 +631,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);
     }
 }
 
-- 
2.12.0