diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-09-14 09:16:28 +0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-17 12:21:33 +0000 |
| commit | 95dfcdcf7710a2b384d3ef8a94443efee86eb701 (patch) | |
| tree | 53da296a8c355d38f8212455d11a0f99b30e8830 | |
| parent | 4deb3ec0d5d94a36b3941176b30e662184d2297a (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/5941
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -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 112ef1fc23a4..94a3ebef87d1 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2500,7 +2500,7 @@ void SvxColorExtToolBoxControl::StateChanged( { const SvxColorItem* pItem = 0; - if ( bChoiceFromPalette ) + if ( bChoiceFromPalette && nSID == GetSlotId() ) { bChoiceFromPalette = sal_False; switch( nSID ) |