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 /drawinglayer | |
| parent | 65ca57a447bae97714b1b32aa2df5705215a95ad (diff) | |
convert HatchStyle to scoped enum
Change-Id: Ibef51ae5ae135ae584791959ec3f7bf78c50e2a8
Diffstat (limited to 'drawinglayer')
3 files changed, 9 insertions, 9 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 4407647a7e24..2c5b8d122d1c 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -904,17 +904,17 @@ namespace switch(rHatch.GetStyle()) { - default : // case HATCH_SINGLE : + default : // case HatchStyle::Single : { aHatchStyle = drawinglayer::attribute::HatchStyle::Single; break; } - case HATCH_DOUBLE : + case HatchStyle::Double : { aHatchStyle = drawinglayer::attribute::HatchStyle::Double; break; } - case HATCH_TRIPLE : + case HatchStyle::Triple : { aHatchStyle = drawinglayer::attribute::HatchStyle::Triple; break; diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index d35d7804b8a9..a42be99958e4 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1537,9 +1537,9 @@ namespace drawinglayer // process(rCandidate.get2DDecomposition(getViewInformation2D())); const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)); const HatchStyle aHatchStyle( - attribute::HatchStyle::Single == rFillHatchAttribute.getStyle() ? HATCH_SINGLE : - attribute::HatchStyle::Double == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE : - HATCH_TRIPLE); + attribute::HatchStyle::Single == rFillHatchAttribute.getStyle() ? HatchStyle::Single : + attribute::HatchStyle::Double == rFillHatchAttribute.getStyle() ? HatchStyle::Double : + HatchStyle::Triple); mpOutputDevice->DrawHatch(aToolsPolyPolygon, Hatch(aHatchStyle, diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 365563811e30..c77f6365d7a5 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1122,7 +1122,7 @@ namespace drawinglayer mpOutputDevice->SetLineColor(Color(aHatchColor)); // get hatch style - HatchStyle eHatchStyle(HATCH_SINGLE); + HatchStyle eHatchStyle(HatchStyle::Single); switch(rFillHatchAttributes.getStyle()) { @@ -1132,12 +1132,12 @@ namespace drawinglayer } case attribute::HatchStyle::Double : { - eHatchStyle = HATCH_DOUBLE; + eHatchStyle = HatchStyle::Double; break; } case attribute::HatchStyle::Triple : { - eHatchStyle = HATCH_TRIPLE; + eHatchStyle = HatchStyle::Triple; break; } } |