[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - editeng/source

[Tamás Zolnai]

 editeng/source/editeng/editview.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 53b501ef0ed642d11de5a69821662661447eefd2
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Mon Apr 16 14:38:36 2018 +0200

    sd lok: Impress: Right-click menu on misspelled word locks up session
    
    Change-Id: Ib554eea7049c1ea244bc4789ee3d7d2adf87e283
    Reviewed-on: https://gerrit.libreoffice.org/52991
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index eca6a6098365..c5e1d17af0b4 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -66,6 +66,7 @@
 #include <vcl/settings.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
+#include <sfx2/viewsh.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -1025,6 +1026,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
         EPaM aP = pImpEditView->pEditEngine->pImpEditEngine->CreateEPaM(aPaM);
         EPaM aP2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEPaM(aPaM2);
 
+
+        if (comphelper::LibreOfficeKit::isActive())
+            aPopupMenu->SetLOKNotifier(SfxViewShell::Current());
         sal_uInt16 nId = aPopupMenu->Execute(pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose);
 
         aPaM2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP2);