diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-10-14 16:51:25 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-10-27 22:43:14 +0200 |
| commit | 68c73b2cc26313de315e828cb9f8db53d9aeb6bf (patch) | |
| tree | daa39ae56cf63a3eb1498d054d6f501f335832c0 /sfx2 | |
| parent | d666b6b19d3e400561edc585d967ecab266c6b8f (diff) | |
tdf#108751 Show currently selected color name in color button tooltip
Based on Heiko Tietze's work in
I26f0500527d2b86049948ca64e636e1ff566f262
Change-Id: I20541dd6ad155a39c0f87361088b44923406064f
Reviewed-on: https://gerrit.libreoffice.org/61815
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index e96d4cff6b2d..b023da87d184 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -127,7 +127,8 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( const OUString sTooltip (vcl::CommandInfoProvider::GetTooltipForCommand( rsCommandName, rxFrame)); - pToolBox->SetQuickHelpText(nItemId, sTooltip); + if (pToolBox->GetQuickHelpText(nItemId).isEmpty()) + pToolBox->SetQuickHelpText(nItemId, sTooltip); pToolBox->EnableItem(nItemId); } } |