sfx2/source/view/ipclient.cxx | 7 +++++++
svx/source/svdraw/svdmrkv.cxx | 7 +------
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 403c6cd3653c1013a78f696bc68d639eb0f32f94
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu May 30 16:00:56 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Oct 11 22:54:24 2019 +0200
Don't send INPLACE messages to all views
Change-Id: I5ede42a173d297878b6212c4c8c467e2898d797f
Reviewed-on: https://gerrit.libreoffice.org/80683
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 1f5acea744d4..f941ceb31a8c 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -191,10 +191,10 @@ 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())
+ if ( comphelper::LibreOfficeKit::isActive() )
{
-
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION,
"INPLACE");
- SfxLokHelper::notifyOtherViews(pViewShell,
LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE");
+ if ( SfxViewShell* pViewShell = m_pClient->GetViewShell() )
+ pViewShell->libreOfficeKitViewCallback(
LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE" );
}
m_pClient->FormatChanged(); // for Writer when format of the object is
changed with the area
commit 80c2c7d0bc63ff7eb962a1b5f498a003253c3acb
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed May 29 15:29:04 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Oct 11 22:54:10 2019 +0200
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>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 9dd4503eff7f..1f5acea744d4 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -69,6 +69,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <sfx2/lokhelper.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#define SFX_CLIENTACTIVATE_TIMEOUT 100
@@ -190,6 +191,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 b66bc9d69e45..aa10261baff2 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -774,12 +774,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
