[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/colorpicker.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5725f17bf8bf240348994ee671ad1a984e701f03
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Oct 22 20:23:18 2012 +0400

    fdo#55800: fix hex color conversion
    
    Reviewed-on: https://gerrit.libreoffice.org/895
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 66446668dad9dfb8394fe3e6afcff78662efc63a)
    
    Change-Id: I4e60837b3cc557e1df3d7e1312ed083f2b267dde
    Reviewed-on: https://gerrit.libreoffice.org/897
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 40f7302..9753a2c 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 );