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 /include | |
| parent | 1d92933d96d94819fa3a4ae2de9519874f9b92b6 (diff) | |
convert B2DLineJoin to scoped enum
Change-Id: I4fb8f2c9e2080e3aa542d2ccf838e6784baa8429
Diffstat (limited to 'include')
| -rw-r--r-- | include/basegfx/polygon/b2dlinegeometry.hxx | 2 | ||||
| -rw-r--r-- | include/basegfx/vector/b2enums.hxx | 12 | ||||
| -rw-r--r-- | include/drawinglayer/attribute/lineattribute.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index ca9fb18ad686..534adbef70c2 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -133,7 +133,7 @@ namespace basegfx BASEGFX_DLLPUBLIC B2DPolyPolygon createAreaGeometry( const B2DPolygon& rCandidate, double fHalfLineWidth, - B2DLineJoin eJoin = B2DLINEJOIN_ROUND, + B2DLineJoin eJoin = B2DLineJoin::Round, com::sun::star::drawing::LineCap eCap = com::sun::star::drawing::LineCap_BUTT, double fMaxAllowedAngle = (12.5 * F_PI180), double fMaxPartOfEdge = 0.4, diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx index 80c242ef7862..6383861479a8 100644 --- a/include/basegfx/vector/b2enums.hxx +++ b/include/basegfx/vector/b2enums.hxx @@ -54,13 +54,13 @@ namespace basegfx /** Descriptor for possible line joins between two line segments */ - enum B2DLineJoin + enum class B2DLineJoin { - B2DLINEJOIN_NONE, // no rounding - B2DLINEJOIN_MIDDLE, // calc middle value between joints - B2DLINEJOIN_BEVEL, // join edges with line - B2DLINEJOIN_MITER, // extend till cut - B2DLINEJOIN_ROUND // create arc + NONE, // no rounding + Middle, // calc middle value between joints + Bevel, // join edges with line + Miter, // extend till cut + Round // create arc }; } // end of namespace basegfx diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 7f65e8f6470b..2e45752744c8 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -56,7 +56,7 @@ namespace drawinglayer explicit LineAttribute( const basegfx::BColor& rColor, double fWidth = 0.0, - basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLINEJOIN_ROUND, + basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round, com::sun::star::drawing::LineCap aLineCap = com::sun::star::drawing::LineCap_BUTT); LineAttribute(); LineAttribute(const LineAttribute& rCandidate); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 175405828a3b..bbf0711dbb61 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -805,7 +805,7 @@ public: void DrawPolyLine( const basegfx::B2DPolygon&, double fLineWidth = 0.0, - basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_ROUND, + basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::Round, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); /** Render the given polygon as a line stroke @@ -827,7 +827,7 @@ public: const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, double fTransparency = 0.0, - basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE, + basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::NONE, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT, bool bBypassAACheck = false ); private: |