diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:42:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:35:04 +0100 |
| commit | a498b12dc1723b072a165f8c528c377024fd4c98 (patch) | |
| tree | c52b7d01cd95176d345b4ad0bf417edc4c499d26 /extensions/source/propctrlr/standardcontrol.cxx | |
| parent | tdf#116108 Add option to fit images into their cell (diff) | |
| download | core-a498b12dc1723b072a165f8c528c377024fd4c98.tar.gz core-a498b12dc1723b072a165f8c528c377024fd4c98.zip | |
use more Color in editeng..forms
Change-Id: If6c862e7bb61cd78c3379afde11b528a74162900
Reviewed-on: https://gerrit.libreoffice.org/50860
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source/propctrlr/standardcontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 2fdaf166fd27..4bd7c2055d47 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -657,7 +657,7 @@ namespace pcr css::util::Color nColor = sal_uInt32(COL_TRANSPARENT); if (_rValue.hasValue()) _rValue >>= nColor; - getTypedControlWindow()->SelectEntry(::Color(sal_uInt32(nColor))); + getTypedControlWindow()->SelectEntry(nColor); } Any SAL_CALL OColorControl::getValue() @@ -666,7 +666,7 @@ namespace pcr ::Color aRgbCol = getTypedControlWindow()->GetSelectEntryColor(); if (aRgbCol == COL_TRANSPARENT) return aPropValue; - aPropValue <<= static_cast<css::util::Color>(aRgbCol.GetColor()); + aPropValue <<= aRgbCol; return aPropValue; } |