[Libreoffice-commits] core.git: sd/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Tue Feb 4 07:51:27 UTC 2020


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

New commits:
commit c150fe5b82c0e24868731394c05ec629466166e0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 3 13:53:11 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Feb 4 08:50:52 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>
    (cherry picked from commit 4098608ea21d4737fdd640fd57c2417e56426fbb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87931
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bd15a959daec..cf63b8fb74c3 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2613,7 +2613,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);


More information about the Libreoffice-commits mailing list