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 /svtools/source/graphic | |
| 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 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 2c9429f01be6..61d587ea089a 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -685,7 +685,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib } else // scaleByAveraging { - const BitmapColor aTrans( pWriteAccess->GetBestMatchingColor( Color( COL_WHITE ) ) ); + const BitmapColor aTrans( pWriteAccess->GetBestMatchingColor( Color(COL_WHITE) ) ); BitmapColor aResultColor( 0 ); double aSum, aCount; @@ -746,7 +746,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib } else { - const BitmapColor aTrans( pWriteAccess->GetBestMatchingColor( Color( COL_WHITE ) ) ); + const BitmapColor aTrans( pWriteAccess->GetBestMatchingColor( Color(COL_WHITE) ) ); BitmapColor aAlphaVal( 0 ); for( long nY = 0; nY < aTargetHeight; nY++ ) @@ -802,8 +802,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( pWriteAccess ) { Bitmap aMsk( rBmpEx.GetMask() ); - const BitmapColor aB( pWriteAccess->GetBestMatchingColor( Color( COL_BLACK ) ) ); - const BitmapColor aW( pWriteAccess->GetBestMatchingColor( Color( COL_WHITE ) ) ); + const BitmapColor aB( pWriteAccess->GetBestMatchingColor( Color(COL_BLACK) ) ); + const BitmapColor aW( pWriteAccess->GetBestMatchingColor( Color(COL_WHITE) ) ); BitmapReadAccess* pMAcc = nullptr; if( !aMsk || ( ( pMAcc = aMsk.AcquireReadAccess() ) != nullptr ) ) @@ -813,7 +813,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib BitmapColor aTestB; if( pMAcc ) - aTestB = pMAcc->GetBestMatchingColor( Color( COL_BLACK ) ); + aTestB = pMAcc->GetBestMatchingColor( Color(COL_BLACK) ); // create new horizontal mapping table for( long nX = 0; nX < aUnrotatedWidth; nX++ ) @@ -1448,7 +1448,7 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, Gra if( ( nAdjustmentFlags & GraphicAdjustmentFlags::ROTATE ) && aAttr.IsRotated() ) { - rBmpEx.Rotate( aAttr.GetRotation(), Color( COL_TRANSPARENT ) ); + rBmpEx.Rotate( aAttr.GetRotation(), COL_TRANSPARENT ); } if( ( nAdjustmentFlags & GraphicAdjustmentFlags::TRANSPARENCY ) && aAttr.IsTransparent() ) @@ -1881,7 +1881,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r AlphaMask( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) ) ); else aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), - aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ).CreateMask( Color(COL_WHITE) ) ); + aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ).CreateMask( COL_WHITE ) ); } } |