diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 07:51:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 11:47:41 +0200 |
| commit | c9d4a2887c13a5df244022276dd79a5bef8af0ea (patch) | |
| tree | fb849270affd5fca01fa26094c89595d18c6f588 /filter/source/graphicfilter/ios2met/ios2met.cxx | |
| parent | d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c (diff) | |
fdo#82577: Handle PolyPolygon
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.
Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
Diffstat (limited to 'filter/source/graphicfilter/ios2met/ios2met.cxx')
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 89e1c9b6ad4e..cc2d6bbecef7 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -213,7 +213,7 @@ struct OSPalette { struct OSArea { OSArea * pSucc; sal_uInt8 nFlags; - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; bool bClosed; Color aCol; Color aBgCol; @@ -226,7 +226,7 @@ struct OSPath { OSPath* pSucc; sal_uInt32 nID; - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; bool bClosed; bool bStroke; }; @@ -395,7 +395,7 @@ private: bool IsLineInfo(); void DrawPolyLine( const Polygon& rPolygon ); void DrawPolygon( const Polygon& rPolygon ); - void DrawPolyPolygon( const PolyPolygon& rPolygon ); + void DrawPolyPolygon( const tools::PolyPolygon& rPolygon ); sal_uInt16 ReadBigEndianWord(); sal_uLong ReadBigEndian3BytesLong(); sal_uLong ReadLittleEndian3BytesLong(); @@ -493,7 +493,7 @@ void OS2METReader::DrawPolygon( const Polygon& rPolygon ) pVirDev->DrawPolygon( rPolygon ); } -void OS2METReader::DrawPolyPolygon( const PolyPolygon& rPolyPolygon ) +void OS2METReader::DrawPolyPolygon( const tools::PolyPolygon& rPolyPolygon ) { if ( IsLineInfo() ) { @@ -513,7 +513,7 @@ void OS2METReader::AddPointsToArea(const Polygon & rPoly) sal_uInt16 nOldSize, nNewSize,i; if (pAreaStack==NULL || rPoly.GetSize()==0) return; - PolyPolygon * pPP=&(pAreaStack->aPPoly); + tools::PolyPolygon * pPP=&(pAreaStack->aPPoly); if (pPP->Count()==0 || pAreaStack->bClosed) pPP->Insert(rPoly); else { Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); @@ -534,7 +534,7 @@ void OS2METReader::AddPointsToPath(const Polygon & rPoly) sal_uInt16 nOldSize, nNewSize,i; if (pPathStack==NULL || rPoly.GetSize()==0) return; - PolyPolygon * pPP=&(pPathStack->aPPoly); + tools::PolyPolygon * pPP=&(pPathStack->aPPoly); if (pPP->Count()==0 /*|| pPathStack->bClosed==sal_True*/) pPP->Insert(rPoly); else { Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); @@ -1190,7 +1190,7 @@ void OS2METReader::ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize) void OS2METReader::ReadPolygons() { sal_uInt32 i,j,nNumPolys, nNumPoints; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Polygon aPoly; Point aPoint; sal_uInt8 nFlags; |