diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-01 14:19:30 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-04 12:42:39 +0530 |
| commit | dfbfd5d9d1fb5d20d2f036b5eb85bb8fb30a9dfd (patch) | |
| tree | 2d58666bcb88ea17dcbf99db677a555af0b2b1cc | |
| parent | 89cedbf51bc8a5fd935c2b2558f990c5acd366a9 (diff) | |
lokdialog: Rename postDialogKeyEvent -> postWindowKeyEvent
Change-Id: I78b434106fbef153adde255d4fcc8f74a7169175
| -rw-r--r-- | desktop/source/lib/init.cxx | 6 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 4 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 4 | ||||
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 6cd6d8a02886..70bcb592fd01 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -544,7 +544,7 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int nCharCode, int nKeyCode); -static void doc_postDialogKeyEvent(LibreOfficeKitDocument* pThis, +static void doc_postWindowKeyEvent(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, int nType, int nCharCode, @@ -644,7 +644,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->postDialogKeyEvent = doc_postDialogKeyEvent; + m_pDocumentClass->postWindowKeyEvent = doc_postWindowKeyEvent; m_pDocumentClass->postMouseEvent = doc_postMouseEvent; m_pDocumentClass->postDialogMouseEvent = doc_postDialogMouseEvent; m_pDocumentClass->postDialogChildMouseEvent = doc_postDialogChildMouseEvent; @@ -2250,7 +2250,7 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int nChar pDoc->postKeyEvent(nType, nCharCode, nKeyCode); } -static void doc_postDialogKeyEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nCharCode, int nKeyCode) +static void doc_postWindowKeyEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nCharCode, int nKeyCode) { SolarMutexGuard aGuard; diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index d25031cd9f32..8db531650dbf 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -280,8 +280,8 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::postWindow(). void (*postWindow) (LibreOfficeKitDocument* pThis, unsigned nWindowId, int nAction); - /// @see lok::Document::postDialogKeyEvent(). - void (*postDialogKeyEvent) (LibreOfficeKitDocument* pThis, + /// @see lok::Document::postWindowKeyEvent(). + void (*postWindowKeyEvent) (LibreOfficeKitDocument* pThis, unsigned nDialogId, int nType, int nCharCode, diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index ee82fdb31e20..4a7ed2fddf17 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -259,9 +259,9 @@ public: * @param nCharCode contains the Unicode character generated by this event or 0 * @param nKeyCode contains the integer code representing the key of the event (non-zero for control keys) */ - void postDialogKeyEvent(unsigned nDialogId, int nType, int nCharCode, int nKeyCode) + void postWindowKeyEvent(unsigned nDialogId, int nType, int nCharCode, int nKeyCode) { - mpDoc->pClass->postDialogKeyEvent(mpDoc, nDialogId, nType, nCharCode, nKeyCode); + mpDoc->pClass->postWindowKeyEvent(mpDoc, nDialogId, nType, nCharCode, nKeyCode); } /** diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx index 197897c2a185..f6fddbba73d0 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx @@ -339,7 +339,7 @@ gtv_lok_dialog_signal_key(GtkWidget* pDialogDrawingArea, GdkEventKey* pEvent) ss << "gtv_lok_dialog::postKey(" << pEvent->type << ", " << nCharCode << ", " << nKeyCode << ")"; g_info("%s", ss.str().c_str()); - pDocument->pClass->postDialogKeyEvent(pDocument, + pDocument->pClass->postWindowKeyEvent(pDocument, priv->dialogid, pEvent->type == GDK_KEY_RELEASE ? LOK_KEYEVENT_KEYUP : LOK_KEYEVENT_KEYINPUT, nCharCode, |