diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:47:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 10:34:17 +0000 |
| commit | a08cb3b52ea4a071ce8eb5a1786ea45fd211ab78 (patch) | |
| tree | 0667c60e438b660211a3df83c1b411e055b1de61 /include/svx | |
| parent | 62283fed204e05e3f30a8ae703762d7f96c4e88a (diff) | |
convert PolyFlags to scoped enum
and remove the XPolyFlags enum, which has the same values and was being
converted to PolyFlags anyhow
Change-Id: Iaead84933c79a7603698a4e50257dd944df89c41
Reviewed-on: https://gerrit.libreoffice.org/31627
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/xpoly.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index e9fe31f67ff0..430df7b6ffb2 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -22,6 +22,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <svx/svxdllapi.h> #include <o3tl/cow_wrapper.hxx> +#include <tools/poly.hxx> class Point; class Rectangle; @@ -36,15 +37,7 @@ class OutputDevice; #define XPOLY_APPEND 0xFFFF -// point-styles in XPolygon: -// Normal : start-/endpoint of a curve or a line -// Smooth : smooth transition between curves -// Control: control handles of a Bezier curve -// Symmetric : smooth and symmetrical transition between curves - -enum class XPolyFlags { Normal, Smooth, Control, Symmetric }; - -// Class XPolygon;has a point-array and a flag-array, which contains information about a particular point +// Class XPolygon has a point-array and a flag-array, which contains information about a particular point class ImpXPolygon; @@ -77,7 +70,7 @@ public: void SetPointCount( sal_uInt16 nPoints ); sal_uInt16 GetPointCount() const; - void Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ); + void Insert( sal_uInt16 nPos, const Point& rPt, PolyFlags eFlags ); void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); void Move( long nHorzMove, long nVertMove ); @@ -89,8 +82,8 @@ public: XPolygon& operator=( XPolygon&& rXPoly ); bool operator==( const XPolygon& rXPoly ) const; - XPolyFlags GetFlags( sal_uInt16 nPos ) const; - void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ); + PolyFlags GetFlags( sal_uInt16 nPos ) const; + void SetFlags( sal_uInt16 nPos, PolyFlags eFlags ); bool IsControl(sal_uInt16 nPos) const; bool IsSmooth(sal_uInt16 nPos) const; |