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 /emfio | |
| 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 'emfio')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 2 | ||||
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 26 | ||||
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 6c12078f051e..4dff8d391e0a 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -336,7 +336,7 @@ namespace emfio Bitmap aBmp; WinMtfFillStyle() - : aFillColor(Color(COL_BLACK)) + : aFillColor(COL_BLACK) , bTransparent(false) , aType(WinMtfFillStyleType::Solid) {} diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index b0cef5242839..a6caafd8cfe0 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -566,48 +566,48 @@ namespace emfio { case WHITE_BRUSH : { - maFillStyle = WinMtfFillStyle( Color( COL_WHITE ) ); + maFillStyle = WinMtfFillStyle( COL_WHITE ); mbFillStyleSelected = true; } break; case LTGRAY_BRUSH : { - maFillStyle = WinMtfFillStyle( Color( COL_LIGHTGRAY ) ); + maFillStyle = WinMtfFillStyle( COL_LIGHTGRAY ); mbFillStyleSelected = true; } break; case GRAY_BRUSH : case DKGRAY_BRUSH : { - maFillStyle = WinMtfFillStyle( Color( COL_GRAY ) ); + maFillStyle = WinMtfFillStyle( COL_GRAY ); mbFillStyleSelected = true; } break; case BLACK_BRUSH : { - maFillStyle = WinMtfFillStyle( Color( COL_BLACK ) ); + maFillStyle = WinMtfFillStyle( COL_BLACK ); mbFillStyleSelected = true; } break; case NULL_BRUSH : { - maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); + maFillStyle = WinMtfFillStyle( COL_TRANSPARENT, true ); mbFillStyleSelected = true; } break; case WHITE_PEN : { - maLineStyle = WinMtfLineStyle( Color( COL_WHITE ) ); + maLineStyle = WinMtfLineStyle( COL_WHITE ); } break; case BLACK_PEN : { - maLineStyle = WinMtfLineStyle( Color( COL_BLACK ) ); + maLineStyle = WinMtfLineStyle( COL_BLACK ); } break; case NULL_PEN : { - maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); + maLineStyle = WinMtfLineStyle( COL_TRANSPARENT, true ); } break; default: @@ -1043,8 +1043,8 @@ namespace emfio { maNopFillStyle = maFillStyle; maNopLineStyle = maLineStyle; - maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); - maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); + maFillStyle = WinMtfFillStyle( COL_TRANSPARENT, true ); + maLineStyle = WinMtfLineStyle( COL_TRANSPARENT, true ); mbNopMode = true; } } @@ -1639,7 +1639,7 @@ namespace emfio } pVDev->SetMapMode( aMapMode ); pVDev->SetOutputSizePixel( aSizePixel ); - pVDev->SetFillColor( Color( COL_BLACK ) ); + pVDev->SetFillColor( COL_BLACK ); const tools::PolyPolygon aClip( maClipPath.getClipPath() ); pVDev->DrawPolyPolygon( aClip ); const Point aEmptyPoint; @@ -1691,9 +1691,9 @@ namespace emfio else { // need to blend in Mask quality (1Bit) - Bitmap aMask(aVDevMask.CreateMask(Color(COL_WHITE))); + Bitmap aMask(aVDevMask.CreateMask(COL_WHITE)); - if ( rBitmap.GetTransparentColor() == Color( COL_WHITE ) ) + if ( rBitmap.GetTransparentColor() == COL_WHITE ) { aMask.CombineSimple( rBitmap.GetMask(), BmpCombine::Or ); } diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 97a7f806c764..483c6ba95841 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -846,13 +846,13 @@ namespace emfio case W_META_CREATEBRUSH: { - CreateObject(o3tl::make_unique<WinMtfFillStyle>( Color( COL_WHITE ), false )); + CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false )); } break; case W_META_CREATEPATTERNBRUSH: { - CreateObject(o3tl::make_unique<WinMtfFillStyle>( Color( COL_WHITE ), false )); + CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false )); } break; |