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 /svtools/source/misc/imap.cxx | |
| 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 'svtools/source/misc/imap.cxx')
| -rw-r--r-- | svtools/source/misc/imap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 581d3ee276f2..2b7ff4bc8f64 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -378,7 +378,7 @@ bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj ) ( nRadius == rEqObj.nRadius ) ); } -IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly, +IMapPolygonObject::IMapPolygonObject( const tools::Polygon& rPoly, const OUString& rURL, const OUString& rAltText, const OUString& rDesc, @@ -392,7 +392,7 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly, ImpConstruct( rPoly, bPixelCoords ); } -void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, bool bPixel ) +void IMapPolygonObject::ImpConstruct( const tools::Polygon& rPoly, bool bPixel ) { if ( bPixel ) aPoly = Application::GetDefaultDevice()->PixelToLogic( rPoly, MapMode( MAP_100TH_MM ) ); @@ -457,9 +457,9 @@ bool IMapPolygonObject::IsHit( const Point& rPoint ) const return aPoly.IsInside( rPoint ); } -Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const +tools::Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const { - Polygon aNewPoly; + tools::Polygon aNewPoly; if ( bPixelCoords ) aNewPoly = Application::GetDefaultDevice()->LogicToPixel( aPoly, MapMode( MAP_100TH_MM ) ); @@ -515,7 +515,7 @@ bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) if ( IMapObject::IsEqual( rEqObj ) ) { - const Polygon& rEqPoly = rEqObj.aPoly; + const tools::Polygon& rEqPoly = rEqObj.aPoly; const sal_uInt16 nCount = aPoly.GetSize(); const sal_uInt16 nEqCount = rEqPoly.GetSize(); |