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

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/viewshe3.cxx |    3 ++-
 sfx2/source/view/viewfrm.cxx   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bbaeba5b7fe04b67229d96ffe1ab1735d7c86c57
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 23 14:03:37 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 23 21:12:36 2019 +0200

    Resolves: tdf#125447 mnemonic appearing in tooltip
    
    Change-Id: I570af8f19468730aad714425492f69d05c0a0cf3
    Reviewed-on: https://gerrit.libreoffice.org/72852
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index c09b539a34cf..46b4f3df1146 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -79,6 +79,7 @@
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
 #include <xmloff/autolayout.hxx>
+#include <vcl/mnemonic.hxx>
 
 using namespace ::com::sun::star;
 
@@ -171,7 +172,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
-            OUString aTmp(SvtResId(STR_REDO));
+            OUString aTmp(MnemonicGenerator::EraseAllMnemonicChars(SvtResId(STR_REDO)));
             aTmp += pUndoManager->GetRedoActionComment();
             rSet.Put(SfxStringItem(SID_REDO, aTmp));
         }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 2ee2b9c82976..4741a519d903 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -35,6 +35,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/mnemonic.hxx>
 #include <vcl/splitwin.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>
@@ -997,7 +998,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
         }
         else
         {
-            rSet.Put( SfxStringItem( SID_REDO, SvtResId(STR_REDO)+pShUndoMgr->GetRedoActionComment() ) );
+            rSet.Put( SfxStringItem( SID_REDO, MnemonicGenerator::EraseAllMnemonicChars(SvtResId(STR_REDO))+pShUndoMgr->GetRedoActionComment() ) );
         }
     }
     else