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 /sw/source/uibase/uiview/viewling.cxx | |
| 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 'sw/source/uibase/uiview/viewling.cxx')
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index dbdeef511e3e..dc220a5bb684 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 <comphelper/propertysequence.hxx> @@ -712,9 +713,14 @@ bool SwView::ExecSpellPopup(const Point& rPt) OUString sMenuName = bUseGrammarContext ? OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu"); - if (TryContextMenuInterception(xPopup->GetMenu(), 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(xPopup->GetMenu(), sMenuName, pMenu, aEvent)) + { //! happy hacking for context menu modifying extensions of this //! 'custom made' menu... *sigh* (code copied from sfx2 and framework) if ( pMenu ) |