sfx2/source/view/ipclient.cxx | 6 ++++++ svx/source/svdraw/svdmrkv.cxx | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit b3293953b885be5ab1b67c00552b3c399eb48814 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Wed May 29 15:29:04 2019 +0200 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Mon Dec 16 15:02:07 2019 +0100 lok: send message when in place editing Fixup mis-merge into the wrong module of "lok: send message when in place editing" This reverts commit a5acbbdbce32b25000ad2f1429c7bc307c7d28cb. Change-Id: Ia7ee0b70e2c491274d9fa7eb5808396e83fb3e52 Reviewed-on: https://gerrit.libreoffice.org/80682 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82151 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.me...@collabora.com> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 289ed49e9194..02d6910e02bc 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -197,6 +197,12 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a if ( m_pClient && aEvent.EventName == "OnVisAreaChanged" && m_nAspect != embed::Aspects::MSOLE_ICON ) { + if(SfxViewShell* pViewShell = m_pClient->GetViewShell()) + { + pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE"); + SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE"); + } + m_pClient->FormatChanged(); // for Writer when format of the object is changed with the area m_pClient->ViewChanged(); m_pClient->Invalidate(); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 0be2473a44ca..4f9e748dd922 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -767,12 +767,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || pSdrOle2Obj->isUiActive())) { - if(pViewShell) - { - pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE"); - SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE"); - return; - } + return; } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits