diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-01 14:27:21 +0530 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-12-05 12:11:18 +0100 |
commit | 98973b61b124ae20905985e2c9707c7036bd0e26 (patch) | |
tree | ca0406b7fe6ec9b099160cf04b8a098b6aa9f297 /desktop | |
parent | e7cc1b8c21d6161932220286b16968a831a652cb (diff) |
lokdialog: Merge dialog & dialog child mouse event APIs into one
Change-Id: I91aaa6a58f33dd2d817e02533de96e0c8191f2ca
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/lib/init.cxx | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 849b2e516b53..76748a87a317 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -576,7 +576,7 @@ static void doc_postMouseEvent (LibreOfficeKitDocument* pThis, int nCount, int nButtons, int nModifier); -static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis, +static void doc_postWindowMouseEvent (LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, int nType, int nX, @@ -584,14 +584,6 @@ static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis, int nCount, int nButtons, int nModifier); -static void doc_postDialogChildMouseEvent (LibreOfficeKitDocument* pThis, - unsigned nLOKWindowId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pCommand, const char* pArguments, @@ -666,8 +658,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XCompone m_pDocumentClass->postKeyEvent = doc_postKeyEvent; m_pDocumentClass->postWindowKeyEvent = doc_postWindowKeyEvent; m_pDocumentClass->postMouseEvent = doc_postMouseEvent; - m_pDocumentClass->postDialogMouseEvent = doc_postDialogMouseEvent; - m_pDocumentClass->postDialogChildMouseEvent = doc_postDialogChildMouseEvent; + m_pDocumentClass->postWindowMouseEvent = doc_postWindowMouseEvent; m_pDocumentClass->postUnoCommand = doc_postUnoCommand; m_pDocumentClass->setTextSelection = doc_setTextSelection; m_pDocumentClass->getTextSelection = doc_getTextSelection; @@ -2456,7 +2447,7 @@ static void doc_postMouseEvent(LibreOfficeKitDocument* pThis, int nType, int nX, } } -static void doc_postDialogMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nX, int nY, int nCount, int nButtons, int nModifier) +static void doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nX, int nY, int nCount, int nButtons, int nModifier) { SolarMutexGuard aGuard; @@ -2487,37 +2478,6 @@ static void doc_postDialogMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned } } -static void doc_postDialogChildMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindowId, int nType, int nX, int nY, int nCount, int nButtons, int nModifier) -{ - SolarMutexGuard aGuard; - - VclPtr<Window> pWindow = vcl::Window::FindLOKWindow(nLOKWindowId); - if (!pWindow) - { - gImpl->maLastExceptionMsg = "Document doesn't support dialog rendering, or window not found."; - return; - } - - Point aPos(nX, nY); - MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, nButtons, nModifier); - - switch (nType) - { - case LOK_MOUSEEVENT_MOUSEBUTTONDOWN: - pWindow->LogicMouseButtonDownChild(aEvent); - break; - case LOK_MOUSEEVENT_MOUSEBUTTONUP: - pWindow->LogicMouseButtonUpChild(aEvent); - break; - case LOK_MOUSEEVENT_MOUSEMOVE: - pWindow->LogicMouseMoveChild(aEvent); - break; - default: - assert(false); - break; - } -} - static void doc_setTextSelection(LibreOfficeKitDocument* pThis, int nType, int nX, int nY) { SolarMutexGuard aGuard; |