diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-02 09:44:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | 933c0679d64a5585ebfd233180a1a818b493eec5 (patch) | |
| tree | 579f2e3683c219cfe3da7f5ebb90c24d475b570f /vcl | |
| parent | 65ca57a447bae97714b1b32aa2df5705215a95ad (diff) | |
convert HatchStyle to scoped enum
Change-Id: Ibef51ae5ae135ae584791959ec3f7bf78c50e2a8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/hatch.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/hatch.cxx | 4 | ||||
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index cc12e5df5e76..3e7975c82b7c 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -24,7 +24,7 @@ ImplHatch::ImplHatch() : maColor ( COL_BLACK ), - meStyle ( HATCH_SINGLE ), + meStyle ( HatchStyle::Single ), mnDistance ( 1 ), mnAngle ( 0 ) { @@ -114,7 +114,7 @@ SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ) { VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 ); - rOStm.WriteUInt16( rHatch.mpImplHatch->meStyle ); + rOStm.WriteUInt16( (sal_uInt16)rHatch.mpImplHatch->meStyle ); WriteColor( rOStm, rHatch.mpImplHatch->maColor ); rOStm.WriteInt32( rHatch.mpImplHatch->mnDistance ).WriteUInt16( rHatch.mpImplHatch->mnAngle ); diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index ca8ccd1b4240..39312eabea63 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -184,7 +184,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& } while( ( aPt1.X() <= aEndPt1.X() ) && ( aPt1.Y() <= aEndPt1.Y() ) ); - if( ( rHatch.GetStyle() == HATCH_DOUBLE ) || ( rHatch.GetStyle() == HATCH_TRIPLE ) ) + if( ( rHatch.GetStyle() == HatchStyle::Double ) || ( rHatch.GetStyle() == HatchStyle::Triple ) ) { // Double hatch CalcHatchValues( aRect, nWidth, rHatch.GetAngle() + 900, aPt1, aPt2, aInc, aEndPt1 ); @@ -196,7 +196,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& } while( ( aPt1.X() <= aEndPt1.X() ) && ( aPt1.Y() <= aEndPt1.Y() ) ); - if( rHatch.GetStyle() == HATCH_TRIPLE ) + if( rHatch.GetStyle() == HatchStyle::Triple ) { // Triple hatch CalcHatchValues( aRect, nWidth, rHatch.GetAngle() + 450, aPt1, aPt2, aInc, aEndPt1 ); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 01bbefca691d..805ef46d21ba 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -140,7 +140,7 @@ void setupMethodStubs( functor_vector_type& res ) const Image aImage( aBitmapEx ); const Gradient aGradient(GradientStyle_ELLIPTICAL,aBlackColor,aWhiteColor); - const Hatch aHatch(HatchStyle_TRIPLE,aBlackColor,4,450); + const Hatch aHatch(HatchStyle::Triple,aBlackColor,4,450); const Wallpaper aWallpaper( aWhiteColor ); GDIMetaFile aMtf; |