diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-13 17:03:01 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-13 17:04:04 +0100 |
| commit | 75a5dfeca0af580bb31f3aceee541d5f905b9101 (patch) | |
| tree | e3aab67f5e176d98ca8819293412929d54b7d309 | |
| parent | 2af4da0ea9ee0b029e89cf5ab65d378d426d1af1 (diff) | |
tdf#86886 Shortcut keys missing in undo and redo tooltips
Change-Id: I8df003bdad4430a174815ce51197b997717ef379
| -rw-r--r-- | include/svx/lboxctrl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index 4977f0ef2b13..75a2f24bfb7c 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -56,7 +56,7 @@ public: class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { std::vector< OUString > aUndoRedoList; - OUString aDefaultText; + OUString aDefaultTooltip; public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index a40580c06fe9..c617a7c8b08b 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -224,7 +224,7 @@ SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, Tool { rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); - aDefaultText = MnemonicGenerator::EraseAllMnemonicChars( rTbx.GetItemText( nId ) ); + aDefaultTooltip = rTbx.GetQuickHelpText( nId ); } SvxUndoRedoControl::~SvxUndoRedoControl() @@ -239,13 +239,13 @@ void SvxUndoRedoControl::StateChanged( if ( eState == SfxItemState::DISABLED ) { ToolBox& rBox = GetToolBox(); - rBox.SetQuickHelpText( GetId(), aDefaultText ); + rBox.SetQuickHelpText( GetId(), aDefaultTooltip ); } else if ( pState && dynamic_cast<const SfxStringItem*>( pState) != nullptr ) { const SfxStringItem& rItem = *static_cast<const SfxStringItem *>(pState); ToolBox& rBox = GetToolBox(); - OUString aQuickHelpText = MnemonicGenerator::EraseAllMnemonicChars( rItem.GetValue() ); + OUString aQuickHelpText = rItem.GetValue(); rBox.SetQuickHelpText( GetId(), aQuickHelpText ); } SvxListBoxControl::StateChanged( nSID, eState, pState ); |