diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-11-05 18:58:49 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-11-05 20:32:47 +0100 |
| commit | 13d927267535c0dca3139a50ebf8d5bcfc0df484 (patch) | |
| tree | 117407daff63e2b10c61ee88ba257605d2bbcad0 /include/tools | |
| parent | 48a3359070db7ffbf25b5e4c0cf1840a4673ca3c (diff) | |
(Poly)Polygons: sal_uIntPtr to sal_uInt32/sdt::size_t/enum
Change-Id: I167d656f419ddbeb72960b8510fb8084605d4d5c
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/poly.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index 33cfb5da9528..0471a6840536 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -89,7 +89,7 @@ public: const sal_uInt8* pFlagAry = NULL ); Polygon( const Rectangle& rRect ); Polygon( const Rectangle& rRect, - sal_uIntPtr nHorzRound, sal_uIntPtr nVertRound ); + sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); Polygon( const Point& rCenter, long nRadX, long nRadY, sal_uInt16 nPoints = 0 ); @@ -190,7 +190,13 @@ class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon private: ImplPolyPolygon* mpImplPolyPolygon; - TOOLS_DLLPRIVATE void ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult, sal_uIntPtr nOperation ) const; + enum class PolyClipOp { + INTERSECT, + UNION, + DIFF, + XOR + }; + TOOLS_DLLPRIVATE void ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult, PolyClipOp nOperation ) const; public: PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ); |