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 /filter/source/graphicfilter/eos2met/eos2met.cxx | |
| parent | Fix GTK3 right-to-left rendering (diff) | |
| download | core-ef46917ff3163d3fdd5152bda5d16c4503b6ab69.tar.gz core-ef46917ff3163d3fdd5152bda5d16c4503b6ab69.zip | |
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 'filter/source/graphicfilter/eos2met/eos2met.cxx')
| -rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index dac76c9efd06..35561956899b 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -207,7 +207,7 @@ private: void METCloseFigure(); void METMove(Point aPt); void METLine(Point aPt1, Point aPt2); - void METLine(const Polygon & rPolygon); + void METLine(const tools::Polygon & rPolygon); void METLine(const tools::PolyPolygon & rPolyPolygon); void METLineAtCurPos(Point aPt); void METBox(bool bFill, bool bBoundary, @@ -297,7 +297,7 @@ void METWriter::WriteClipRect( const Rectangle& rRect ) sal_uInt32 nPathId = ( rRect.IsEmpty() ) ? 0 : 1; if ( nPathId ) { - Polygon aPoly( rRect ); + tools::Polygon aPoly( rRect ); METBeginPath( nPathId ); METLine( aPoly ); METEndPath(); @@ -1289,7 +1289,7 @@ void METWriter::METLine(Point aPt1, Point aPt2) } -void METWriter::METLine(const Polygon & rPolygon) +void METWriter::METLine(const tools::Polygon & rPolygon) { sal_uInt16 nNumPoints,i,j,nOrderPoints; bool bFirstOrder; @@ -1761,8 +1761,8 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) METSetMix(eGDIRasterOp); METSetColor(aGDILineColor); METBeginPath(1); - Polygon aSimplePoly; - const Polygon& rPoly = pA->GetPolygon(); + tools::Polygon aSimplePoly; + const tools::Polygon& rPoly = pA->GetPolygon(); if ( rPoly.HasFlags() ) rPoly.AdaptiveSubdivide( aSimplePoly ); else @@ -1780,8 +1780,8 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) case MetaActionType::POLYGON: { const MetaPolygonAction* pA = static_cast<const MetaPolygonAction*>(pMA); - Polygon aSimplePoly; - const Polygon& rPoly = pA->GetPolygon(); + tools::Polygon aSimplePoly; + const tools::Polygon& rPoly = pA->GetPolygon(); if ( rPoly.HasFlags() ) rPoly.AdaptiveSubdivide( aSimplePoly ); else @@ -1819,7 +1819,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) { if ( aSimplePolyPoly[ i ].HasFlags() ) { - Polygon aSimplePoly; + tools::Polygon aSimplePoly; aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly ); aSimplePolyPoly[ i ] = aSimplePoly; } @@ -1877,7 +1877,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pMA); sal_uInt16 i; OUString aStr; - Polygon aPolyDummy(1); + tools::Polygon aPolyDummy(1); short nOrientation; Point aPt( pA->GetPoint() ); @@ -1930,7 +1930,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) sal_uInt16 i; sal_Int32 nNormSize; OUString aStr; - Polygon aPolyDummy(1); + tools::Polygon aPolyDummy(1); short nOrientation; Point aPt( pA->GetPoint() ); Point aPt2; |