diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-16 16:45:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-17 02:07:43 +0000 |
| commit | ef46917ff3163d3fdd5152bda5d16c4503b6ab69 (patch) | |
| tree | 73271cd339b19964bc91157207565595774e98b5 /include/vcl/metaact.hxx | |
| parent | 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 (diff) | |
Put Polygon from tools under tools:: namespace
Polygon is one of these names that Clash with some system objects
A similar work has been done earlier with PolyPolygon.
Change-Id: Icf2217cb2906292b7275760f1a16be0e150312f5
Reviewed-on: https://gerrit.libreoffice.org/17789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include/vcl/metaact.hxx')
| -rw-r--r-- | include/vcl/metaact.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 2f1f5cecd5d0..84ac05cef8b7 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -338,7 +338,7 @@ class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction private: LineInfo maLineInfo; - Polygon maPoly; + tools::Polygon maPoly; public: MetaPolyLineAction(); @@ -350,13 +350,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - explicit MetaPolyLineAction( const Polygon& ); - explicit MetaPolyLineAction( const Polygon&, const LineInfo& ); + explicit MetaPolyLineAction( const tools::Polygon& ); + explicit MetaPolyLineAction( const tools::Polygon&, const LineInfo& ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const Polygon& GetPolygon() const { return maPoly; } + const tools::Polygon& GetPolygon() const { return maPoly; } const LineInfo& GetLineInfo() const { return maLineInfo; } }; @@ -364,7 +364,7 @@ class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction { private: - Polygon maPoly; + tools::Polygon maPoly; public: MetaPolygonAction(); @@ -376,12 +376,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - explicit MetaPolygonAction( const Polygon& ); + explicit MetaPolygonAction( const tools::Polygon& ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const Polygon& GetPolygon() const { return maPoly; } + const tools::Polygon& GetPolygon() const { return maPoly; } }; class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction |