summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-04-16 14:38:36 +0200
committerJan Holesovsky <kendy@collabora.com>2018-04-16 16:39:48 +0200
commit930a215961cb32d9e03a69f6ca7c1343fc8a1747 (patch)
tree5dadb25b76c43dcc9e8781c3916083328534d853
parent04ebb378e2027997a1d066fa2111258ab2f16f95 (diff)
sd lok: Impress: Right-click menu on misspelled word locks up session
Change-Id: Ib554eea7049c1ea244bc4789ee3d7d2adf87e283 Reviewed-on: https://gerrit.libreoffice.org/52988 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--editeng/source/editeng/editview.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index bbf8bb97575c..1c8c49be4731 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -64,6 +64,7 @@
#include <vcl/settings.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
+#include <sfx2/viewsh.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -983,6 +984,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);