commit 6e41367798d4341d601069005ae6ff6ac032f81f
author heiko tietze <tietze.heiko@gmail.com> Wed Feb 20 09:29:19 2019 +0100
committer Noel Grandin <noel.grandin@collabora.co.uk> Wed Feb 20 14:14:56 2019 +0100
tree 9cc0fd61106d7934e84a821c0914fc4ed4f5dd72
parent 97a42da2e39c59974b343f8e945b77e2b28e84ab

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@collabora.co.uk>

include/svx/strings.hrc

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2d72244..042d4d5 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.")

svx/source/stbctrls/insctrl.cxx

diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index f77577e..952f823 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 );