diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-09-21 22:08:46 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-09-21 22:12:22 +0200 |
| commit | eb5e45782b0e805455d383e9d020aae5bb70d619 (patch) | |
| tree | 7b68f5a6610dd1ff86239b242b7c2c939c9b805c | |
| parent | 165cd6a40ab4a53ac273e2a4500f82a3249b855a (diff) | |
lok: Don't freeze the LibreOfficeKit via the spell-checking popup menu.cp-5.3-26
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>
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index a246587bac45..6ffc0730990a 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -983,7 +983,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); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 56f3b7e9590e..a52a818024b2 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/linguistic2/ProofreadingResult.hpp> #include <com/sun/star/i18n/TextConversionOption.hpp> #include <linguistic/lngprops.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -722,9 +723,13 @@ bool SwView::ExecSpellPopup(const Point& rPt) OUString sMenuName = bUseGrammarContext ? OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu"); - if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent )) + if (comphelper::LibreOfficeKit::isActive()) + { + // TODO for LOK, we'll need to convert the spelling popup menu to + // something much more sfx2-based & non-modal... + } + else if (TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent )) { - //! happy hacking for context menu modifying extensions of this //! 'custom made' menu... *sigh* (code copied from sfx2 and framework) if ( pMenu ) |