summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2018-02-21 22:09:09 +0530
committerAndras Timar <andras.timar@collabora.com>2018-03-25 23:01:13 +0200
commitaaf55ec5d71879ffa12fdd1259e68ce950225140 (patch)
treea7ce59260c7d08f2e65ae97fea9d00c9d835abcf /desktop
parent07c2d891cb6d83e47624104107226f20b9c2b4f3 (diff)
postExtTextInputEvent() -> postWindowExtTextInputEvent()
Let's avoid the confusion and name all these new APIs that can post both to document and window to have 'Window' in their name. The ones without window are the old APIs. In future, we can have postWindow{Key,Mouse}Event() to post to both document and window and deprecate the existing post{Key,Mouse}Event()s. Change-Id: I1f55386e7790e9c5b5d023b8831f3cd1e6faa2bb (cherry picked from commit 0a1a3a64823c0509c4b5f1edc6ee51ca991d3501)
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c87172a2a27a..04109f1093f5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -549,10 +549,10 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis,
int nType,
int nCharCode,
int nKeyCode);
-static void doc_postExtTextInputEvent(LibreOfficeKitDocument* pThis,
- unsigned nWindowId,
- int nType,
- const char* pText);
+static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis,
+ unsigned nWindowId,
+ int nType,
+ const char* pText);
static void doc_postWindowKeyEvent(LibreOfficeKitDocument* pThis,
unsigned nLOKWindowId,
int nType,
@@ -646,7 +646,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XCompone
m_pDocumentClass->initializeForRendering = doc_initializeForRendering;
m_pDocumentClass->registerCallback = doc_registerCallback;
m_pDocumentClass->postKeyEvent = doc_postKeyEvent;
- m_pDocumentClass->postExtTextInputEvent = doc_postExtTextInputEvent;
+ m_pDocumentClass->postWindowExtTextInputEvent = doc_postWindowExtTextInputEvent;
m_pDocumentClass->postWindowKeyEvent = doc_postWindowKeyEvent;
m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
m_pDocumentClass->postWindowMouseEvent = doc_postWindowMouseEvent;
@@ -2307,7 +2307,7 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int nChar
pDoc->postKeyEvent(nType, nCharCode, nKeyCode);
}
-static void doc_postExtTextInputEvent(LibreOfficeKitDocument* pThis, unsigned nWindowId, int nType, const char* pText)
+static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis, unsigned nWindowId, int nType, const char* pText)
{
SolarMutexGuard aGuard;
VclPtr<vcl::Window> pWindow;