svx/source/tbxctrls/tbcontrl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 053e4635d816cb18a6098a58f6d275417a244ac0
Author: Ivan Timofeev <timofeev....@gmail.com>
Date: Sat Sep 14 09:16:28 2013 +0400
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 <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e58ddae..62f2ee2 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
