[Libreoffice-commits] core.git: cui/source

[Rishabh Kumar]

 cui/source/tabpages/tpcolor.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3b9cf275138199c3f03ec1d331dfa4e8fb3500bd
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Thu May 26 19:27:43 2016 +0530

    Update CMYK color field correctly
    
    Change-Id: I90f19aa33d619d2177d81376bcdfac13d45e0ca9
    Reviewed-on: https://gerrit.libreoffice.org/25324
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index de43664..8384d3e 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -835,7 +835,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
 
     if( pColorDlg->Execute() == RET_OK )
     {
-        sal_uInt16 nK = 0;
         Color aPreviewColor = pColorDlg->GetColor();
         aCurrentColor = aPreviewColor;
         if (eCM != CM_RGB)
@@ -844,7 +843,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
             m_pC->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
             m_pY->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
             m_pM->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
-            m_pK->SetValue( ColorToPercent_Impl( nK ) );
+            m_pK->SetValue( ColorToPercent_Impl( aCurrentColor.GetTransparency() ) );
             ConvertColorValues (aCurrentColor, CM_RGB);
         }
         else