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

Muhammet Kara (via logerrit) logerrit at kemper.freedesktop.org
Sun Mar 1 16:28:12 UTC 2020


 sd/inc/strings.hrc           |    1 +
 sd/source/ui/func/futext.cxx |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 5f2cf0cc76316d27c0841fda027b350b83032531
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Mon Feb 24 17:03:12 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Mar 1 17:27:36 2020 +0100

    lok: Set default text for new text box on mobile
    
    Change-Id: I0b6056e9dbf5fb81d092092cc183b05120b95d70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89352
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89710
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index e4a1ed418524..26ec246e19b3 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -309,6 +309,7 @@
 #define STR_PRESOBJ_TITLE_MOBILE                        NC_("STR_PRESOBJ_TITLE_MOBILE", "Double-tap to add Title" )
 #define STR_PRESOBJ_OUTLINE_MOBILE                      NC_("STR_PRESOBJ_OUTLINE_MOBILE", "Double-tap to add Text" )
 #define STR_PRESOBJ_TEXT_MOBILE                         NC_("STR_PRESOBJ_TEXT_MOBILE", "Double-tap to add Text" )
+#define STR_PRESOBJ_TEXT_EDIT_MOBILE                    NC_("STR_PRESOBJ_TEXT_MOBILE", "Tap to edit text" )
 #define STR_PRESOBJ_NOTESTEXT_MOBILE                    NC_("STR_PRESOBJ_NOTESTEXT_MOBILE", "Double-tap to add Notes" )
 #define STR_PRESOBJ_GRAPHIC                             NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" )
 #define STR_PRESOBJ_OBJECT                              NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" )
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index f26d25504722..a6b7677debae 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -36,6 +36,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
+#include <sfx2/lokhelper.hxx>
 #include <sfx2/request.hxx>
 #include <editeng/editeng.hxx>
 #include <svx/svdoutl.hxx>
@@ -523,6 +524,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
             pTxtObj->AdjustTextFrameWidthAndHeight();
             aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
             pTxtObj->SetMergedItemSet(aSet);
+            if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+                pTxtObj->SetText(SdResId(STR_PRESOBJ_TEXT_EDIT_MOBILE));
         }
         else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
         {


More information about the Libreoffice-commits mailing list