mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: emit LOK_CALLBACK_VIEW_CURSOR_VISIBLE as part of registerCallback()

Browse Source 
Have a graphic selection (and thus a hidden text cursor) in the first
view, create a second view. The view text cursors should be hidden in
the second view as well.

Change-Id: Ic22db84aab62c8f43c2da3d4a19b56c993c9f012
Reviewed-on: https://gerrit.libreoffice.org/28836
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-09-12 13:35:11 +02:00
parent 2934f6bcc7
commit ab6dcd326a
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sw/qa/extras/tiledrendering/tiledrendering.cxx
View File

@@ -1296,6 +1296,14 @@ void SwTiledRenderingTest::testCreateViewGraphicSelection()
// first one. // first one.
CPPUNIT_ASSERT(aView1.m_bGraphicSelection); CPPUNIT_ASSERT(aView1.m_bGraphicSelection);
// Make sure that the hidden text cursor isn't visible in the second view, either.
ViewCallback aView2;
aView2.m_bViewCursorVisible = true;
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback, &aView2);
// This was true, the second view didn't get the visibility of the text
// cursor of the first view.
CPPUNIT_ASSERT(!aView2.m_bViewCursorVisible);
mxComponent->dispose(); mxComponent->dispose();
mxComponent.clear(); mxComponent.clear();
comphelper::LibreOfficeKit::setActive(false); comphelper::LibreOfficeKit::setActive(false);

3
sw/source/core/crsr/viscrs.cxx
View File

@@ -204,7 +204,10 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell* pViewShell)
if (pViewShell == m_pCursorShell->GetSfxViewShell()) if (pViewShell == m_pCursorShell->GetSfxViewShell())
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr()); pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sRect.getStr());
else else
{
SfxLokHelper::notifyOtherView(m_pCursorShell->GetSfxViewShell(), pViewShell, LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", sRect); SfxLokHelper::notifyOtherView(m_pCursorShell->GetSfxViewShell(), pViewShell, LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", sRect);
SfxLokHelper::notifyOtherView(m_pCursorShell->GetSfxViewShell(), pViewShell, LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", OString::boolean(m_bIsVisible));
}
} }
else else
{ {