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 /xmloff | |
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 'xmloff')
-rw-r--r-- | xmloff/source/style/TransGradientStyle.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/shadwhdl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 6ff3eb1da0f2..c5e424fb5ed7 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -248,14 +248,14 @@ void XMLTransGradientStyleExport::exportXML( Color aColor; // Transparency start - aColor.SetColor( aGradient.StartColor ); + aColor = aGradient.StartColor; sal_Int32 aStartValue = 100 - static_cast<sal_Int32>(((aColor.GetRed() + 1) * 100) / 255); ::sax::Converter::convertPercent( aOut, aStartValue ); aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START, aStrValue ); // Transparency end - aColor.SetColor( aGradient.EndColor ); + aColor = aGradient.EndColor; sal_Int32 aEndValue = 100 - static_cast<sal_Int32>(((aColor.GetRed() + 1) * 100) / 255); ::sax::Converter::convertPercent( aOut, aEndValue ); aStrValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 0e14ed87fbd1..bccfab9e017d 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -68,7 +68,7 @@ bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue if( !bRet ) return false; - aColor.SetColor(nColor); + aColor = nColor; bColorFound = true; } else if( !bOffsetFound ) |