diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-01-16 19:20:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-17 08:51:14 +0100 |
| commit | 5bbaca6d3ccef10223b8618c25f41b91dd467ffc (patch) | |
| tree | 611640e69168c0f5d28efeb8e6b7f32e06eb2d98 /writerfilter | |
| parent | 50678a771daa6cd5d3414c25930761c65aab4244 (diff) | |
return Color from BGRToRGB
instead of converting at all the call-sites
Change-Id: I4732082fcd4731f6fd46aef197a15564586f0c90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109450
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 074252fd768b..56b586c9e7c5 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -448,10 +448,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap } else if (rProperty.first == "fillBackColor") // fillType will decide, possible it'll be the end color of a gradient. - aFillModel.moColor2.set( - "#" - + OUString::fromUtf8(msfilter::util::ConvertColor(Color( - ColorTransparency, msfilter::util::BGRToRGB(rProperty.second.toInt32()))))); + aFillModel.moColor2.set("#" + + OUString::fromUtf8(msfilter::util::ConvertColor( + msfilter::util::BGRToRGB(rProperty.second.toInt32())))); else if (rProperty.first == "lineColor") aLineColor <<= msfilter::util::BGRToRGB(rProperty.second.toInt32()); else if (rProperty.first == "lineBackColor") @@ -672,10 +671,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap aShadowModel.mbHasShadow = true; } else if (rProperty.first == "shadowColor") - aShadowModel.moColor.set( - "#" - + OUString::fromUtf8(msfilter::util::ConvertColor(Color( - ColorTransparency, msfilter::util::BGRToRGB(rProperty.second.toInt32()))))); + aShadowModel.moColor.set("#" + + OUString::fromUtf8(msfilter::util::ConvertColor( + msfilter::util::BGRToRGB(rProperty.second.toInt32())))); else if (rProperty.first == "shadowOffsetX") // EMUs to points aShadowModel.moOffset.set(OUString::number(rProperty.second.toDouble() / 12700) + "pt"); |