From 90bbbac25433e09a690c074ec135654c0cc7b4b1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Jul 2017 11:22:12 +0100 Subject: Related: rhbz#1372630 select color from color update, not colortable update Change-Id: Ia8f0925243bad6754eb3628c1f17d6e910c55437 --- svx/source/tbxctrls/tbcontrl.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'svx') diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ac780f01d60e..1da2f75527f2 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1541,11 +1541,13 @@ bool SvxColorWindow::IsNoSelection() const void SvxColorWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent ) { - if ( rEvent.IsEnabled && rEvent.FeatureURL.Complete == ".uno:ColorTableState" - && mrPaletteManager.GetPalette() == 0) + if (rEvent.FeatureURL.Complete == ".uno:ColorTableState") { - mrPaletteManager.ReloadColorSet(*mpColorSet); - mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); + if (rEvent.IsEnabled && mrPaletteManager.GetPalette() == 0) + { + mrPaletteManager.ReloadColorSet(*mpColorSet); + mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); + } } else { -- cgit v1.2.3