diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-03-08 17:26:27 +0100 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2018-03-12 17:10:11 +0100 |
| commit | b166510d382302622cc6acc3e00ee7fdfd6dbad9 (patch) | |
| tree | 67f1b083819fa37cb915c4a6ff5c86ba2fb2758f /sw | |
| parent | e169df73408a48427a2b4b2a1927da09fc740169 (diff) | |
Revert "lok: Don't freeze the LibreOfficeKit via the spell-checking popup..."
We want to re-introduce the spell-checking context menu, and use dialog
tunneling for that.
This reverts commit eb5e45782b0e805455d383e9d020aae5bb70d619.
Change-Id: I068585b9e70409fe3e64f2d7039fb4a23af08738
Reviewed-on: https://gerrit.libreoffice.org/51061
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index b0a596ce2210..9479424d67ce 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -24,7 +24,6 @@ #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/scopeguard.hxx> @@ -731,13 +730,9 @@ bool SwView::ExecSpellPopup(const Point& rPt) OUString sMenuName = bUseGrammarContext ? OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu"); - 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 )) + 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 ) |