summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2012-10-22 20:23:18 +0400
committerStephan Bergmann <sbergman@redhat.com>2012-10-23 06:44:51 +0000
commit5725f17bf8bf240348994ee671ad1a984e701f03 (patch)
treef4728198bc4205ae625628008cb2130ac5ba69c6
parent622cca7e5b2f046c969a95a24ebd897c2d690474 (diff)
fdo#55800: fix hex color conversion
Reviewed-on: https://gerrit.libreoffice.org/895 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 66446668dad9dfb8394fe3e6afcff78662efc63a) Change-Id: I4e60837b3cc557e1df3d7e1312ed083f2b267dde Reviewed-on: https://gerrit.libreoffice.org/897 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--cui/source/dialogs/colorpicker.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 40f73027bb31..9753a2ca9ed8 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1407,8 +1407,8 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
if( aColor != GetColor() )
{
mdRed = ((double)aColor.GetRed()) / 255.0;
- mdGreen = ((double)aColor.GetRed()) / 255.0;
- mdBlue = ((double)aColor.GetRed()) / 255.0;
+ mdGreen = ((double)aColor.GetGreen()) / 255.0;
+ mdBlue = ((double)aColor.GetBlue()) / 255.0;
RGBtoHSV( mdRed, mdGreen, mdBlue, mdHue, mdSat, mdBri );
RGBtoCMYK( mdRed, mdGreen, mdBlue, mdCyan, mdMagenta, mdYellow, mdKey );