diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 13:30:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 11:28:29 +0100 |
commit | c98d3303027bd8bf8e0881b61918710ac479864c (patch) | |
tree | e6843dfd93352f134207cbc482451e8f17266bc2 /extensions | |
parent | 44a485c2baaf5bab81748f992915459bdaa58615 (diff) |
replace Color(COL_*) with COL_*
using
git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
| xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)//g"
and then some manual fixup where the resulting expression no longer
compiled
Change-Id: I0e268d78611c3be40bba9f60ecfdc087a36c0df4
Reviewed-on: https://gerrit.libreoffice.org/50372
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/scanner/grid.cxx | 6 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 89091b8d8df0..30a325bd3ac0 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -455,7 +455,7 @@ void GridWindow::setBoundings(double fMinX, double fMinY, double fMaxX, double f void GridWindow::drawGrid(vcl::RenderContext& rRenderContext) { char pBuf[256]; - rRenderContext.SetLineColor(Color(COL_BLACK)); + rRenderContext.SetLineColor(COL_BLACK); // draw vertical lines for (double fX = m_fMinChunkX; fX < m_fMaxX; fX += m_fChunkX) { @@ -494,7 +494,7 @@ void GridWindow::drawOriginal(vcl::RenderContext& rRenderContext) { if (m_nValues && m_pXValues && m_pOrigYValues) { - rRenderContext.SetLineColor(Color(COL_RED)); + rRenderContext.SetLineColor(COL_RED); for (int i = 0; i < m_nValues - 1; i++) { drawLine(rRenderContext, @@ -509,7 +509,7 @@ void GridWindow::drawNew(vcl::RenderContext& rRenderContext) if (m_nValues && m_pXValues && m_pNewYValues) { rRenderContext.SetClipRegion(vcl::Region(m_aGridArea)); - rRenderContext.SetLineColor(Color(COL_YELLOW)); + rRenderContext.SetLineColor(COL_YELLOW); for (int i = 0; i < m_nValues - 1; i++) { drawLine(rRenderContext, diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index d435b836f588..bfe51fd77bf1 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -952,8 +952,8 @@ void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang { Window::Paint(rRenderContext, rRect); rRenderContext.SetMapMode(MapMode(MapUnit::MapAppFont)); - rRenderContext.SetFillColor(Color(COL_WHITE)); - rRenderContext.SetLineColor(Color(COL_WHITE)); + rRenderContext.SetFillColor(COL_WHITE); + rRenderContext.SetLineColor(COL_WHITE); rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), Size(PREVIEW_WIDTH, PREVIEW_HEIGHT))); rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel)); |