diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-20 20:33:50 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-21 07:03:36 +0000 |
| commit | 4d211384f048b689f20e46d4d586f342b110cb5c (patch) | |
| tree | 0275a1620578c1e0f712d80eca90fb38ffe7da04 /sfx2 | |
| parent | c2fc93cae194a1aad94721edc51078b168a34f5f (diff) | |
sfx2 lok: fix missing view cursors in a new view
When a new view was created, the old views got the position of the new
view, but not the other way around.
Make sure that the old views notify the new one right after registering
the callback.
Change-Id: If26edbd57aa939e453d95f4907a0e5722329dd65
Reviewed-on: https://gerrit.libreoffice.org/26523
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index ba42188c178b..c994877e9540 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -60,7 +60,7 @@ void SfxLokHelper::setView(std::uintptr_t nId) } -std::uintptr_t SfxLokHelper::getView(SfxViewShell *pViewShell) +std::uintptr_t SfxLokHelper::getView(SfxViewShell* pViewShell) { if (!pViewShell) pViewShell = SfxViewShell::Current(); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 635ba12c0afc..f787d00538ef 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1456,6 +1456,15 @@ void SfxViewShell::registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCa { pImpl->m_pLibreOfficeKitViewCallback = pCallback; pImpl->m_pLibreOfficeKitViewData = pData; + + // Ask other views to send their cursor position to the new view. + SfxViewShell* pViewShell = SfxViewShell::GetFirst(); + while (pViewShell) + { + pViewShell->ShowCursor(false); + pViewShell->ShowCursor(); + pViewShell = SfxViewShell::GetNext(*pViewShell); + } } void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload) const |