diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-05 15:56:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-06 12:47:32 +0100 |
| commit | f9c2bcc8b761f5e21354c0fb7bca6aa432d11ec2 (patch) | |
| tree | a40dbc3e6d1b7476ad93cee29f19590103c4e756 /svx/inc | |
| parent | e1f479af4ddde90f9e80b5079ac759cb9f7743a1 (diff) | |
simplify ImpXPolygon
just use a std::vector<std::pair<Point,PolyFlags>>
Change-Id: I85de832af9095a33bda1620781c3b231a345e07c
Reviewed-on: https://gerrit.libreoffice.org/49275
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/xpolyimp.hxx | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index fd0fe2905d8b..76f4ae24c87f 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -29,26 +29,13 @@ class Point; class ImpXPolygon { public: - Point* pPointAry; - std::unique_ptr<PolyFlags[]> - pFlagAry; - Point* pOldPointAry; - bool bDeleteOldPoints; - sal_uInt16 nSize; - sal_uInt16 nResize; - sal_uInt16 nPoints; - - ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize=16 ); - ImpXPolygon( const ImpXPolygon& rImpXPoly ); - ~ImpXPolygon(); - - bool operator==(const ImpXPolygon& rImpXPoly) const; - - void CheckPointDelete() const; - - void Resize( sal_uInt16 nNewSize, bool bDeletePoints = true ); - void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ); - void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); + std::vector<std::pair<Point, PolyFlags>> mvPointsAndFlags; + ImpXPolygon() = default; + ImpXPolygon(sal_uInt16 nSize) + { + mvPointsAndFlags.resize(nSize); + } + bool operator==(ImpXPolygon const & rOther) const { return mvPointsAndFlags == rOther.mvPointsAndFlags; } }; class ImpXPolyPolygon |