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 /svx/source/unodraw/unoshap2.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 'svx/source/unodraw/unoshap2.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index ef13bf94dc61..d6f6017470d7 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1164,7 +1164,11 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo -bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, + ::com::sun::star::uno::Any& rValue ) + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1756,7 +1760,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s GeoStat aNewGeo( aCustomShapeGeoData.aGeo ); if ( bMirroredX ) { - Polygon aPol( Rect2Poly( aRect, aNewGeo ) ); + tools::Polygon aPol( Rect2Poly( aRect, aNewGeo ) ); Rectangle aBoundRect( aPol.GetBoundRect() ); Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); @@ -1768,7 +1772,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s MirrorPoint(aPol[i],aRef1,aRef2); } // turn and move polygon - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0]=aPol0[1]; aPol[1]=aPol0[0]; aPol[2]=aPol0[3]; @@ -1778,7 +1782,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s } if ( bMirroredY ) { - Polygon aPol( Rect2Poly( aRectangle, aNewGeo ) ); + tools::Polygon aPol( Rect2Poly( aRectangle, aNewGeo ) ); Rectangle aBoundRect( aPol.GetBoundRect() ); Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); @@ -1790,7 +1794,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s MirrorPoint(aPol[i],aRef1,aRef2); } // turn and move polygon - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0]=aPol0[1]; aPol[1]=aPol0[0]; aPol[2]=aPol0[3]; |