diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-19 16:11:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 07:19:16 +0100 |
| commit | 19a906f09688f06ee90cac2a50126aeba749a331 (patch) | |
| tree | 66320878bd537b646f06afdbf2d2409e961f3024 /cui/source/tabpages/tpcolor.cxx | |
| parent | a7ee3cc31331353d307e4b7aaf7fe88721df6470 (diff) | |
drop Color::SetColor(ColorData) in favour of operator=
first stage of getting rid of ColorData
Change-Id: I5e4e95eb958722814c43c8d1ebfef17ad18c29ec
Reviewed-on: https://gerrit.libreoffice.org/49997
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/tabpages/tpcolor.cxx')
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8234906b3aea..fe6e5118fd23 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -324,9 +324,9 @@ IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) aCurrentColor = Color(m_pHexcustom->GetColor()); else { - aCurrentColor.SetColor ( Color( static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pRcustom->GetValue()) )), + aCurrentColor = Color( static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pRcustom->GetValue()) )), static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pGcustom->GetValue()) )), - static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pBcustom->GetValue()) )) ).GetColor() ); + static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pBcustom->GetValue()) )) ); } UpdateColorValues(); @@ -334,10 +334,10 @@ IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) else { // read current MtrFields, if cmyk, then k-value as transparency - aCurrentColor.SetColor ( Color( static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pKcustom->GetValue()) )), + aCurrentColor = Color( static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pKcustom->GetValue()) )), static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pCcustom->GetValue()) )), static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pYcustom->GetValue()) )), - static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pMcustom->GetValue()) )) ).GetColor() ); + static_cast<sal_uInt8>(PercentToColor_Impl( static_cast<sal_uInt16>(m_pMcustom->GetValue()) )) ); ConvertColorValues (aCurrentColor, ColorModel::RGB); } |