diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-06 12:03:17 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-21 16:06:18 +0000 |
| commit | b59c5ace4b7213ffd62495d0c0e5b6411f5071be (patch) | |
| tree | a33d4e75bd19c32235c8b49f65a31f7b9ae8409c /framework | |
| parent | e5f52eddda1230eba971881223601bb7aa255d6b (diff) | |
Related fdo#81475 Improve toolbar tooltips in Writer standard toolbar
and show the shortcut in the tooltip also when there is a custom tooltip
Change-Id: Ia3f5d17df3769479f7aacf63a83507ccb8593103
Reviewed-on: https://gerrit.libreoffice.org/11303
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 39ecdb22c388..74d66a4df3aa 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1276,23 +1276,18 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine } m_pToolBar->InsertItem( nId, aString, nItemBits ); m_pToolBar->SetItemCommand( nId, aCommandURL ); + OUString sQuickHelp( aString ); + // Use custom tooltip if available if ( !aTooltip.isEmpty() ) + sQuickHelp = aTooltip; + OUString sShortCut; + if( RetrieveShortcut( aCommandURL, sShortCut ) ) { - m_pToolBar->SetQuickHelpText( nId, aTooltip ); - } - else - { - OUString sQuickHelp( aString ); - OUString sShortCut; - if( RetrieveShortcut( aCommandURL, sShortCut ) ) - { - sQuickHelp += " ("; - sQuickHelp += sShortCut; - sQuickHelp += ")"; - } - - m_pToolBar->SetQuickHelpText( nId, sQuickHelp ); + sQuickHelp += " ("; + sQuickHelp += sShortCut; + sQuickHelp += ")"; } + m_pToolBar->SetQuickHelpText( nId, sQuickHelp ); if ( !aLabel.isEmpty() ) { |