diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2013-12-11 15:32:17 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-24 00:05:02 +0000 |
| commit | 1d48659915580abdc4d5e885608c0d61c79a5046 (patch) | |
| tree | 14abc7a25dd4388f7b9f4211750a218b5f93f56e | |
| parent | c5602cfb9d817a2dfbb46c012a4fc5cc0cc444e2 (diff) | |
fdo#71748 Fix also for hicontrast and sifr themes
A follow-up of commit e239f372c6abcd8371d0a666c828bf1c31195dd4.
Didn't notice there is fill_color.png also in these themes.
Also fixed the ugly yellow color flash of paragraph color picker while
initializing the sidebar (introduced by the above commit). This color
picker shows the actual color of a paragraph, so there is no reason to
set some default color there.
Change-Id: I17eed733d1e35ec71c482e3df906523733383e96
Reviewed-on: https://gerrit.libreoffice.org/7035
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | icon-themes/hicontrast/svx/res/symphony/fill_color.png | bin | 3366 -> 3042 bytes | |||
| -rw-r--r-- | icon-themes/sifr/svx/res/symphony/fill_color.png | bin | 3366 -> 483 bytes | |||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/icon-themes/hicontrast/svx/res/symphony/fill_color.png b/icon-themes/hicontrast/svx/res/symphony/fill_color.png Binary files differindex 7cbafa57eb99..20e5081aeae8 100644 --- a/icon-themes/hicontrast/svx/res/symphony/fill_color.png +++ b/icon-themes/hicontrast/svx/res/symphony/fill_color.png diff --git a/icon-themes/sifr/svx/res/symphony/fill_color.png b/icon-themes/sifr/svx/res/symphony/fill_color.png Binary files differindex 7cbafa57eb99..a53abdd2a1e8 100644 --- a/icon-themes/sifr/svx/res/symphony/fill_color.png +++ b/icon-themes/sifr/svx/res/symphony/fill_color.png diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index dbb63b1c9608..361231eb7248 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -346,7 +346,7 @@ void ParaPropertyPanel::InitToolBoxBGColor() const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR); mpTBxBackColor->SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); - mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, nIdBackColor, mpTBxBackColor)); + mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0 /* not defined, default is transparent */, nIdBackColor, mpTBxBackColor)); mpTBxBackColor->SetItemBits( nIdBackColor, mpTBxBackColor->GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY ); Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler); |
