diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-19 08:05:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
| commit | 662700703bebad38ca7ad74ca4eb040fe8b5b676 (patch) | |
| tree | 8e693319a485837c4b621244ced161b19c193302 /vcl | |
| parent | dcefc97c8bd5be9ba229098c32d2a5c73d084163 (diff) | |
convert GRID constants to scoped enum
Change-Id: I73ae63bc5f41f38d1a4e396152808b22e88681d8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/rect.cxx | 12 | ||||
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index 463152be1753..ceb91cdc03d7 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -145,7 +145,7 @@ void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt3 Pop(); } -void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ) +void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, DrawGridFlags nFlags ) { Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() ); aDstRect.Intersection( rRect ); @@ -178,7 +178,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon css::uno::Sequence< sal_Int32 > aVertBuf; css::uno::Sequence< sal_Int32 > aHorzBuf; - if( ( nFlags & GRID_DOTS ) || ( nFlags & GRID_HORZLINES ) ) + if( ( nFlags & DrawGridFlags::Dots ) || ( nFlags & DrawGridFlags::HorzLines ) ) { aVertBuf.realloc( aDstRect.GetHeight() / nDistY + 2L ); aVertBuf[ nVertCount++ ] = nStartY; @@ -188,7 +188,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon } } - if( ( nFlags & GRID_DOTS ) || ( nFlags & GRID_VERTLINES ) ) + if( ( nFlags & DrawGridFlags::Dots ) || ( nFlags & DrawGridFlags::VertLines ) ) { aHorzBuf.realloc( aDstRect.GetWidth() / nDistX + 2L ); aHorzBuf[ nHorzCount++ ] = nStartX; @@ -207,7 +207,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon const bool bOldMap = mbMap; EnableMapMode( false ); - if( nFlags & GRID_DOTS ) + if( nFlags & DrawGridFlags::Dots ) { for( long i = 0L; i < nVertCount; i++ ) { @@ -219,7 +219,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon } else { - if( nFlags & GRID_HORZLINES ) + if( nFlags & DrawGridFlags::HorzLines ) { for( long i = 0L; i < nVertCount; i++ ) { @@ -228,7 +228,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon } } - if( nFlags & GRID_VERTLINES ) + if( nFlags & DrawGridFlags::VertLines ) { for( long i = 0L; i < nHorzCount; i++ ) { diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 946e9e3893f4..7407c51a5fe5 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -759,7 +759,7 @@ void setupMethodStubs( functor_vector_type& res ) boost::bind( &OutputDevice::DrawGrid, _1, - aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES )); + aRect,Size(10,20),DrawGridFlags::HorzLines|DrawGridFlags::VertLines )); /* void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); |