diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-09-14 09:16:28 +0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-16 07:53:45 +0000 |
| commit | 053e4635d816cb18a6098a58f6d275417a244ac0 (patch) | |
| tree | 176ad6766a2a470a0d92133185ab20b0ff9cf12c /svx | |
| parent | 2c0cc6fac2437c864a90270eadfe005dfc707726 (diff) | |
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND (which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
(cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036)
Reviewed-on: https://gerrit.libreoffice.org/5942
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index e58ddaef6e8f..62f2ee2b999d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2545,7 +2545,7 @@ void SvxColorExtToolBoxControl::StateChanged( { const SvxColorItem* pItem = 0; - if ( bChoiceFromPalette ) + if ( bChoiceFromPalette && nSID == GetSlotId() ) { bChoiceFromPalette = sal_False; switch( nSID ) |