diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 10:32:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 16:11:58 +0100 |
| commit | 97448039e1e63f3bd6b61ab3215ede721ca368e4 (patch) | |
| tree | e2ea6d151df11160f2922e9e6c0c8b502a98c2fe /sc/source/filter | |
| parent | e95618d754ee4e75632ed5f2bc29b8a021f45731 (diff) | |
use less RGB_COLORDATA
part of removing ColorData
Change-Id: If31b5b88545529863377e9a178f45f4516bf6cbb
Reviewed-on: https://gerrit.libreoffice.org/50345
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xechart.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/xltools.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index d9c19c679551..b0d0837214f9 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -706,7 +706,7 @@ sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId ) if( maData.mxEscherSet && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) ) { // swap red and blue - Color aColor( RGB_COLORDATA( + Color aColor( Color( COLORDATA_BLUE( nBGRValue ), COLORDATA_GREEN( nBGRValue ), COLORDATA_RED( nBGRValue ) ) ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 0146f42f36df..91774388322c 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2435,9 +2435,9 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con bool bParallel = bRightAngled || (nPerspective == 0); eProjMode = bParallel ? cssd::ProjectionMode_PARALLEL : cssd::ProjectionMode_PERSPECTIVE; // ambient color (Gray 20%) - aAmbientColor = RGB_COLORDATA( 204, 204, 204 ); + aAmbientColor = Color( 204, 204, 204 ); // light color (Gray 60%) - aLightColor = RGB_COLORDATA( 102, 102, 102 ); + aLightColor = Color( 102, 102, 102 ); } else { @@ -2452,9 +2452,9 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con bRightAngled = false; eProjMode = cssd::ProjectionMode_PARALLEL; // ambient color (Gray 30%) - aAmbientColor = RGB_COLORDATA( 179, 179, 179 ); + aAmbientColor = Color( 179, 179, 179 ); // light color (Gray 70%) - aLightColor = RGB_COLORDATA( 76, 76, 76 ); + aLightColor = Color( 76, 76, 76 ); } // properties diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index f70ecfab5a9d..47030af38ddf 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -706,7 +706,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, Color& rColor ) sal_uInt8 nG = rStrm.ReaduInt8(); sal_uInt8 nB = rStrm.ReaduInt8(); rStrm.Ignore( 1 );//nD - rColor = RGB_COLORDATA( nR, nG, nB ); + rColor = Color( nR, nG, nB ); return rStrm; } |