[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 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 a36236e82c99839d327094b182a167ac53c4ea66
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 23 14:03:37 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Jun 3 06:04:15 2019 +0200

    Resolves: tdf#125447 mnemonic appearing in tooltip
    
    Change-Id: I570af8f19468730aad714425492f69d05c0a0cf3
    Reviewed-on: https://gerrit.libreoffice.org/72853
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 73edd5dc7bc8..36e77c91c7bb 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -78,6 +78,7 @@
 #include <svl/aeitem.hxx>
 #include <basic/sbstar.hxx>
 #include <xmloff/autolayout.hxx>
+#include <vcl/mnemonic.hxx>
 
 using namespace ::com::sun::star;
 
@@ -168,7 +169,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 67d0bbcd5471..814a45f42b6f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -33,6 +33,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>
@@ -995,7 +996,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