Kaydet (Commit) a36236e8 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Adolfo Jayme Barrientos

Resolves: tdf#125447 mnemonic appearing in tooltip

Change-Id: I570af8f19468730aad714425492f69d05c0a0cf3
Reviewed-on: https://gerrit.libreoffice.org/72853
Tested-by: Jenkins
Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst e5a47463
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
#include <svl/aeitem.hxx> #include <svl/aeitem.hxx>
#include <basic/sbstar.hxx> #include <basic/sbstar.hxx>
#include <xmloff/autolayout.hxx> #include <xmloff/autolayout.hxx>
#include <vcl/mnemonic.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -168,7 +169,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) ...@@ -168,7 +169,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{ {
// Set the necessary string like in // Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. // 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(); aTmp += pUndoManager->GetRedoActionComment();
rSet.Put(SfxStringItem(SID_REDO, aTmp)); rSet.Put(SfxStringItem(SID_REDO, aTmp));
} }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <officecfg/Office/Common.hxx> #include <officecfg/Office/Common.hxx>
#include <officecfg/Setup.hxx> #include <officecfg/Setup.hxx>
#include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/vclunohelper.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/splitwin.hxx> #include <vcl/splitwin.hxx>
#include <unotools/moduleoptions.hxx> #include <unotools/moduleoptions.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
...@@ -995,7 +996,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) ...@@ -995,7 +996,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
} }
else else
{ {
rSet.Put( SfxStringItem( SID_REDO, SvtResId(STR_REDO)+pShUndoMgr->GetRedoActionComment() ) ); rSet.Put( SfxStringItem( SID_REDO, MnemonicGenerator::EraseAllMnemonicChars(SvtResId(STR_REDO))+pShUndoMgr->GetRedoActionComment() ) );
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment