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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/wntgdi.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
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 ); } } |