diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2019-05-31 11:31:34 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-16 12:06:16 +0200 |
| commit | b8e56ce14ea67a195d47f1ba1709d7e3d38f99ae (patch) | |
| tree | 4cb37b24e7f625d03e85abd014d59ebf05c5b86e | |
| parent | ba088fc39c929c90a14451d75989241a6f18df7d (diff) | |
Send 'INPLACE EXIT' on inplace deactivation
Change-Id: Ieb44fb356966df0eb92141a5f22f1df13683f6fc
Reviewed-on: https://gerrit.libreoffice.org/80684
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 253adffceb77..a0d10c2cb609 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1187,7 +1187,6 @@ void CallbackFlushHandler::queue(const int type, const char* data) case LOK_CALLBACK_TEXT_SELECTION_START: case LOK_CALLBACK_TEXT_SELECTION_END: case LOK_CALLBACK_TEXT_SELECTION: - case LOK_CALLBACK_GRAPHIC_SELECTION: case LOK_CALLBACK_MOUSE_POINTER: case LOK_CALLBACK_CELL_CURSOR: case LOK_CALLBACK_CELL_FORMULA: @@ -1249,6 +1248,15 @@ void CallbackFlushHandler::queue(const int type, const char* data) if (processWindowEvent(aCallbackData)) return; break; + + case LOK_CALLBACK_GRAPHIC_SELECTION: + { + // remove only selection ranges and 'EMPTY' messages + // always send 'INPLACE' and 'INPLACE EXIT' messages + removeAll([type, payload] (const queue_type::value_type& elem) + { return (elem.Type == type && elem.PayloadString[0] != 'I'); }); + } + break; } } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 861608dc5211..8bcf71a0c5dc 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -358,6 +358,13 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); + + if ( comphelper::LibreOfficeKit::isActive() ) + { + if ( SfxViewShell* pViewShell = m_pClient->GetViewShell() ) { + pViewShell->libreOfficeKitViewCallback( LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE EXIT" ); + } + } } |