summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2013-09-14 09:16:28 +0400
committerAndras Timar <andras.timar@collabora.com>2013-11-05 12:01:05 +0100
commit465e803714b4bdfdcc63c6fb8b8ef9ed53be1730 (patch)
tree59848ca863daf144169c5da69b4d3abca231f30c
parentc3597772449921ce36b676eeaea30f4a355704de (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.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ba1937e66b86..e7468370b4e7 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2543,7 +2543,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
- if ( bChoiceFromPalette )
+ if ( bChoiceFromPalette && nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )