diff options
author | Philippe Jung <phil.jung@free.fr> | 2015-05-13 15:59:40 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-05-14 17:17:55 +0000 |
commit | 415454cfbc6add8534e1dcff1ff16cc8dcc9296c (patch) | |
tree | cc6b89d02bb4ae51c34202d91e060fba939ff075 /framework | |
parent | fa4a87bc539865962dabf00aea465479d34faf92 (diff) |
tdf#86138 Context menu should state the name of the toolbar
When Menu::SetText is called, it defines the title of the menu (reuse of
an already defined & not used aTitleText)
Popup-menu with a title defined paint it on top of the popup. Text is bold
with a background slightly darker than the rest of the popup.
Change-Id: Ifca1be60541400f76f562b03f6e3c40dc5fecb29
Reviewed-on: https://gerrit.libreoffice.org/15716
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 3e12b5efef78..7f55ed11ef57 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1765,6 +1765,9 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const pMenu->SetPopupMenu( 1, pItemMenu ); } + // Set the title of the menu + pMenu->SetText( pToolBar->GetText() ); + if ( bHideDisabledEntries ) pMenu->RemoveDisabledEntries(); |