icon-themes/hicontrast/svx/res/symphony/fill_color.png |binary icon-themes/sifr/svx/res/symphony/fill_color.png |binary svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit 1d48659915580abdc4d5e885608c0d61c79a5046 Author: Maxim Monastirsky <[email protected]> Date: Wed Dec 11 15:32:17 2013 +0200 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/icon-themes/hicontrast/svx/res/symphony/fill_color.png b/icon-themes/hicontrast/svx/res/symphony/fill_color.png index 7cbafa5..20e5081 100644 Binary files a/icon-themes/hicontrast/svx/res/symphony/fill_color.png and b/icon-themes/hicontrast/svx/res/symphony/fill_color.png differ diff --git a/icon-themes/sifr/svx/res/symphony/fill_color.png b/icon-themes/sifr/svx/res/symphony/fill_color.png index 7cbafa5..a53abdd 100644 Binary files a/icon-themes/sifr/svx/res/symphony/fill_color.png and b/icon-themes/sifr/svx/res/symphony/fill_color.png differ diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index dbb63b1..361231e 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);
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
