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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/svxfont.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/misc/txtrange.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 3b651644fd45..209480c79105 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -402,7 +402,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD Rectangle aRect( aPnt1, aPnt2 ); if ( pPolyPoly ) { - Polygon aTmpPoly( 4 ); + tools::Polygon aTmpPoly( 4 ); aTmpPoly[0] = aRect.TopLeft(); aTmpPoly[1] = aRect.TopRight(); aTmpPoly[2] = aRect.BottomRight(); diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index a2501865bcfa..1a040606494c 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -73,7 +73,7 @@ void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect, nTop = rRect.Top(); nBottom = rRect.Bottom(); } - Polygon aPoly; + tools::Polygon aPoly; Point aTmp( bLeft ? nLeft : nRight, nMid ); Point aNxt( bLeft ? nRight : nLeft, nTop ); aPoly.Insert( 0, aTmp ); diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index b78163908c2f..be6191ed7445 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -50,7 +50,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, { const basegfx::B2DPolygon aCandidate(rPolyPolygon.getB2DPolygon(i).getDefaultAdaptiveSubdivision()); nPointCount += aCandidate.count(); - mpPolyPolygon->Insert( Polygon(aCandidate), (sal_uInt16)i ); + mpPolyPolygon->Insert( tools::Polygon(aCandidate), (sal_uInt16)i ); } if( pLinePolyPolygon ) @@ -62,7 +62,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, { const basegfx::B2DPolygon aCandidate(pLinePolyPolygon->getB2DPolygon(i).getDefaultAdaptiveSubdivision()); nPointCount += aCandidate.count(); - mpLinePolyPolygon->Insert( Polygon(aCandidate), (sal_uInt16)i ); + mpLinePolyPolygon->Insert( tools::Polygon(aCandidate), (sal_uInt16)i ); } } else @@ -306,7 +306,7 @@ void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly ) nAct = 0; for( sal_uInt16 i = 0; i < rPoly.Count(); ++i ) { - const Polygon& rPol = rPoly[ i ]; + const tools::Polygon& rPol = rPoly[ i ]; nCount = rPol.GetSize(); if( nCount ) { |