diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 15:06:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 11:51:32 +0100 |
| commit | 5564a31c3fe1098fd72635238d33a3dbafb8b62e (patch) | |
| tree | 434a835c4cc04c671834f069b573c82ff414bbca /editeng | |
| parent | 9df0ce081eac287154ea496e9eb299b4bc4fa776 (diff) | |
use less COLORDATA_RGB
part of removing ColorData
Change-Id: I5518cddeeefe66f70380367e1e3f78af0f3b5fbc
Reviewed-on: https://gerrit.libreoffice.org/50486
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 040f1a53fe09..5d3f3370bbde 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3243,15 +3243,14 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_BACK_COLOR: case MID_BACK_COLOR_R_G_B: { - sal_Int32 nCol = 0; - if ( !( rVal >>= nCol ) ) + Color aNewCol; + if ( !( rVal >>= aNewCol ) ) return false; if(MID_BACK_COLOR_R_G_B == nMemberId) { - nCol = COLORDATA_RGB( nCol ); - nCol += aColor.GetColor() & 0xff000000; + aNewCol.SetTransparency(aColor.GetTransparency()); } - aColor = Color( nCol ); + aColor = aNewCol; } break; case MID_BACK_COLOR_TRANSPARENCY: |