diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-03 14:31:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-06-04 08:30:24 +0200 |
| commit | 42f771d6e9c02c50acc49f7feb1a9b5d0a9368ae (patch) | |
| tree | 227208438b1723a20842ff8555b1bbb1e8b8ba27 /drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | |
| parent | 1d92933d96d94819fa3a4ae2de9519874f9b92b6 (diff) | |
convert B2DLineJoin to scoped enum
Change-Id: I4fb8f2c9e2080e3aa542d2ccf838e6784baa8429
Diffstat (limited to 'drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 4bcf43602d23..464f4e86c1a2 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -300,7 +300,7 @@ namespace drawinglayer if(nVerSeg) { - if(basegfx::B2DLINEJOIN_ROUND == aLineJoin) + if(basegfx::B2DLineJoin::Round == aLineJoin) { // calculate new horizontal segments const sal_uInt32 nHorSeg(basegfx::fround((fAngle / F_2PI) * (double)nSegments)); @@ -321,29 +321,29 @@ namespace drawinglayer else { // fallback to bevel when there is not at least one segment hor and ver - aLineJoin = basegfx::B2DLINEJOIN_BEVEL; + aLineJoin = basegfx::B2DLineJoin::Bevel; } } - if(basegfx::B2DLINEJOIN_MIDDLE == aLineJoin - || basegfx::B2DLINEJOIN_BEVEL == aLineJoin - || basegfx::B2DLINEJOIN_MITER == aLineJoin) + if(basegfx::B2DLineJoin::Middle == aLineJoin + || basegfx::B2DLineJoin::Bevel == aLineJoin + || basegfx::B2DLineJoin::Miter == aLineJoin) { - if(basegfx::B2DLINEJOIN_MITER == aLineJoin) + if(basegfx::B2DLineJoin::Miter == aLineJoin) { const double fMiterAngle(fAngle/2.0); if(fMiterAngle < fMiterMinimumAngle) { // fallback to bevel when miter's angle is too small - aLineJoin = basegfx::B2DLINEJOIN_BEVEL; + aLineJoin = basegfx::B2DLineJoin::Bevel; } } const double fInc(F_PI / (double)nVerSeg); const double fSin(sin(-fAngle)); const double fCos(cos(-fAngle)); - const bool bMiter(basegfx::B2DLINEJOIN_MITER == aLineJoin); + const bool bMiter(basegfx::B2DLineJoin::Miter == aLineJoin); const double fMiterSin(bMiter ? sin(-(fAngle/2.0)) : 0.0); const double fMiterCos(bMiter ? cos(-(fAngle/2.0)) : 0.0); double fPos(-F_PI2); @@ -547,7 +547,7 @@ namespace drawinglayer const attribute::MaterialAttribute3D aMaterial(getBColor()); static sal_uInt32 nSegments(8); // default for 3d line segments, for more quality just raise this value (in even steps) const bool bClosed(getB3DPolygon().isClosed()); - const bool bNoLineJoin(basegfx::B2DLINEJOIN_NONE == getLineJoin()); + const bool bNoLineJoin(basegfx::B2DLineJoin::NONE == getLineJoin()); const sal_uInt32 nLoopCount(bClosed ? nPointCount : nPointCount - 1); basegfx::B3DPoint aLast(getB3DPolygon().getB3DPoint(nPointCount - 1)); basegfx::B3DPoint aCurr(getB3DPolygon().getB3DPoint(0)); |