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 /svx/source/tbxctrls/tbcontrl.cxx | |
| 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 'svx/source/tbxctrls/tbcontrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 9f8ed9f7f771..8188a5832332 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3110,7 +3110,9 @@ void SvxColorToolBoxControl::initialize( const css::uno::Sequence<css::uno::Any> // Sidebar uses wide buttons for those. m_bSplitButton = typeid( *pToolBox ) != typeid( sfx2::sidebar::SidebarToolBox ); - m_xBtnUpdater.reset( new svx::ToolboxButtonColorUpdater( m_nSlotId, nId, pToolBox, !m_bSplitButton ) ); + OUString aCommandLabel = vcl::CommandInfoProvider::GetLabelForCommand( getCommandURL(), getModuleName() ); + + m_xBtnUpdater.reset( new svx::ToolboxButtonColorUpdater( m_nSlotId, nId, pToolBox, !m_bSplitButton, aCommandLabel ) ); pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ( m_bSplitButton ? ToolBoxItemBits::DROPDOWN : ToolBoxItemBits::DROPDOWNONLY ) ); } @@ -3181,7 +3183,7 @@ VclPtr<vcl::Window> SvxColorToolBoxControl::createPopupWindow( vcl::Window* pPar IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, const NamedColor&, rColor, void) { - m_xBtnUpdater->Update(rColor.first); + m_xBtnUpdater->Update(rColor); } void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) |