[Libreoffice-commits] core.git: editeng/source sw/source

[Jan Holesovsky]

 editeng/source/editeng/editview.cxx  |    6 +-----
 sw/source/uibase/uiview/viewling.cxx |   10 ++--------
 2 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit eda8d131c327a2fe360ac28a4b1014a4947a68bc
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Mar 12 17:27:10 2018 +0100

    Revert "lok: Don't freeze the LibreOfficeKit via the spell-checking popup..."
    
    This reverts commit 551e639f467813e52ff4301822b6a7f8778a2ef4.
    
    Change-Id: I0c7c85fe22d53aa5587ec119e1c3242682b88e43
    Reviewed-on: https://gerrit.libreoffice.org/51164
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index c4af0dcafb17..22b66cbce8c2 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1025,11 +1025,7 @@ 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 = 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 );
+        sal_uInt16 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 f8724e5743c9..b59abdc05042 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/propertysequence.hxx>
@@ -713,14 +712,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(xPopup->GetMenu(), sMenuName, pMenu, aEvent))
+                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 )