From 551e639f467813e52ff4301822b6a7f8778a2ef4 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 21 Sep 2017 22:08:46 +0200 Subject: lok: Don't freeze the LibreOfficeKit via the spell-checking popup menu. Change-Id: I045ed919daeefca612d7908dd7de50c36536c9a0 Reviewed-on: https://gerrit.libreoffice.org/42608 Reviewed-by: Andras Timar Tested-by: Andras Timar Reviewed-on: https://gerrit.libreoffice.org/42627 Tested-by: Jenkins --- editeng/source/editeng/editview.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index b74f76e35001..76692f6ab18d 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1023,7 +1023,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, LinkpEditEngine->pImpEditEngine->CreateEPaM(aPaM); EPaM aP2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEPaM(aPaM2); - sal_uInt16 nId = aPopupMenu->Execute( pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose ); + sal_uInt16 nId = 0; + // TODO for LOK, we'll need to convert the spelling popup menu to + // something much more sfx2-based & non-modal... + if (!comphelper::LibreOfficeKit::isActive()) + nId = aPopupMenu->Execute( pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose ); aPaM2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP2); aPaM = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP); -- cgit