diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-17 21:31:10 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-18 09:11:00 +0100 |
| commit | 8553024059f934aaf8bc488f01869fdc6922c120 (patch) | |
| tree | 139acd2cc2e96f38eed9dd2e721187f43e02c367 /cui/source | |
| parent | 6c53c86f3db0559eeb2bbb69051a8b6fb2863b11 (diff) | |
tdf#130384 cui: fix automatic color showing up as white in the char dlg
Regression from commit b4554b8eddd048532269df610e89ae739c46fab7 (cui:
add UI for semi-transparent shape text, 2019-11-22), the problem was
that COL_AUTO has the alpha channel set to 0xff, and we should not clear
that, otherwise the color list box will present the automatic color as
white.
Change-Id: I6eae788606b003eec014c0c4a22b40053ff534d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88884
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 88ccf7d016b1..c6e4340be1bb 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1563,7 +1563,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) m_aPreviewWin.Invalidate(); Color aRGBColor = aColor; - if (aRGBColor.GetTransparency()) + if (aRGBColor.GetTransparency() && aColor != COL_AUTO) { aRGBColor.SetTransparency(0); } |