From 5ccb7ecf7cda92934d63cc171674b6c4f7f51af7 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 16 Mar 2020 13:50:00 +0200
Subject: Rename isMobile to isMobilePhone and introduce a separate isTablet

The intended semantics of isMobile() has been to say whether the
device is a mobile phone ot not. Not whether it is a mobile device in
general. So make that explicit.

Adjust call sites as necessary. Also, in a couple of places where it
is likely that what is relevant is whether it is a mobile device in
general, not just whether it is a mobile phone, check both isMobile()
and isTablet().

For stable interoperability with current Online, keep accepting also
the .uno:LOKSetMobile "command" (and .uno:LOKUnSetMobile, except that
Online never sends that). Online will eventually be changed to use
.uno:LOKSetMobilePhone or .uno:LOGSetTablet only (and never the UnSet
variants).

Also drop the default value for the bool parameter to
setMobilePhone(). Default bool parameters can be quite confusing, and
it was especially silly in this case as there is one (1) call site.

This is a work in progress and will be improved. Currently there are
undefined corner cases.

Change-Id: I2a71c37323ee151cbc671bd8e714e1dee10f8b1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90560
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90778
Tested-by: Jenkins
---
 editeng/source/editeng/editview.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index bbe64366e408..71f13298f511 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1071,13 +1071,13 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
 
         if (comphelper::LibreOfficeKit::isActive())
         {
-            // For mobile, send the context menu structure
-            if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+            // For mobile phones, send the context menu structure
+            if (comphelper::LibreOfficeKit::isMobilePhone(SfxLokHelper::getView()))
             {
                 LOKSendSpellPopupMenu(aPopupMenu, nGuessLangWord, nGuessLangPara, nWords);
                 return;
             }
-            else // For desktop, we use the tunneled dialog
+            else // For desktop and tablets, we use the tunneled dialog
                 aPopupMenu->SetLOKNotifier(SfxViewShell::Current());
         }
         sal_uInt16 nId = aPopupMenu->Execute(pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose);
-- 
cgit v1.2.3