diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 17:13:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 07:34:27 +0100 |
| commit | e2cb154195fdc2ffccdb6f5e87cae8b29640b3eb (patch) | |
| tree | 7c3d53d78e0867aa879b98d84211d1e73602520f /vcl/workben/vcldemo.cxx | |
| parent | 0ea41fea75cd1ac1d81fa57c4411e75a6b4001f0 (diff) | |
convert COL_ constants to be of type Color
Change-Id: I0e25c8950ac26b851ff42f71e1471fcbe4770d48
Reviewed-on: https://gerrit.libreoffice.org/50373
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/workben/vcldemo.cxx')
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 3b502340bd53..cd65c2c379dc 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -409,7 +409,7 @@ public: std::vector<OUString> aFontNames; - sal_uInt32 const nCols[] = { + Color const nCols[] = { COL_BLACK, COL_BLUE, COL_GREEN, COL_CYAN, COL_RED, COL_MAGENTA, COL_BROWN, COL_GRAY, COL_LIGHTGRAY, COL_LIGHTBLUE, COL_LIGHTGREEN, COL_LIGHTCYAN, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_YELLOW, COL_WHITE @@ -450,7 +450,7 @@ public: nFontColorIndex=(i % aFontNames.size()); } - rDev.SetTextColor(Color(nCols[nFontColorIndex])); + rDev.SetTextColor(nCols[nFontColorIndex]); vcl::Font aFont( aFontNames[nFontIndex], Size(0, nFontHeight )); if (bRotate) @@ -777,13 +777,13 @@ public: if (rCtx.meStyle == RENDER_EXPANDED) { std::vector<tools::Rectangle> aRegions(DemoRenderer::partition(rCtx,5, 4)); - sal_uInt32 nStartCols[] = { + Color nStartCols[] = { COL_RED, COL_RED, COL_RED, COL_GREEN, COL_GREEN, COL_BLUE, COL_BLUE, COL_BLUE, COL_CYAN, COL_CYAN, COL_BLACK, COL_LIGHTGRAY, COL_WHITE, COL_BLUE, COL_CYAN, COL_WHITE, COL_WHITE, COL_WHITE, COL_BLACK, COL_BLACK }; - sal_uInt32 nEndCols[] = { + Color nEndCols[] = { COL_WHITE, COL_WHITE, COL_WHITE, COL_BLACK, COL_BLACK, COL_RED, COL_RED, COL_RED, COL_GREEN, COL_GREEN, COL_GRAY, COL_GRAY, COL_LIGHTGRAY, COL_LIGHTBLUE, COL_LIGHTCYAN, @@ -818,8 +818,8 @@ public: { tools::Rectangle aSub = aRegions[i]; Gradient aGradient; - aGradient.SetStartColor(Color(nStartCols[i])); - aGradient.SetEndColor(Color(nEndCols[i])); + aGradient.SetStartColor(nStartCols[i]); + aGradient.SetEndColor(nEndCols[i]); aGradient.SetStyle(eStyles[i]); aGradient.SetAngle(nAngles[i]); aGradient.SetBorder(nBorders[i]); |