diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-21 22:09:09 +0530 |
---|---|---|
committer | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-27 19:43:25 +0530 |
commit | 0a1a3a64823c0509c4b5f1edc6ee51ca991d3501 (patch) | |
tree | 1949630039c61068ef94f878cfbb8b81c386285f | |
parent | e8fab3e4eaa0ef6ad0dafafd00a53f2b64a28561 (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
-rw-r--r-- | desktop/source/lib/init.cxx | 12 | ||||
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 10 | ||||
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index fdc02e3128d3..d102d91d23f6 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -542,10 +542,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, @@ -639,7 +639,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; @@ -2300,7 +2300,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; diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 7492fcc7a561..d465d541b0e0 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -300,11 +300,11 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::setViewLanguage(). void (*setViewLanguage) (LibreOfficeKitDocument* pThis, int nId, const char* language); - /// @see lok::Document::postExtTextInputEvent - void (*postExtTextInputEvent) (LibreOfficeKitDocument* pThis, - unsigned nWindowId, - int nType, - const char* pText); + /// @see lok::Document::postWindowExtTextInputEvent + void (*postWindowExtTextInputEvent) (LibreOfficeKitDocument* pThis, + unsigned nWindowId, + int nType, + const char* pText); #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 55e29ebda1c8..232eada69821 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -538,16 +538,16 @@ public: } /** - * Post the text input from external input window, like IME + * Post the text input from external input window, like IME, to given windowId * * @param nWindowId Specify the window id to post the input event to. If * nWindow is 0, the event is posted into the document * @param nType see LibreOfficeKitExtTextInputType * @param pText Text for LOK_EXT_TEXTINPUT */ - void postExtTextInputEvent(unsigned nWindowId, int nType, const char* pText) + void postWindowExtTextInputEvent(unsigned nWindowId, int nType, const char* pText) { - mpDoc->pClass->postExtTextInputEvent(mpDoc, nWindowId, nType, pText); + mpDoc->pClass->postWindowExtTextInputEvent(mpDoc, nWindowId, nType, pText); } #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY |