[Libreoffice-commits] core.git: include/svx svx/source

[Libreoffice Gerrit user]

 include/svx/strings.hrc         |    1 +
 svx/source/stbctrls/insctrl.cxx |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6e41367798d4341d601069005ae6ff6ac032f81f
Author:     heiko tietze <tietze.heiko at gmail.com>
AuthorDate: Wed Feb 20 09:29:19 2019 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 20 14:14:56 2019 +0100

    Resolves tdf#107918 - Insert mode status activation and display
    
    Patch shows Insert as well on macOS, and keep it hidden otherwise
    
    Change-Id: Ie8dd32198d93c50ffd83e8aaf4b007b1ecf5c547
    Reviewed-on: https://gerrit.libreoffice.org/68065
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2d722447bdc4..042d4d59aee0 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1227,6 +1227,7 @@
 #define RID_SVXSTR_OVERWRITE_HELPTEXT                       NC_("RID_SVXSTR_OVERWRITE_HELPTEXT", "Overwrite mode. Click to change to insert mode.")
 // To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'.
 #define RID_SVXSTR_OVERWRITE_TEXT                           NC_("RID_SVXSTR_OVERWRITE_TEXT", "Overwrite")
+#define RID_SVXSTR_INSERT_TEXT                              NC_("RID_SVXSTR_INSERT_TEXT", "Insert")
 #define RID_SVXSTR_XMLSEC_SIG_OK                            NC_("RID_SVXSTR_XMLSEC_SIG_OK", "Digital Signature: The document signature is OK.")
 #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY                  NC_("RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY", "Digital Signature: The document signature is OK, but the certificates could not be validated.")
 #define RID_SVXSTR_XMLSEC_SIG_NOT_OK                        NC_("RID_SVXSTR_XMLSEC_SIG_NOT_OK", "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document.")
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index f77577e2bc3f..952f82332f8e 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -70,7 +70,13 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
 {
-    OUString aText;
+    OUString aText = "";
+    // tdf#107918 on macOS without an Insert key it's hard to figure out how to switch modes
+    // so we show both Insert and Overwrite
+#ifdef MACOSX
+    if ( bInsert )
+        aText = SvxResId( RID_SVXSTR_INSERT_TEXT );
+#endif
     if ( !bInsert )
         aText = SvxResId( RID_SVXSTR_OVERWRITE_TEXT );