diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-09-25 18:02:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-26 08:45:44 +0200 |
| commit | 2c5d5a6d55a1ebd153f05523972a2c625484bde2 (patch) | |
| tree | 20542ccc410b1797ac8405cffbba4f9b165a3e4b /include | |
| parent | a5c830a81077319d753d8cadd857448f0a1952a9 (diff) | |
tools::PolyPolygon -> basegfx in filter
which needed an extra method on OutputDevice.
Also add some utility methods to make future conversion work easier.
Change-Id: I57c5bc7505e656a014f2e723fea2aa79271e6515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basegfx/polygon/b2dpolygon.hxx | 1 | ||||
| -rw-r--r-- | include/basegfx/polygon/b2dpolypolygon.hxx | 1 | ||||
| -rw-r--r-- | include/tools/gen.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx index e74b458ec3af..346b4c587693 100644 --- a/include/basegfx/polygon/b2dpolygon.hxx +++ b/include/basegfx/polygon/b2dpolygon.hxx @@ -78,6 +78,7 @@ namespace basegfx /// Coordinate interface basegfx::B2DPoint const & getB2DPoint(sal_uInt32 nIndex) const; void setB2DPoint(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue); + basegfx::B2DPoint const & operator[](sal_uInt32 nIndex) const { return getB2DPoint(nIndex); } /// Coordinate insert/append void insert(sal_uInt32 nIndex, const basegfx::B2DPoint& rPoint, sal_uInt32 nCount = 1); diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx index 010815c8784e..ee8372d0aeb5 100644 --- a/include/basegfx/polygon/b2dpolypolygon.hxx +++ b/include/basegfx/polygon/b2dpolypolygon.hxx @@ -68,6 +68,7 @@ namespace basegfx B2DPolygon const & getB2DPolygon(sal_uInt32 nIndex) const; void setB2DPolygon(sal_uInt32 nIndex, const B2DPolygon& rPolygon); + B2DPolygon const & operator[](sal_uInt32 nIndex) const { return getB2DPolygon(nIndex); } // test for curve bool areControlPointsUsed() const; diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 4f6927c62f0b..14ded16a8f0a 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -25,6 +25,8 @@ #include <algorithm> #include <ostream> #include <config_options.h> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/range/b2drectangle.hxx> class SvStream; namespace rtl @@ -73,6 +75,7 @@ class SAL_WARN_UNUSED UNLESS_MERGELIBS(SAL_DLLPUBLIC_EXPORT) Point final : prote public: Point() {} Point( long nX, long nY ) : Pair( nX, nY ) {} + Point(basegfx::B2DPoint const & rPoint) : Pair(rPoint.getX(), rPoint.getY()) {} long X() const { return nA; } long Y() const { return nB; } @@ -103,6 +106,8 @@ public: Pair const & toPair() const { return *this; } Pair & toPair() { return *this; } + operator basegfx::B2DPoint() const { return basegfx::B2DPoint(nA, nB); } + using Pair::toString; }; @@ -480,6 +485,8 @@ public: void SaturatingSetX(long x); void SaturatingSetY(long y); + operator basegfx::B2DRectangle() const { return basegfx::B2DRectangle(nLeft, nTop, nRight, nBottom); } + private: long nLeft; long nTop; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 14b03507dfe3..fcf57bb74beb 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -803,6 +803,8 @@ public: */ void DrawPolyLine( const tools::Polygon& rPoly, const LineInfo& rLineInfo ); + void DrawPolyLine( const basegfx::B2DPolygon& rPoly, + const LineInfo& rLineInfo ); // #i101491# // Helper who tries to use SalGDI's DrawPolyLine direct and returns it's bool. |