diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-14 17:33:16 +0530 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2018-02-14 19:19:50 +0100 |
| commit | 5024d7dbb364dec4fc90979251e5f29bc5ed3f5b (patch) | |
| tree | e8de110007ecc97876f6f5236eb734cf7ce44985 /include | |
| parent | 45c472697821df1022cb8ac4d81a14fcb1f734ef (diff) | |
lok IME: support dialogs as well
Change-Id: Ic78da45dadaa5a4e1ca78e20d04974108581121e
(cherry picked from commit 44fa8ae7d9bb3a28d860b2cc5871d6a6ccfc8411)
Reviewed-on: https://gerrit.libreoffice.org/49728
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 1 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/ITiledRenderable.hxx | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index bb99e04abe17..2af965e4a45d 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -291,6 +291,7 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::postExtTextInputEvent void (*postExtTextInputEvent) (LibreOfficeKitDocument* pThis, + unsigned nWindowId, int nType, const char* pText); diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index c076c0f0b58f..fabd3b29e687 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -539,12 +539,14 @@ public: /** * Post the text input from external input window, like IME * + * @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(int nType, const char* pText) + void postExtTextInputEvent(unsigned nWindowId, int nType, const char* pText) { - mpDoc->pClass->postExtTextInputEvent(mpDoc, nType, pText); + mpDoc->pClass->postExtTextInputEvent(mpDoc, nWindowId, nType, pText); } #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index 96d021935745..b91a67fdc0a3 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -85,6 +85,11 @@ public: } /** + * Get the vcl::Window for the document being edited + */ + virtual VclPtr<vcl::Window> getDocWindow() = 0; + + /** * Get the hash of the currently displayed part, i.e. sheet in a spreadsheet * or slide in a presentation. */ @@ -110,13 +115,6 @@ public: virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) = 0; /** - * Posts an external text input event - * - * @see lok::Document::postExtTextInputEvent(). - */ - virtual void postExtTextInputEvent(int nType, const OUString& rText) = 0; - - /** * Posts a mouse event on the document. * * @see lok::Document::postMouseEvent(). |