sc/source/ui/unoobj/docuno.cxx | 4 ++--
sd/source/ui/unoidl/unomodel.cxx | 5 +++--
sw/source/uibase/uno/unotxdoc.cxx | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit d5f0b3d725f678c1a7eb4b8b4ab3a2279742260c
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Feb 22 17:40:35 2018 +0530
Revert posting key events on the main thread
This partially reverts commit f2d3192e8a4ae743fcaab27ab6d829d57ae8fb60.
Change-Id: Ic273e3f742d48dbfb73060a6ecb4feb80afdcfaa
Reviewed-on: https://gerrit.libreoffice.org/50174
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index f415a7b5cd4c..b6cbc5e46fac 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -623,10 +623,10 @@ void ScModelObj::postKeyEvent(int nType, int nCharCode,
int nKeyCode)
switch (nType)
{
case LOK_KEYEVENT_KEYINPUT:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, &aEvent);
+ pWindow->KeyInput(aEvent);
break;
case LOK_KEYEVENT_KEYUP:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, &aEvent);
+ pWindow->KeyUp(aEvent);
break;
default:
assert(false);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 30971a584e49..d9ea81e4982e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2507,13 +2507,14 @@ void SdXImpressDocument::postKeyEvent(int nType, int
nCharCode, int nKeyCode)
return;
KeyEvent aEvent(nCharCode, nKeyCode, 0);
+
switch (nType)
{
case LOK_KEYEVENT_KEYINPUT:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, &aEvent);
+ pWindow->KeyInput(aEvent);
break;
case LOK_KEYEVENT_KEYUP:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, &aEvent);
+ pWindow->KeyUp(aEvent);
break;
default:
assert(false);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 103ae13f9111..0244b3db6a2b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3499,10 +3499,10 @@ void SwXTextDocument::postKeyEvent(int nType, int
nCharCode, int nKeyCode)
switch (nType)
{
case LOK_KEYEVENT_KEYINPUT:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, &aEvent);
+ pWindow->KeyInput(aEvent);
break;
case LOK_KEYEVENT_KEYUP:
- Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, &aEvent);
+ pWindow->KeyUp(aEvent);
break;
default:
assert(false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
