diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-13 10:06:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-14 10:10:31 +0200 |
| commit | ac5f21587c09f700c1cbbe33ed73edfcc53ed666 (patch) | |
| tree | 6d22c9ad540f93361792b45ac8e3b6d6cb5841fb /svx/source | |
| parent | 176c7905f469bcefb06dc0772a6bbadfc8a8833f (diff) | |
sw: emit LOK_CALLBACK_GRAPHIC_VIEW_SELECTION as part of registerCallback()
Have a Writer shape selection in the first view, create a new view, the
second view doesn't see the selection. But the same works if the shape
selection is created when the second view was created earlier.
Emit the svx selection state as part of SwCursorShell::NotifyCursor() to
fix the problem, but take care of not sending the status to the new view
itself.
Reviewed-on: https://gerrit.libreoffice.org/28857
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 786cc8a5a3cd34329c72b867e5fd7896b10a7351)
Conflicts:
sw/source/core/crsr/crsrsh.cxx
Change-Id: Iff3979235e1c12cc64867c3184354967f451370b
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index a1533906d3b0..20ff410e82ce 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -777,9 +777,12 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) if(SfxViewShell* pViewShell = GetSfxViewShell()) { if (pOtherShell) + { // An other shell wants to know about our existing // selection. - SfxLokHelper::notifyOtherView(pViewShell, pOtherShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", sSelection); + if (pViewShell != pOtherShell) + SfxLokHelper::notifyOtherView(pViewShell, pOtherShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", sSelection); + } else { // We have a new selection, so both pViewShell and the |