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

[Henry Castro (via logerrit)]

 editeng/source/editeng/editview.cxx |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit fc715ea8fa206bd52045efc49c4abc1238b99aa4
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Aug 24 14:45:55 2021 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Sep 17 16:06:20 2021 +0200

    lok: ensure no more tunneled spellchecking menu
    
    Change-Id: Ic79d9b6d606573d93830347390c6466b033e9f12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120963
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index e76d8eb60374..3a179d009391 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1096,16 +1096,10 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
             aPopupMenu->RemoveItem(nAutoCorrId);
             aPopupMenu->RemoveItem(nAutoCorrectDlgId);
 
-            // For mobile phones, send the context menu structure
-            const SfxViewShell* pViewShell = SfxViewShell::Current();
-            if (pViewShell && pViewShell->isLOKMobilePhone())
-            {
-                LOKSendSpellPopupMenu(aPopupMenu, nGuessLangWord, nGuessLangPara, nWords);
-                return;
-            }
-            else // For desktop or tablet, we use the tunneled dialog
-                aPopupMenu->SetLOKNotifier(SfxViewShell::Current());
+            LOKSendSpellPopupMenu(aPopupMenu, nGuessLangWord, nGuessLangPara, nWords);
+            return;
         }
+
         sal_uInt16 nId = aPopupMenu->Execute(pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose);
 
         aPaM2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP2);