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

[Tor Lillqvist (via logerrit)]

 sd/source/core/sdpage.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4098608ea21d4737fdd640fd57c2417e56426fbb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 3 13:53:11 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Feb 3 23:05:46 2020 +0100

    Use the "Double-tap" term instead of "click" on all iOS devices (also iPad)
    
    In general, the term "mobile," when used in APIs related to Online and
    the mobile apps, means "mobile phone but not tablet". Which is sad,
    but it is too late to change that convention now.
    
    Thus comphelper::LibreOfficeKit::isMobile() returns false on iPad,
    apparently intentionally. But surely we want to use the "double tap"
    term instead of "click" also on iPad.
    
    Change-Id: I8f7186ea6590f2a21b885549751346edad09eb8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87858
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 63c78998b3cd..cc590e35aafc 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2621,7 +2621,11 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const
                 aString = SdResId( STR_PRESOBJ_MPNOTESTITLE );
             }
         }
-        else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+        else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())
+#ifdef IOS
+                 || true
+#endif
+                 )
             aString = SdResId(STR_PRESOBJ_TITLE_MOBILE);
         else
             aString = SdResId(STR_PRESOBJ_TITLE);