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 /vcl | |
| 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 'vcl')
38 files changed, 239 insertions, 239 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 2b2f7fa37341..9db574ee407b 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1366,7 +1366,7 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c class PolyArgs { public: - PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ); + PolyArgs( tools::PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ); ~PolyArgs(); void AddPoint( long nX, long nY, PolyFlags); @@ -1376,7 +1376,7 @@ public: long GetPosY() const { return maPosition.y;} private: - PolyPolygon& mrPolyPoly; + tools::PolyPolygon& mrPolyPoly; Point* mpPointAry; sal_uInt8* mpFlagAry; @@ -1388,7 +1388,7 @@ private: bool bHasOffline; }; -PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) +PolyArgs::PolyArgs( tools::PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) : mrPolyPoly(rPolyPoly), mnMaxPoints(nMaxPoints), mnPoints(0), @@ -1566,7 +1566,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, } long nMaxPoints = 1 + rOutline.n_points * 3; - PolyPolygon aToolPolyPolygon; + tools::PolyPolygon aToolPolyPolygon; PolyArgs aPolyArg( aToolPolyPolygon, nMaxPoints ); /*int nAngle =*/ ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false ); diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ac64e2bb7b82..20d57534ce7a 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -688,7 +688,7 @@ void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ) } } -void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) +void EMFWriter::ImplWritePolyPolygonRecord( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 n, i, nPolyCount = rPolyPoly.Count(); @@ -737,7 +737,7 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) } } -void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, bool bClosed ) +void EMFWriter::ImplWritePath( const tools::PolyPolygon& rPolyPoly, bool bClosed ) { if ( bClosed ) ImplCheckFillAttr(); @@ -969,7 +969,7 @@ void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const bas for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++) { const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a)); - ImplWritePolyPolygonRecord(PolyPolygon(Polygon(aPolygon))); + ImplWritePolyPolygonRecord(tools::PolyPolygon(Polygon(aPolygon))); } maVDev.SetLineColor(aOldLineColor); @@ -1192,7 +1192,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_TRANSPARENT_ACTION: { - const PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); if( rPolyPoly.Count() ) ImplWritePlusFillPolygonRecord( rPolyPoly[0], static_cast<const MetaTransparentAction*>(pAction)->GetTransparence() ); ImplCheckFillAttr(); diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index bbd86f06bbc5..5bf294a0e323 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -73,9 +73,9 @@ private: void ImplWritePoint( const Point& rPoint ); void ImplWriteSize( const Size& rSize); void ImplWriteRect( const Rectangle& rRect ); - void ImplWritePath( const PolyPolygon& rPolyPoly, bool bClose ); + void ImplWritePath( const tools::PolyPolygon& rPolyPoly, bool bClose ); void ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ); - void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ); + void ImplWritePolyPolygonRecord( const tools::PolyPolygon& rPolyPoly ); void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, sal_uInt32 nROP ); void ImplWriteTextRecord( const Point& rPos, const OUString& rText, const long* pDXArray, sal_uInt32 nWidth ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 010a35efb54e..5b33913dc1ee 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -355,7 +355,7 @@ SvStream& operator>>(SvStream& rInStream, XForm& rXForm) return rInStream; } -static bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) +static bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) { if (nLen == 0) return false; @@ -382,8 +382,8 @@ static bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3 Rectangle aRectangle(Point(nx1, ny1), Point(nx2, ny2)); Polygon aPolygon(aRectangle); - PolyPolygon aPolyPolyOr1(aPolygon); - PolyPolygon aPolyPolyOr2(rPolyPoly); + tools::PolyPolygon aPolyPolyOr1(aPolygon); + tools::PolyPolygon aPolyPolyOr2(rPolyPoly); rPolyPoly.GetUnion(aPolyPolyOr1, aPolyPolyOr2); rPolyPoly = aPolyPolyOr2; } @@ -590,7 +590,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon() if ( pWMF->good() && ( nGesPoints * (sizeof(T)+sizeof(T)) ) <= ( nEndPos - pWMF->Tell() ) ) { // Get polygon points - PolyPolygon aPolyPoly(nPoly, nPoly); + tools::PolyPolygon aPolyPoly(nPoly, nPoly); for (sal_uInt32 i = 0; i < nPoly && pWMF->good(); ++i) { const sal_uInt16 nPointCount(pnPoints[i]); @@ -1149,7 +1149,7 @@ bool EnhWMFReader::ReadEnhWMF() pWMF->ReadInt32(cbRgnData); pWMF->ReadInt32(nClippingMode); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; if (cbRgnData) ImplReadRegion(aPolyPoly, *pWMF, nRecSize); pOut->SetClipPath(aPolyPoly, nClippingMode, false); @@ -1523,7 +1523,7 @@ bool EnhWMFReader::ReadEnhWMF() case EMR_FILLRGN : { sal_uInt32 nLen; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; pWMF->SeekRel( 0x10 ); pWMF->ReadUInt32( nLen ).ReadUInt32( nIndex ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index f0bfad144c85..91d495c305b4 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -47,7 +47,7 @@ void WinMtfClipPath::excludeClipRect( const Rectangle& rRect ) vcl::unotools::b2DRectangleFromRectangle(rRect)); } -void WinMtfClipPath::setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ) +void WinMtfClipPath::setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ) { const basegfx::B2DPolyPolygon& rB2DPoly=rPolyPolygon.getB2DPolyPolygon(); switch ( nClippingMode ) @@ -91,7 +91,7 @@ void WinMtfPathObj::AddPoint( const Point& rPoint ) { if ( bClosed ) Insert( Polygon(), POLYPOLY_APPEND ); - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPoint, POLY_NORMAL ); bClosed = false; } @@ -100,7 +100,7 @@ void WinMtfPathObj::AddPolyLine( const Polygon& rPolyLine ) { if ( bClosed ) Insert( Polygon(), POLYPOLY_APPEND ); - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPolyLine ); bClosed = false; } @@ -111,7 +111,7 @@ void WinMtfPathObj::AddPolygon( const Polygon& rPoly ) bClosed = true; } -void WinMtfPathObj::AddPolyPolygon( const PolyPolygon& rPolyPoly ) +void WinMtfPathObj::AddPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nCount = rPolyPoly.Count(); for ( i = 0; i < nCount; i++ ) @@ -123,7 +123,7 @@ void WinMtfPathObj::ClosePath() { if ( Count() ) { - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; if ( rPoly.GetSize() > 2 ) { Point aFirst( rPoly[ 0 ] ); @@ -497,7 +497,7 @@ Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) return rPolygon; } -PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) +tools::PolyPolygon& WinMtfOutput::ImplScale( tools::PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); for (sal_uInt16 i = 0; i < nPolys; ++i) @@ -507,7 +507,7 @@ PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } -PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) +tools::PolyPolygon& WinMtfOutput::ImplMap( tools::PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); for ( sal_uInt16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) ) ; @@ -636,7 +636,7 @@ void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) vGDIObj.resize(nNewEntrys, NULL); } -void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) +void WinMtfOutput::ImplDrawClippedPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { if ( rPolyPoly.Count() ) { @@ -781,10 +781,10 @@ void WinMtfOutput::MoveClipRegion( const Size& rSize ) aClipPath.moveClipRegion( ImplMap( rSize ) ); } -void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, bool bIsMapped ) +void WinMtfOutput::SetClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, bool bIsMapped ) { mbClipNeedsUpdate = true; - PolyPolygon aPolyPolygon(rPolyPolygon); + tools::PolyPolygon aPolyPolygon(rPolyPolygon); if (!bIsMapped) { @@ -1038,9 +1038,9 @@ void WinMtfOutput::DrawRect( const Rectangle& rRect, bool bEdge ) if ( mbComplexClip ) { Polygon aPoly( ImplMap( rRect ) ); - PolyPolygon aPolyPolyRect( aPoly ); - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPolyRect, aDest ); + tools::PolyPolygon aPolyPolyRect( aPoly ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPolyRect, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1185,9 +1185,9 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) if ( mbComplexClip ) { - PolyPolygon aPolyPoly( rPolygon ); - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPoly, aDest ); + tools::PolyPolygon aPolyPoly( rPolygon ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPoly, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1215,7 +1215,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) if (maLatestFillStyle.aType != FillStylePattern) mpGDIMetaFile->AddAction( new MetaPolygonAction( rPolygon ) ); else { - SvtGraphicFill aFill = SvtGraphicFill( PolyPolygon( rPolygon ), + SvtGraphicFill aFill = SvtGraphicFill( tools::PolyPolygon( rPolygon ), Color(), 0.0, SvtGraphicFill::fillNonZero, @@ -1245,7 +1245,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) } } -void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath ) +void WinMtfOutput::DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon, bool bRecordPath ) { UpdateClipRegion(); @@ -1259,8 +1259,8 @@ void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath if ( mbComplexClip ) { - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( rPolyPolygon, aDest ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( rPolyPolygon, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1516,7 +1516,7 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B aVDev.SetMapMode( aMapMode ); aVDev.SetOutputSizePixel( aSizePixel ); aVDev.SetFillColor( Color( COL_BLACK ) ); - const PolyPolygon aClip( aClipPath.getClipPath() ); + const tools::PolyPolygon aClip( aClipPath.getClipPath() ); aVDev.DrawPolyPolygon( aClip ); const Point aEmptyPoint; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 5ce0dfd93ccf..2989556b41a1 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -287,7 +287,7 @@ class WinMtfClipPath public : WinMtfClipPath(): maClip() {}; - void setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); + void setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); void intersectClipRect( const Rectangle& rRect ); void excludeClipRect( const Rectangle& rRect ); void moveClipRegion( const Size& rSize ); @@ -302,7 +302,7 @@ public : }; }; -class WinMtfPathObj : public PolyPolygon +class WinMtfPathObj : public tools::PolyPolygon { bool bClosed; @@ -322,7 +322,7 @@ public: void AddPoint( const Point& rPoint ); void AddPolygon( const Polygon& rPoly ); void AddPolyLine( const Polygon& rPoly ); - void AddPolyPolygon( const PolyPolygon& rPolyPolygon ); + void AddPolyPolygon( const tools::PolyPolygon& rPolyPolygon ); }; struct WinMtfFontStyle @@ -640,12 +640,12 @@ class WinMtfOutput Rectangle ImplMap( const Rectangle& rRectangle ); void ImplMap( vcl::Font& rFont ); Polygon& ImplMap( Polygon& rPolygon ); - PolyPolygon& ImplMap( PolyPolygon& rPolyPolygon ); + tools::PolyPolygon& ImplMap( tools::PolyPolygon& rPolyPolygon ); Polygon& ImplScale( Polygon& rPolygon ); - PolyPolygon& ImplScale( PolyPolygon& rPolyPolygon ); + tools::PolyPolygon& ImplScale( tools::PolyPolygon& rPolyPolygon ); void ImplResizeObjectArry( sal_uInt32 nNewEntry ); void ImplSetNonPersistentLineColorTransparenz(); - void ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ); + void ImplDrawClippedPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx& rBitmap ); public: @@ -695,7 +695,7 @@ public: void ClearPath(){ aPathObj.Init(); }; void ClosePath(){ aPathObj.ClosePath(); }; - const PolyPolygon& GetPathObj(){ return aPathObj; }; + const tools::PolyPolygon& GetPathObj(){ return aPathObj; }; void MoveTo( const Point& rPoint, bool bRecordPath = false ); void LineTo( const Point& rPoint, bool bRecordPath = false ); @@ -725,7 +725,7 @@ public: //For ReadAndDrawPolygon template compatibility DrawPolygon(rPolygon, bRecordPath); } - void DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath = false ); + void DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon, bool bRecordPath = false ); void DrawPolyLine( Polygon& rPolygon, bool bDrawTo = false, @@ -748,7 +748,7 @@ public: void ExcludeClipRect( const Rectangle& rRect ); void MoveClipRegion( const Size& rSize ); void SetClipPath( - const PolyPolygon& rPolyPoly, + const tools::PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, bool bIsMapped ); diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 821e50b2a1fd..9c818292b1e1 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -348,7 +348,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) // Number of points of each polygon. Determine total number of points boost::scoped_array<sal_uInt16> xPolygonPointCounts(new sal_uInt16[nPolyCount]); sal_uInt16* pnPoints = xPolygonPointCounts.get(); - PolyPolygon aPolyPoly(nPolyCount, nPolyCount); + tools::PolyPolygon aPolyPoly(nPolyCount, nPolyCount); sal_uInt16 nPoints = 0; for (sal_uInt16 a = 0; a < nPolyCount && pWMF->good(); ++a) { @@ -906,7 +906,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pWMF->ReadInt16( nObjIndex ); if ( !nObjIndex ) { - PolyPolygon aEmptyPolyPoly; + tools::PolyPolygon aEmptyPolyPoly; pOut->SetClipPath( aEmptyPolyPoly, RGN_COPY, true ); } } diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 03ac25e6be2e..ee3beebacf70 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -496,7 +496,7 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r aSrcLineColor = Color( COL_TRANSPARENT ); SetLineAndFillAttr(); pVirDev->SetFont( aSrcFont ); - std::vector<PolyPolygon> aPolyPolyVec; + std::vector<tools::PolyPolygon> aPolyPolyVec; if ( pVirDev->GetTextOutlines( aPolyPolyVec, rUniStr ) ) { sal_uInt32 nDXCount = pDXAry ? nStringLen : 0; @@ -519,10 +519,10 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r aMemoryStream.WriteUInt32( nSkipActions ); WMFRecord_Escape( PRIVATE_ESCAPE_UNICODE, nStrmLen, (const sal_Int8*)aMemoryStream.GetData() ); - std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); + std::vector<tools::PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); while ( aIter != aPolyPolyVec.end() ) { - PolyPolygon aPolyPoly( *aIter++ ); + tools::PolyPolygon aPolyPoly( *aIter++ ); aPolyPoly.Move( rPoint.X(), rPoint.Y() ); WMFRecord_PolyPolygon( aPolyPoly ); } @@ -637,13 +637,13 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } -void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) +void WMFWriter::WMFRecord_PolyPolygon(const tools::PolyPolygon & rPolyPoly) { const Polygon * pPoly; sal_uInt16 nCount,nSize,i,j; nCount=rPolyPoly.Count(); - PolyPolygon aSimplePolyPoly( rPolyPoly ); + tools::PolyPolygon aSimplePolyPoly( rPolyPoly ); for ( i = 0; i < nCount; i++ ) { if ( aSimplePolyPoly[ i ].HasFlags() ) diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index 7647a2b5ccb5..93ca0d5ddbe2 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -154,7 +154,7 @@ private: void WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt); void WMFRecord_Polygon(const Polygon & rPoly); void WMFRecord_PolyLine(const Polygon & rPoly); - void WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly); + void WMFRecord_PolyPolygon(const tools::PolyPolygon & rPolyPoly); void WMFRecord_Rectangle(const Rectangle & rRect); void WMFRecord_RestoreDC(); void WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 884845b5a51d..ece13a3cfda5 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2409,7 +2409,7 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, } } -bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) +bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rPolyPoly, nFlags, pProgress ); } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 8ee40c3197d0..1caf85742d6a 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -61,7 +61,7 @@ void ImplReadPoly( SvStream& rIStm, Polygon& rPoly ) ReadPair( rIStm, rPoly[ i ] ); } -void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly ) +void ImplReadPolyPoly( SvStream& rIStm, tools::PolyPolygon& rPolyPoly ) { Polygon aPoly; sal_Int32 nPolyCount; @@ -75,7 +75,7 @@ void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly ) } } -void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly ) +void ImplWritePolyPolyAction( SvStream& rOStm, const tools::PolyPolygon& rPolyPoly ) { const sal_uInt16 nPoly = rPolyPoly.Count(); sal_uInt16 nPoints = 0; @@ -311,7 +311,7 @@ void ImplSkipActions( SvStream& rIStm, sal_uLong nSkipCount ) } } -bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPolyPolygon, bool bOnlyWhenCurve) +bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const tools::PolyPolygon& rPolyPolygon, bool bOnlyWhenCurve) { const sal_uInt16 nPolygonCount(rPolyPolygon.Count()); @@ -391,7 +391,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol return false; } -void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, PolyPolygon& rPolyPoly) +void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, tools::PolyPolygon& rPolyPoly) { rPolyPoly.Clear(); sal_uInt16 nPolygonCount(0); @@ -571,8 +571,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case (GDI_EXTENDEDPOLYGON_ACTION) : { - // read the PolyPolygon in every case - PolyPolygon aInputPolyPolygon; + // read the tools::PolyPolygon in every case + tools::PolyPolygon aInputPolyPolygon; ImplReadExtendedPolyPolygonAction(rIStm, aInputPolyPolygon); // now check if it can be set somewhere @@ -760,7 +760,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_POLYPOLYGON_ACTION ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; ImplReadPolyPoly( rIStm, aPolyPoly ); @@ -1038,7 +1038,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( 3 ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; sal_Int32 nPolyCount; rIStm.ReadInt32( nPolyCount ); @@ -1172,7 +1172,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_TRANSPARENT_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; sal_Int32 nFollowingActionCount; sal_Int16 nTrans; @@ -1207,7 +1207,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_HATCH_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Hatch aHatch; sal_Int32 nFollowingActionCount; @@ -1279,7 +1279,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_GRADIENTEX_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Gradient aGradient; sal_Int32 nFollowingActionCount; @@ -1627,7 +1627,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nCount++; - const PolyPolygon aPolyPolygon(pAct->GetPolygon()); + const tools::PolyPolygon aPolyPolygon(pAct->GetPolygon()); if(ImplWriteExtendedPolyPolygonAction(rOStm, aPolyPolygon, true)) { nCount++; @@ -1675,7 +1675,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nCount++; - const PolyPolygon aPolyPolygon(pAct->GetPolygon()); + const tools::PolyPolygon aPolyPolygon(pAct->GetPolygon()); if(ImplWriteExtendedPolyPolygonAction(rOStm, aPolyPolygon, true)) { nCount++; @@ -2143,10 +2143,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_TRANSPARENT_ACTION ): { - const PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); - const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence(); - const sal_Int16 nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10; - sal_uLong nOldPos, nNewPos; + const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); + const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence(); + const sal_Int16 nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10; + sal_uLong nOldPos, nNewPos; // write transparence comment rOStm.WriteInt16( GDI_TRANSPARENT_COMMENT ); @@ -2264,8 +2264,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_HATCH_ACTION ): { - const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); const Hatch& rHatch = pA->GetHatch(); sal_uLong nOldPos, nNewPos, nAddCount; diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 97cea08278c3..d7ea6092a859 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -69,7 +69,7 @@ namespace { rTarget.AddAction( new MetaPolyPolygonAction( - PolyPolygon(aResult))); + tools::PolyPolygon(aResult))); } } } @@ -105,7 +105,7 @@ namespace // add clipped geometry rTarget.AddAction( new MetaGradientExAction( - PolyPolygon(aResult), + tools::PolyPolygon(aResult), rGradient)); } } @@ -191,7 +191,7 @@ namespace aPixelPoly.transform(aTransform); // to fill the non-covered parts, use the Xor fill rule of - // PolyPolygon painting. Start with a all-covering polygon and + // tools::PolyPolygon painting. Start with a all-covering polygon and // add the clip polygon one basegfx::B2DPolyPolygon aInvertPixelPoly; @@ -693,7 +693,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_POLYPOLYGON_ACTION : { const MetaPolyPolygonAction* pA = static_cast< const MetaPolyPolygonAction* >(pAction); - const PolyPolygon& rPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPoly = pA->GetPolyPolygon(); bDone = handleGeometricContent( aClips.back(), @@ -872,7 +872,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else if(rComment.equalsIgnoreAsciiCase("XPATHFILL_SEQ_BEGIN")) { SvtGraphicFill aFilling; - PolyPolygon aPath; + tools::PolyPolygon aPath; { // read SvtGraphicFill SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ); @@ -896,7 +896,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) if(aResult != aSource) { // add clipped geometry - aFilling.setPath(PolyPolygon(aResult)); + aFilling.setPath(tools::PolyPolygon(aResult)); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -904,7 +904,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else { // exchange with empty polygon - aFilling.setPath(PolyPolygon()); + aFilling.setPath(tools::PolyPolygon()); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -989,7 +989,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_GRADIENTEX_ACTION : { const MetaGradientExAction* pA = static_cast< const MetaGradientExAction* >(pAction); - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); bDone = handleGradientContent( aClips.back(), diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index b631331bad5f..d6b8e51da237 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -874,10 +874,10 @@ Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& r return aRet; } -PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly, const Point& rRotatePt, +tools::PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPolyPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ) { - PolyPolygon aRet( rPolyPoly ); + tools::PolyPolygon aRet( rPolyPoly ); aRet.Rotate( rRotatePt, fSin, fCos ); aRet.Move( rOffset.Width(), rOffset.Height() ); @@ -887,7 +887,7 @@ PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, - const PolyPolygon& rPolyPoly, + const tools::PolyPolygon& rPolyPoly, const Gradient& rGrad ) { // Generate comment, GradientEx and Gradient actions (within DrawGradient) @@ -1212,7 +1212,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) { SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aFill.setPath( ImplGetRotatedPolyPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) ); WriteSvtGraphicFill( aDest, aFill ); @@ -2714,7 +2714,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const case( META_POLYGON_ACTION ): nSizeBytes += static_cast<MetaPolygonAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; case( META_POLYPOLYGON_ACTION ): { - const PolyPolygon& rPolyPoly = static_cast<MetaPolyPolygonAction*>( pAction )->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = static_cast<MetaPolyPolygonAction*>( pAction )->GetPolyPolygon(); for( sal_uInt16 n = 0; n < rPolyPoly.Count(); ++n ) nSizeBytes += ( rPolyPoly[ n ].GetSize() * sizeof( Point ) ); diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 8cfc4e49b2d8..9a53bb638368 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -41,8 +41,8 @@ SvtGraphicStroke::SvtGraphicStroke() : } SvtGraphicStroke::SvtGraphicStroke( const Polygon& rPath, - const PolyPolygon& rStartArrow, - const PolyPolygon& rEndArrow, + const tools::PolyPolygon& rStartArrow, + const tools::PolyPolygon& rEndArrow, double fTransparency, double fStrokeWidth, CapType aCap, @@ -66,12 +66,12 @@ void SvtGraphicStroke::getPath( Polygon& rPath ) const rPath = maPath; } -void SvtGraphicStroke::getStartArrow( PolyPolygon& rPath ) const +void SvtGraphicStroke::getStartArrow( tools::PolyPolygon& rPath ) const { rPath = maStartArrow; } -void SvtGraphicStroke::getEndArrow( PolyPolygon& rPath ) const +void SvtGraphicStroke::getEndArrow( tools::PolyPolygon& rPath ) const { rPath = maEndArrow; } @@ -91,12 +91,12 @@ void SvtGraphicStroke::setPath( const Polygon& rPoly ) maPath = rPoly; } -void SvtGraphicStroke::setStartArrow( const PolyPolygon& rPoly ) +void SvtGraphicStroke::setStartArrow( const tools::PolyPolygon& rPoly ) { maStartArrow = rPoly; } -void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) +void SvtGraphicStroke::setEndArrow( const tools::PolyPolygon& rPoly ) { maEndArrow = rPoly; } @@ -181,7 +181,7 @@ SvtGraphicFill::SvtGraphicFill() : { } -SvtGraphicFill::SvtGraphicFill( const PolyPolygon& rPath, +SvtGraphicFill::SvtGraphicFill( const tools::PolyPolygon& rPath, Color aFillColor, double fTransparency, FillRule aFillRule, @@ -212,7 +212,7 @@ SvtGraphicFill::SvtGraphicFill( const PolyPolygon& rPath, { } -void SvtGraphicFill::getPath( PolyPolygon& rPath ) const +void SvtGraphicFill::getPath( tools::PolyPolygon& rPath ) const { rPath = maPath; } @@ -234,7 +234,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const rGraphic = maFillGraphic; } -void SvtGraphicFill::setPath( const PolyPolygon& rPath ) +void SvtGraphicFill::setPath( const tools::PolyPolygon& rPath ) { maPath = rPath; } diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index e4ba7fcdb0d7..6b8c06fbbb05 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -639,7 +639,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, if( pRAcc ) { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; double fPercent = 0.0; double fPercentStep_2 = 0.0; const long nWidth = pRAcc->Width(); @@ -731,7 +731,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, } bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, - PolyPolygon& rPolyPoly, + tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { boost::scoped_ptr<Bitmap> pBmp(new Bitmap( rMonoBmp )); @@ -824,11 +824,11 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, return bRet; } -void ImplVectorizer::ImplLimitPolyPoly( PolyPolygon& rPolyPoly ) +void ImplVectorizer::ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly ) { if( rPolyPoly.Count() > VECT_POLY_MAX ) { - PolyPolygon aNewPolyPoly; + tools::PolyPolygon aNewPolyPoly; long nReduce = 0; sal_uInt16 nNewCount; @@ -943,7 +943,7 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r return pMap; } -void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) +void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) { const long nWidth = pMap->Width(), nHeight= pMap->Height(); diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index f903dcdd44c0..f36f3c169067 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -34,10 +34,10 @@ class ImplVectorizer private: ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ); - void ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); + void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ); bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const; - void ImplLimitPolyPoly( PolyPolygon& rPolyPoly ); + void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly ); public: @@ -46,7 +46,7 @@ public: bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ); - bool ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, + bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ); }; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index a5c5cf61f400..670f1694b75e 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -996,7 +996,7 @@ MetaPolyPolygonAction::MetaPolyPolygonAction() : MetaPolyPolygonAction::~MetaPolyPolygonAction() {} -MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : +MetaPolyPolygonAction::MetaPolyPolygonAction( const tools::PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), maPolyPoly ( rPolyPoly ) {} @@ -2252,7 +2252,7 @@ MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) {} -MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : +MetaGradientExAction::MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), maPolyPoly ( rPolyPoly ), maGradient ( rGradient ) @@ -2300,7 +2300,7 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, STREAM_WRITE, 1); // #i105373# see comment at MetaTransparentAction::Write - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -2321,7 +2321,7 @@ MetaHatchAction::MetaHatchAction() : MetaHatchAction::~MetaHatchAction() {} -MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : +MetaHatchAction::MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), maPolyPoly ( rPolyPoly ), maHatch ( rHatch ) @@ -2362,7 +2362,7 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, STREAM_WRITE, 1); // #i105373# see comment at MetaTransparentAction::Write - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -3235,7 +3235,7 @@ MetaTransparentAction::MetaTransparentAction() : MetaTransparentAction::~MetaTransparentAction() {} -MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : +MetaTransparentAction::MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), maPolyPoly ( rPolyPoly ), mnTransPercent ( nTransPercent ) @@ -3275,7 +3275,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 1); - // #i105373# The PolyPolygon in this action may be a curve; this + // #i105373# The tools::PolyPolygon in this action may be a curve; this // was ignored until now what is an error. To make older office // versions work with MetaFiles, i opt for applying AdaptiveSubdivide // to the PolyPoylgon. @@ -3284,7 +3284,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) // correctly, but not here :-( ). // The golden solution would be to combine both, but i think it's // not necessary; a good subdivision will be sufficient. - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -3566,12 +3566,12 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) aPath.Move( nXMove, nYMove ); aStroke.setPath( aPath ); - PolyPolygon aStartArrow; + tools::PolyPolygon aStartArrow; aStroke.getStartArrow(aStartArrow); aStartArrow.Move(nXMove, nYMove); aStroke.setStartArrow(aStartArrow); - PolyPolygon aEndArrow; + tools::PolyPolygon aEndArrow; aStroke.getEndArrow(aEndArrow); aEndArrow.Move(nXMove, nYMove); aStroke.setEndArrow(aEndArrow); @@ -3583,7 +3583,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aPath.Move( nXMove, nYMove ); aFill.setPath( aPath ); @@ -3623,7 +3623,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) { SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aPath.Scale( fXScale, fYScale ); aFill.setPath( aPath ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index c0f0a695abed..b399d7acefa4 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -166,7 +166,7 @@ void PDFWriter::DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo ) pImplementation->drawPolyLine( rPoly, rInfo ); } -void PDFWriter::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) +void PDFWriter::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { pImplementation->drawPolyPolygon( rPolyPoly ); } @@ -186,7 +186,7 @@ void PDFWriter::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const pImplementation->drawBitmap( rDestPt, rDestSize, rBitmap ); } -void PDFWriter::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void PDFWriter::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { pImplementation->drawHatch( rPolyPoly, rHatch ); } @@ -196,7 +196,7 @@ void PDFWriter::DrawGradient( const Rectangle& rRect, const Gradient& rGradient pImplementation->drawGradient( rRect, rGradient ); } -void PDFWriter::DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) +void PDFWriter::DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { pImplementation->push(PUSH_CLIPREGION); pImplementation->setClipRegion( rPolyPoly.getB2DPolyPolygon() ); @@ -209,7 +209,7 @@ void PDFWriter::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpap pImplementation->drawWallpaper( rRect, rWallpaper ); } -void PDFWriter::DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) +void PDFWriter::DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { pImplementation->drawTransparent( rPolyPoly, nTransparencePercent ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 100685d62aef..96133718a415 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1547,7 +1547,7 @@ void PDFWriterImpl::PDFPage::appendPolygon( const basegfx::B2DPolygon& rPoly, OS } } -void PDFWriterImpl::PDFPage::appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose ) const +void PDFWriterImpl::PDFPage::appendPolyPolygon( const tools::PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose ) const { sal_uInt16 nPolygons = rPolyPoly.Count(); for( sal_uInt16 n = 0; n < nPolygons; n++ ) @@ -7708,7 +7708,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool // write eventual emphasis marks if( m_aCurrentPDFState.m_aFont.GetEmphasisMark() & EMPHASISMARK_STYLE ) { - PolyPolygon aEmphPoly; + tools::PolyPolygon aEmphPoly; Rectangle aEmphRect1; Rectangle aEmphRect2; long nEmphYOff; @@ -7795,7 +7795,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool } void PDFWriterImpl::drawEmphasisMark( long nX, long nY, - const PolyPolygon& rPolyPoly, bool bPolyLine, + const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { // TODO: pass nWidth as width of this mark @@ -7811,7 +7811,7 @@ void PDFWriterImpl::drawEmphasisMark( long nX, long nY, } else { - PolyPolygon aPolyPoly = rPolyPoly; + tools::PolyPolygon aPolyPoly = rPolyPoly; aPolyPoly.Move( nX, nY ); drawPolyPolygon( aPolyPoly ); } @@ -8539,7 +8539,7 @@ void PDFWriterImpl::drawPolygon( const Polygon& rPoly ) writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly ) +void PDFWriterImpl::drawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { MARK( "drawPolyPolygon" ); @@ -8564,7 +8564,7 @@ void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly ) writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ) +void PDFWriterImpl::drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ) { DBG_ASSERT( nTransparentPercent <= 100, "invalid alpha value" ); nTransparentPercent = nTransparentPercent % 100; @@ -10313,7 +10313,7 @@ void PDFWriterImpl::drawGradient( const Rectangle& rRect, const Gradient& rGradi writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void PDFWriterImpl::drawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { MARK( "drawHatch" ); @@ -10321,7 +10321,7 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch if( rPolyPoly.Count() ) { - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME ); push( PUSH_LINECOLOR ); diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 655881de8ade..96e096136241 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -149,7 +149,7 @@ public: // appends a polygon optionally closing it void appendPolygon( const basegfx::B2DPolygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const tools::PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // converts a length (either vertical or horizontal; this @@ -1017,7 +1017,7 @@ i12626 bool checkEmitStructure(); /* draws an emphasis mark */ - void drawEmphasisMark( long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + void drawEmphasisMark( long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); /* true if PDF/A-1a or PDF/A-1b is output */ bool m_bIsPDF_A1; @@ -1057,7 +1057,7 @@ i12626 bool prepareEncryption( const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); // helper for playMetafile - void implWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, + void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice* pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& ); void implWriteBitmapEx( const Point& rPoint, const Size& rSize, const BitmapEx& rBitmapEx, VirtualDevice* pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& ); @@ -1216,7 +1216,7 @@ public: void drawLine( const Point& rStart, const Point& rStop ); void drawLine( const Point& rStart, const Point& rStop, const LineInfo& rInfo ); void drawPolygon( const Polygon& rPoly ); - void drawPolyPolygon( const PolyPolygon& rPolyPoly ); + void drawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void drawPolyLine( const Polygon& rPoly ); void drawPolyLine( const Polygon& rPoly, const LineInfo& rInfo ); void drawPolyLine( const Polygon& rPoly, const PDFWriter::ExtLineInfo& rInfo ); @@ -1233,9 +1233,9 @@ public: void drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const Size& rSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask ); void drawGradient( const Rectangle& rRect, const Gradient& rGradient ); - void drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); + void drawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); void drawWallpaper( const Rectangle& rRect, const Wallpaper& rWall ); - void drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ); + void drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ); void beginTransparencyGroup(); void endTransparencyGroup( const Rectangle& rBoundingBox, sal_uInt32 nTransparentPercent ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 686ebd4b1eab..3c0aaf7f76b5 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); -void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, +void PDFWriterImpl::implWriteGradient( const tools::PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { GDIMetaFile aTmpMtf; @@ -362,7 +362,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } else { - const PolyPolygon aPolyPoly( pA->GetRect() ); + const tools::PolyPolygon aPolyPoly( pA->GetRect() ); implWriteGradient( aPolyPoly, rGradient, pDummyVDev, i_rContext ); } } @@ -562,8 +562,8 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa Polygon aPath; aStroke.getPath( aPath ); - PolyPolygon aStartArrow; - PolyPolygon aEndArrow; + tools::PolyPolygon aStartArrow; + tools::PolyPolygon aEndArrow; double fTransparency( aStroke.getTransparency() ); double fStrokeWidth( aStroke.getStrokeWidth() ); SvtGraphicStroke::DashArray aDashArray; @@ -649,7 +649,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa double fTransparency = aFill.getTransparency(); if ( fTransparency == 0.0 ) { - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); bSkipSequence = true; @@ -733,7 +733,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } // draw polypolygon with pattern fill - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); m_rOuterFace.DrawPolyPolygon( aPath, nPattern, aFill.getFillRule() == SvtGraphicFill::fillEvenOdd ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 3951e5720da3..ae62b3953d1d 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -247,7 +247,7 @@ void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, } } -void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, +void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // #110958# Disable alpha VDev, we perform the necessary diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 3f838f129c7c..c8e0524518db 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -790,7 +790,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } case META_POLYPOLYGON_ACTION: { - const PolyPolygon aPoly( + const tools::PolyPolygon aPoly( static_cast<const MetaPolyPolygonAction*>(pCurrAct)->GetPolyPolygon()); if( aPoly.Count() != 1 || !basegfx::tools::isRectangle( diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index cf011f1c37f6..3f56d0ef6891 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -37,7 +37,7 @@ namespace /** Return <TRUE/> when the given polygon is rectiliner and oriented so that all sides are either horizontal or vertical. */ - bool ImplIsPolygonRectilinear (const PolyPolygon& rPolyPoly) + bool ImplIsPolygonRectilinear (const tools::PolyPolygon& rPolyPoly) { // Iterate over all polygons. const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -82,7 +82,7 @@ namespace A new RegionBand object is returned that contains the bands that represent the given poly-polygon. */ - RegionBand* ImplRectilinearPolygonToBands(const PolyPolygon& rPolyPoly) + RegionBand* ImplRectilinearPolygonToBands(const tools::PolyPolygon& rPolyPoly) { OSL_ASSERT(ImplIsPolygonRectilinear (rPolyPoly)); @@ -180,7 +180,7 @@ namespace /** Convert a general polygon (one for which ImplIsPolygonRectilinear() returns <FALSE/>) to bands. */ - RegionBand* ImplGeneralPolygonToBands(const PolyPolygon& rPolyPoly, const Rectangle& rPolygonBoundingBox) + RegionBand* ImplGeneralPolygonToBands(const tools::PolyPolygon& rPolyPoly, const Rectangle& rPolygonBoundingBox) { long nLineID = 0L; @@ -229,7 +229,7 @@ bool vcl::Region::IsEmpty() const } -RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) +RegionBand* ImplCreateRegionBandFromPolyPolygon(const tools::PolyPolygon& rPolyPolygon) { RegionBand* pRetval = 0; @@ -237,7 +237,7 @@ RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) { // ensure to subdivide when bezier segemnts are used, it's going to // be expanded to rectangles - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; rPolyPolygon.AdaptiveSubdivide(aPolyPolygon); @@ -277,9 +277,9 @@ RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) return pRetval; } -PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const +tools::PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const { - PolyPolygon aRetval; + tools::PolyPolygon aRetval; if(getRegionBand()) { @@ -301,7 +301,7 @@ PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const basegfx::B2DPolyPolygon vcl::Region::ImplCreateB2DPolyPolygonFromRegionBand() const { - PolyPolygon aPoly(ImplCreatePolyPolygonFromRegionBand()); + tools::PolyPolygon aPoly(ImplCreatePolyPolygonFromRegionBand()); return aPoly.getB2DPolyPolygon(); } @@ -336,7 +336,7 @@ Region::Region(const Polygon& rPolygon) } } -Region::Region(const PolyPolygon& rPolyPoly) +Region::Region(const tools::PolyPolygon& rPolyPoly) : mpB2DPolyPolygon(), mpPolyPolygon(), mpRegionBand(), @@ -374,7 +374,7 @@ Region::~Region() { } -void vcl::Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) +void vcl::Region::ImplCreatePolyPolyRegion( const tools::PolyPolygon& rPolyPoly ) { const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -392,7 +392,7 @@ void vcl::Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) } else { - mpPolyPolygon.reset(new PolyPolygon(rPolyPoly)); + mpPolyPolygon.reset(new tools::PolyPolygon(rPolyPoly)); } mbIsNull = false; @@ -434,11 +434,11 @@ void vcl::Region::Move( long nHorzMove, long nVertMove ) } else if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); aPoly.Move(nHorzMove, nVertMove); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } else if(getRegionBand()) @@ -481,11 +481,11 @@ void vcl::Region::Scale( double fScaleX, double fScaleY ) } else if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); aPoly.Scale(fScaleX, fScaleY); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } else if(getRegionBand()) @@ -629,7 +629,7 @@ bool vcl::Region::Intersect( const Rectangle& rRect ) } else // if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); // use the PolyPolygon::Clip method for rectangles, this is // fairly simple (does not even use GPC) and saves us from @@ -637,7 +637,7 @@ bool vcl::Region::Intersect( const Rectangle& rRect ) aPoly.Clip(rRect); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } @@ -1276,7 +1276,7 @@ Rectangle vcl::Region::GetBoundRect() const return Rectangle(); } -const PolyPolygon vcl::Region::GetAsPolyPolygon() const +const tools::PolyPolygon vcl::Region::GetAsPolyPolygon() const { if(getPolyPolygon()) { @@ -1286,8 +1286,8 @@ const PolyPolygon vcl::Region::GetAsPolyPolygon() const if(getB2DPolyPolygon()) { // the polygon needs to be converted, buffer the down converion - const PolyPolygon aPolyPolgon(*getB2DPolyPolygon()); - const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const tools::PolyPolygon aPolyPolgon(*getB2DPolyPolygon()); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new tools::PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } @@ -1295,13 +1295,13 @@ const PolyPolygon vcl::Region::GetAsPolyPolygon() const if(getRegionBand()) { // the BandRegion needs to be converted, buffer the converion - const PolyPolygon aPolyPolgon(ImplCreatePolyPolygonFromRegionBand()); - const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const tools::PolyPolygon aPolyPolgon(ImplCreatePolyPolygonFromRegionBand()); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new tools::PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } - return PolyPolygon(); + return tools::PolyPolygon(); } const basegfx::B2DPolyPolygon vcl::Region::GetAsB2DPolyPolygon() const @@ -1339,7 +1339,7 @@ const RegionBand* vcl::Region::GetAsRegionBand() const if(getB2DPolyPolygon()) { // convert B2DPolyPolygon to RegionBand, buffer it and return it - const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(PolyPolygon(*getB2DPolyPolygon()))); + const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(tools::PolyPolygon(*getB2DPolyPolygon()))); } else if(getPolyPolygon()) { @@ -1593,7 +1593,7 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion) if(bHasPolyPolygon) { - PolyPolygon* pNewPoly = new PolyPolygon(); + tools::PolyPolygon* pNewPoly = new tools::PolyPolygon(); ReadPolyPolygon( rIStrm, *pNewPoly ); rRegion.mpPolyPolygon.reset(pNewPoly); } @@ -1669,7 +1669,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const vcl::Region& rRegion ) if(bHasPolyPolygon) { // #i105373# - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; rRegion.GetAsPolyPolygon().AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStrm, aNoCurvePolyPolygon ); @@ -1746,7 +1746,7 @@ static inline bool ImplPolygonRectTest( const Polygon& rPoly, Rectangle* pRectOu return bIsRect; } -vcl::Region vcl::Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) +vcl::Region vcl::Region::GetRegionFromPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { //return vcl::Region( rPolyPoly ); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index fe1e901d75fc..7b83d0460407 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -269,7 +269,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const return aSysFontData; } -void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, +void OutputDevice::ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, @@ -1845,7 +1845,7 @@ void ImplFontMetricData::ImplInitAboveTextLineSize() } void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, - const PolyPolygon& rPolyPoly, bool bPolyLine, + const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { if( IsRTLEnabled() ) @@ -1865,7 +1865,7 @@ void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, } else { - PolyPolygon aPolyPoly = rPolyPoly; + tools::PolyPolygon aPolyPoly = rPolyPoly; aPolyPoly.Move( nX, nY ); DrawPolyPolygon( aPolyPoly ); } @@ -1897,7 +1897,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) EnableMapMode( false ); FontEmphasisMark nEmphasisMark = ImplGetEmphasisMarkStyle( maFont ); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Rectangle aRect1; Rectangle aRect2; long nEmphasisYOff; diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 50a679c56ce2..e1a423abb0dd 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -31,14 +31,14 @@ void OutputDevice::DrawGradient( const Rectangle& rRect, const Gradient& rGradient ) { - // Convert rectangle to a PolyPolygon by first converting to a Polygon + // Convert rectangle to a tools::PolyPolygon by first converting to a Polygon Polygon aPolygon ( rRect ); - PolyPolygon aPolyPoly ( aPolygon ); + tools::PolyPolygon aPolyPoly ( aPolygon ); DrawGradient ( aPolyPoly, rGradient ); } -void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, +void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { if ( mnDrawMode & DRAWMODE_NOGRADIENT ) @@ -120,7 +120,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, if( !mbOutputClipped ) { - PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel( rPolyPoly ) ); + tools::PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel( rPolyPoly ) ); // draw gradients without border if( mbLineColor || mbInitLineColor ) @@ -177,7 +177,7 @@ namespace void OutputDevice::DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, - bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const tools::PolyPolygon* pClipPolyPoly ) { // get BoundRect of rotated rectangle Rectangle aRect; @@ -372,7 +372,7 @@ void OutputDevice::DrawLinearGradient( const Rectangle& rRect, void OutputDevice::DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, - bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const tools::PolyPolygon* pClipPolyPoly ) { // Determine if we output via Polygon or PolyPolygon // For all rasteroperations other then Overpaint always use PolyPolygon, @@ -380,7 +380,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, // Also for printers always use PolyPolygon, as not all printers // can print polygons on top of each other. - boost::scoped_ptr<PolyPolygon> pPolyPoly; + boost::scoped_ptr<tools::PolyPolygon> pPolyPoly; Rectangle aRect; Point aCenter; Color aStartCol( rGradient.GetStartColor() ); @@ -399,7 +399,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, rGradient.GetBoundRect( rRect, aRect, aCenter ); if ( UsePolyPolygonForComplexGradient() || bMtf ) - pPolyPoly.reset(new PolyPolygon( 2 )); + pPolyPoly.reset(new tools::PolyPolygon( 2 )); // last parameter - true if complex gradient, false if linear long nStepCount = GetGradientSteps( rGradient, rRect, bMtf, true ); @@ -486,7 +486,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); - // either slow PolyPolygon output or fast Polygon-Paiting + // either slow tools::PolyPolygon output or fast Polygon-Paiting if( pPolyPoly ) { bPaintLastPolygon = true; // #107349# Paint last polygon only if loop has generated any output diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index eff7bd482e6f..2e72fa2124ef 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -41,7 +41,7 @@ extern "C" int SAL_CALL HatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } -void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { Hatch aHatch( rHatch ); @@ -93,7 +93,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch if( rPolyPoly.Count() ) { - PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); + tools::PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); GDIMetaFile* pOldMetaFile = mpMetaFile; bool bOldMap = mbMap; @@ -115,11 +115,11 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch mpAlphaVDev->DrawHatch( rPolyPoly, rHatch ); } -void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& rHatch, +void OutputDevice::AddHatchActions( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, GDIMetaFile& rMtf ) { - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME | POLY_OPTIMIZE_CLOSE ); if( aPolyPoly.Count() ) @@ -135,7 +135,7 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r } } -void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ) +void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ) { if(rPolyPoly.Count()) { @@ -153,7 +153,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, if(bIsCurve) { OSL_ENSURE(false, "DrawHatch does *not* support curves, falling back to AdaptiveSubdivide()..."); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; rPolyPoly.AdaptiveSubdivide(aPolyPoly); DrawHatch(aPolyPoly, rHatch, bMtf); @@ -315,7 +315,7 @@ void OutputDevice::CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt } } -void OutputDevice::DrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, +void OutputDevice::DrawHatchLine( const Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ) { double fX, fY; diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 2a6ceb7d51a4..125b8e33345b 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -581,12 +581,12 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } -PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const +tools::PolyPolygon OutputDevice::ImplLogicToDevicePixel( const tools::PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1038,13 +1038,13 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } -PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const +tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1205,14 +1205,14 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } -PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, +tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { if ( rMapMode.IsDefault() ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1351,13 +1351,13 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } -PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const +tools::PolyPolygon OutputDevice::PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const { if ( !mbMap ) return rDevicePolyPoly; - PolyPolygon aPolyPoly( rDevicePolyPoly ); + tools::PolyPolygon aPolyPoly( rDevicePolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1514,14 +1514,14 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } -PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, +tools::PolyPolygon OutputDevice::PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const { if ( rMapMode.IsDefault() ) return rDevicePolyPoly; - PolyPolygon aPolyPoly( rDevicePolyPoly ); + tools::PolyPolygon aPolyPoly( rDevicePolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx index 632db7d7164e..39c2b6807a77 100644 --- a/vcl/source/outdev/polygon.cxx +++ b/vcl/source/outdev/polygon.cxx @@ -31,7 +31,7 @@ #define OUTDEV_POLYPOLY_STACKBUF 32 -void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) +void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { if( mpMetaFile ) @@ -119,7 +119,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) } else { - // #100127# moved real PolyPolygon draw to separate method, + // #100127# moved real tools::PolyPolygon draw to separate method, // have to call recursively, avoiding duplicate // ImplLogicToDevicePixel calls ImplDrawPolyPolygon( nPoly, ImplLogicToDevicePixel( rPolyPoly ) ); @@ -237,7 +237,7 @@ void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly { if( mpMetaFile ) - mpMetaFile->AddAction( new MetaPolyPolygonAction( PolyPolygon( rB2DPolyPoly ) ) ); + mpMetaFile->AddAction( new MetaPolyPolygonAction( tools::PolyPolygon( rB2DPolyPoly ) ) ); // call helper ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly); @@ -310,13 +310,13 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP } // fallback to old polygon drawing if needed - const PolyPolygon aToolsPolyPolygon( rB2DPolyPoly ); - const PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel( aToolsPolyPolygon ); + const tools::PolyPolygon aToolsPolyPolygon( rB2DPolyPoly ); + const tools::PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel( aToolsPolyPolygon ); ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon ); } // #100127# Extracted from OutputDevice::DrawPolyPolygon() -void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPolyPoly ) +void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly ) { // AW: This crashes on empty PolyPolygons, avoid that if(!nPoly) @@ -388,7 +388,7 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo { if( !mpGraphics->DrawPolyPolygonBezier( j, pPointAry, pPointAryAry, pFlagAryAry, this ) ) { - PolyPolygon aPolyPoly = PolyPolygon::SubdivideBezier( rPolyPoly ); + tools::PolyPolygon aPolyPoly = tools::PolyPolygon::SubdivideBezier( rPolyPoly ); ImplDrawPolyPolygon( aPolyPoly.Count(), aPolyPoly ); } } @@ -406,7 +406,7 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo } } -void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) +void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) { @@ -424,18 +424,18 @@ void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pCl } } -void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly ) +void OutputDevice::ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly ) { - PolyPolygon* pPolyPoly; + tools::PolyPolygon* pPolyPoly; if( pClipPolyPoly ) { - pPolyPoly = new PolyPolygon; + pPolyPoly = new tools::PolyPolygon; rPolyPoly.GetIntersection( *pClipPolyPoly, *pPolyPoly ); } else { - pPolyPoly = (PolyPolygon*) &rPolyPoly; + pPolyPoly = (tools::PolyPolygon*) &rPolyPoly; } if( pPolyPoly->Count() == 1 ) { diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 2c0c028ea5ee..defb3b9c1ca8 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2758,7 +2758,7 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, // convert character image into outline Bitmap aBmp( aVDev.GetBitmap(Point(0, 0), aSize)); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; bool bVectorized = aBmp.Vectorize(aPolyPoly, BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES); if( !bVectorized ) bSuccess = false; @@ -2826,12 +2826,12 @@ bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, rResultVector.reserve( aB2DPolyPolyVector.size() ); ::basegfx::B2DPolyPolygonVector::const_iterator aIt = aB2DPolyPolyVector.begin(); for(; aIt != aB2DPolyPolyVector.end(); ++aIt ) - rResultVector.push_back(PolyPolygon(*aIt)); // #i76339# + rResultVector.push_back(tools::PolyPolygon(*aIt)); // #i76339# return true; } -bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& rStr, +bool OutputDevice::GetTextOutline( tools::PolyPolygon& rPolyPoly, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, bool bOptimize, sal_uLong nTWidth, const long* pDXArray ) const { diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 512ca332a972..5490a37736f9 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -59,9 +59,9 @@ namespace return Polygon(rPoly); } - PolyPolygon toPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly ) + tools::PolyPolygon toPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly ) { - PolyPolygon aTarget; + tools::PolyPolygon aTarget; for (sal_uInt32 i = 0; i < rPolyPoly.count(); ++i) aTarget.Insert(toPolygon(rPolyPoly.getB2DPolygon(i))); @@ -267,7 +267,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, if( bDrawnOk ) { if( mpMetaFile ) - mpMetaFile->AddAction( new MetaTransparentAction( PolyPolygon( rB2DPolyPoly ), static_cast< sal_uInt16 >(fTransparency * 100.0))); + mpMetaFile->AddAction( new MetaTransparentAction( tools::PolyPolygon( rB2DPolyPoly ), static_cast< sal_uInt16 >(fTransparency * 100.0))); return; } @@ -277,7 +277,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, DrawTransparent(toPolyPolygon(rB2DPolyPoly), static_cast<sal_uInt16>(fTransparency * 100.0)); } -void OutputDevice::DrawInvisiblePolygon( const PolyPolygon& rPolyPoly ) +void OutputDevice::DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly ) { // short circuit if the polygon border is invisible too if( !mbLineColor ) @@ -290,7 +290,7 @@ void OutputDevice::DrawInvisiblePolygon( const PolyPolygon& rPolyPoly ) Pop(); } -bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly, +bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { bool bDrawn = false; @@ -363,7 +363,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly, return bDrawn; } -void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, +void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // debug helper: @@ -379,7 +379,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, GDIMetaFile* pOldMetaFile = mpMetaFile; mpMetaFile = NULL; - PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); + tools::PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); Rectangle aPolyRect( aPolyPoly.GetBoundRect() ); Point aPoint; Rectangle aDstRect( aPoint, GetOutputSizePixel() ); @@ -597,7 +597,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, mpAlphaVDev = pOldAlphaVDev; } -void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, +void OutputDevice::DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // short circuit for drawing an opaque polygon diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 2f5efebe479d..6f4de668109d 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -707,7 +707,7 @@ void Splitter::Paint( const Rectangle& rPaintRect ) DrawRect( rPaintRect ); Polygon aPoly( rPaintRect ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, 85 ); if( mbKbdSplitting ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 9fa514680d8f..d230bb59fe02 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3532,13 +3532,13 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, if( bRoundEdges ) { Polygon aPoly( aRect, nCornerRadius, nCornerRadius ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, nPercent ); } else { Polygon aPoly( aRect ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, nPercent ); } } diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index d4c934c0f29a..4441458578b0 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -884,7 +884,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, if( nBrushColor_ != SALCOLOR_NONE ) { sal_uInt32 i, n; - Region pXRegA = NULL; + Region pXRegA = NULL; for( i = 0; i < nPoly; i++ ) { n = pPoints[i]; diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index c518305547a2..778e4b2e1643 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -791,7 +791,7 @@ bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) bool bUsePolygon(i_rClip.HasPolyPolygonOrB2DPolyPolygon()); static bool bTryToAvoidPolygon(true); - // #i122149# try to avoid usage of PolyPolygon ClipRegions when PolyPolygon is no curve + // #i122149# try to avoid usage of tools::PolyPolygon ClipRegions when tools::PolyPolygon is no curve // and only contains horizontal/vertical edges. In that case, use the fallback // in GetRegionRectangles which will use vcl::Region::GetAsRegionBand() which will do // the correct polygon-to-RegionBand transformation. @@ -949,7 +949,7 @@ bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) // create clip region from ClipRgnData if(0 == mpClipRgnData->rdh.nCount) { - // #i123585# region is empty; this may happen when e.g. a PolyPolygon is given + // #i123585# region is empty; this may happen when e.g. a tools::PolyPolygon is given // that contains no polygons or only empty ones (no width/height). This is // perfectly fine and we are done, except setting it (see end of method) } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 45fbe3fe9051..efa5417c2dd1 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2371,7 +2371,7 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, delete[] pData; - // rescaling needed for the PolyPolygon conversion + // rescaling needed for the tools::PolyPolygon conversion if( rB2DPolyPoly.count() ) { const double fFactor(mfCurrentFontScale/256); diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx index 7beb176814bd..d371c7802418 100644 --- a/vcl/win/source/gdi/wntgdi.cxx +++ b/vcl/win/source/gdi/wntgdi.cxx @@ -45,7 +45,7 @@ extern "C" { BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt ) { - return PolyPolygon( hDC, ppt, npcnt, ncnt ); + return tools::PolyPolygon( hDC, ppt, npcnt, ncnt ); } } diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index f251a9a33ba7..9b99ee3c1fa5 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -101,7 +101,7 @@ void setupMethodStubs( functor_vector_type& res ) const Rectangle aRect2(aPt3,aPt4); const Polygon aPoly(aRect); const Polygon aPoly2(aRect2); - PolyPolygon aPolyPoly(aPoly); + tools::PolyPolygon aPolyPoly(aPoly); aPolyPoly.Insert( aPoly2 ); Polygon aPoly3(aPoly2); aPoly3.Rotate( aPoly3.GetBoundRect().Center(), @@ -202,11 +202,11 @@ void setupMethodStubs( functor_vector_type& res ) _1, aPoly )); - /* void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); */ + /* void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); */ add(res, "DrawPolyPolygon", boost::bind( - (void (OutputDevice::*)( const PolyPolygon& )) + (void (OutputDevice::*)( const tools::PolyPolygon& )) &OutputDevice::DrawPolyPolygon, _1, aPolyPoly )); @@ -696,16 +696,16 @@ void setupMethodStubs( functor_vector_type& res ) _1, aRect,aGradient )); - /* void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); */ + /* void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); */ add(res, "DrawGradient(polygon)", boost::bind( - (void (OutputDevice::*)( const PolyPolygon&, const Gradient& ))( + (void (OutputDevice::*)( const tools::PolyPolygon&, const Gradient& ))( &OutputDevice::DrawGradient), _1, aPoly3,aGradient )); - /* void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); */ + /* void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); */ add(res, "DrawHatch", boost::bind( @@ -737,13 +737,13 @@ void setupMethodStubs( functor_vector_type& res ) _1, aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES )); - /* void DrawTransparent( const PolyPolygon& rPolyPoly, + /* void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); */ add(res, "DrawTransparent", boost::bind( - (void (OutputDevice::*)( const PolyPolygon&, sal_uInt16 ))( + (void (OutputDevice::*)( const tools::PolyPolygon&, sal_uInt16 ))( &OutputDevice::DrawTransparent), _1, aPoly3,(sal_uInt16)50 )); @@ -808,7 +808,7 @@ void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 ) const Polygon aPoly1( aClipRect ); Polygon aPoly2( aClipRect ); aPoly2.Rotate(aClipRect.Center(),450); - PolyPolygon aClipPoly(aPoly1); + tools::PolyPolygon aClipPoly(aPoly1); aClipPoly.Insert(aPoly2); functor_vector_type::const_iterator iter = aMethods.begin(); |