diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-25 11:22:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-25 11:30:14 +0100 |
| commit | 90bbbac25433e09a690c074ec135654c0cc7b4b1 (patch) | |
| tree | 4d23eccef2a8713d9269d240d21d0522039cd9f5 /svx | |
| parent | 31a85a9a13595a9aeae1932ee08c9b09ead384cd (diff) | |
Related: rhbz#1372630 select color from color update, not colortable update
Change-Id: Ia8f0925243bad6754eb3628c1f17d6e910c55437
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
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 { |