|
 |
f325b2 |
From 5432f81622409e99a465adddbabaa21e0acaa2ed Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Mon, 28 Sep 2015 09:05:18 +0200
|
|
|
f325b2 |
Subject: [PATCH 162/398] sd tiled rendering: avoid passing explicit 0
|
|
|
f325b2 |
vcl::Window
|
|
|
f325b2 |
|
|
|
f325b2 |
Seen as dereferenced in svx for Impress table handling, and doing some
|
|
|
f325b2 |
logic <-> pixel conversion -- and mpActiveWindow not being 0 in that
|
|
|
f325b2 |
case.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I7f7c41a7d366704f6f8b9a7971f763c6661c8799
|
|
|
f325b2 |
(cherry picked from commit 6a9f985ea698355f38c1681c1eb276f8b9dd859c)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sd/source/ui/view/viewshel.cxx | 14 +++++++-------
|
|
|
f325b2 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
|
|
|
f325b2 |
index 51a049e4d66d..241950ce043c 100644
|
|
|
f325b2 |
--- a/sd/source/ui/view/viewshel.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/view/viewshel.cxx
|
|
|
f325b2 |
@@ -521,7 +521,7 @@ void ViewShell::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
|
|
|
f325b2 |
Point aPoint = mpActiveWindow->GetPointerPosPixel();
|
|
|
f325b2 |
mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
|
|
|
f325b2 |
|
|
|
f325b2 |
- MouseButtonDown(rMouseEvent, 0);
|
|
|
f325b2 |
+ MouseButtonDown(rMouseEvent, mpActiveWindow);
|
|
|
f325b2 |
|
|
|
f325b2 |
mpActiveWindow->SetPointerPosPixel(aPoint);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -534,7 +534,7 @@ void ViewShell::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
|
|
|
f325b2 |
Point aPoint = mpActiveWindow->GetPointerPosPixel();
|
|
|
f325b2 |
mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
|
|
|
f325b2 |
|
|
|
f325b2 |
- MouseButtonUp(rMouseEvent, 0);
|
|
|
f325b2 |
+ MouseButtonUp(rMouseEvent, mpActiveWindow);
|
|
|
f325b2 |
|
|
|
f325b2 |
mpActiveWindow->SetPointerPosPixel(aPoint);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -547,7 +547,7 @@ void ViewShell::LogicMouseMove(const MouseEvent& rMouseEvent)
|
|
|
f325b2 |
Point aPoint = mpActiveWindow->GetPointerPosPixel();
|
|
|
f325b2 |
mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
|
|
|
f325b2 |
|
|
|
f325b2 |
- MouseMove(rMouseEvent, 0);
|
|
|
f325b2 |
+ MouseMove(rMouseEvent, mpActiveWindow);
|
|
|
f325b2 |
|
|
|
f325b2 |
mpActiveWindow->SetPointerPosPixel(aPoint);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -631,16 +631,16 @@ void ViewShell::SetGraphicMm100Position(bool bStart, const Point& rPosition)
|
|
|
f325b2 |
if (bStart)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
|
|
|
f325b2 |
- MouseButtonDown(aClickEvent, 0);
|
|
|
f325b2 |
+ MouseButtonDown(aClickEvent, mpActiveWindow);
|
|
|
f325b2 |
MouseEvent aMoveEvent(Point(rPosition.getX(), rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
|
|
|
f325b2 |
- MouseMove(aMoveEvent, 0);
|
|
|
f325b2 |
+ MouseMove(aMoveEvent, mpActiveWindow);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
else
|
|
|
f325b2 |
{
|
|
|
f325b2 |
MouseEvent aMoveEvent(Point(rPosition.getX(), rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
|
|
|
f325b2 |
- MouseMove(aMoveEvent, 0);
|
|
|
f325b2 |
+ MouseMove(aMoveEvent, mpActiveWindow);
|
|
|
f325b2 |
MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
|
|
|
f325b2 |
- MouseButtonUp(aClickEvent, 0);
|
|
|
f325b2 |
+ MouseButtonUp(aClickEvent, mpActiveWindow);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|