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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 63224f65b536..b61ce4dc1cf5 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1237,7 +1237,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex ) { // use transparent active color maGridDev.SetFillColor( maSelectColor ); - maGridDev.DrawTransparent( PolyPolygon( Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); + maGridDev.DrawTransparent( tools::PolyPolygon( Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); } // column selection diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5a622e255dae..44e32f030e75 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1866,7 +1866,7 @@ vcl::Region ScOutputData::GetChangedAreaRegion() bool ScOutputData::SetChangedClip() { - PolyPolygon aPoly; + tools::PolyPolygon aPoly; Rectangle aDrawingRect; aDrawingRect.Left() = nScrX; @@ -2078,10 +2078,10 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, Rectangle aLowerLeft ( aRectMinX1, aRectMaxY1, aRectMinX2, aRectMaxY2 ); Rectangle aUpperRight( aRectMaxX1, aRectMinY1, aRectMaxX2, aRectMinY2 ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aLowerRight ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aUpperLeft ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aLowerLeft ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aUpperRight ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aLowerRight ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aUpperLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aLowerLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aUpperRight ) ), lclCornerRectTransparency ); } } } |