[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - editeng/source sw/source

[Jan Holesovsky]

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

New commits:
commit b166510d382302622cc6acc3e00ee7fdfd6dbad9
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Mar 8 17:26:27 2018 +0100

    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 at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index bb9093c3904d..f6f75235fd14 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -983,11 +983,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 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 )