diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-09-21 22:08:46 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-09-22 12:24:31 +0200 |
| commit | 551e639f467813e52ff4301822b6a7f8778a2ef4 (patch) | |
| tree | d9e1eafe10e05e5385f201ca5ca92858f1e9d783 /editeng | |
| parent | df44f5013867047abd9d6ebf02acda5a30873cea (diff) | |
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 <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/42627
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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, Link<SpellCallbackInfo EPaM aP = pImpEditView->pEditEngine->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); |