diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:45:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 09:00:34 +0100 |
| commit | 856c57f20f9b07c686a854e0ccbb6ee3b0ee4791 (patch) | |
| tree | 1f7e1c4b49b20f02ddb464d7e58515af8ce150b1 /cui/source/tabpages/tpcolor.cxx | |
| parent | a498b12dc1723b072a165f8c528c377024fd4c98 (diff) | |
use more Color in cppcanvas..drawinglayer
Change-Id: Ib0f15e8d4c01c1d2059cf32cc882042766d2a682
Reviewed-on: https://gerrit.libreoffice.org/50861
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/tabpages/tpcolor.cxx')
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9afe095ed2a6..b5aa6d0f39ea 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -396,7 +396,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) sal_Int32 nSize = aCustomColorList.getLength(); aCustomColorList.realloc( nSize + 1 ); aCustomColorNameList.realloc( nSize + 1 ); - aCustomColorList[nSize] = aCurrentColor.GetColor(); + aCustomColorList[nSize] = sal_Int32(aCurrentColor); aCustomColorNameList[nSize] = aName; officecfg::Office::Common::UserColors::CustomColor::set(aCustomColorList, batch); officecfg::Office::Common::UserColors::CustomColorName::set(aCustomColorNameList, batch); @@ -629,14 +629,14 @@ void SvxColorTabPage::UpdateColorValues( bool bUpdatePreset ) m_pRcustom->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) ); m_pGcustom->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) ); m_pBcustom->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) ); - m_pHexcustom->SetColor( aCurrentColor.GetColor() ); + m_pHexcustom->SetColor( aCurrentColor ); if( bUpdatePreset ) { m_pRpreset->SetValue( ColorToPercent_Impl( aPreviousColor.GetRed() ) ); m_pGpreset->SetValue( ColorToPercent_Impl( aPreviousColor.GetGreen() ) ); m_pBpreset->SetValue( ColorToPercent_Impl( aPreviousColor.GetBlue() ) ); - m_pHexpreset->SetColor( aPreviousColor.GetColor() ); + m_pHexpreset->SetColor( aPreviousColor ); } } } |