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 /sc | |
parent | 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 (diff) |
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 'sc')
-rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/output.cxx | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index f020024a99ac..a2375a03a838 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -187,7 +187,7 @@ void ScDPFieldButton::drawPopupButton() Size aArrowSize(4 * nScaleFactor, 2 * nScaleFactor); - Polygon aPoly(3); + tools::Polygon aPoly(3); aPoly.SetPoint(Point(aCenter.X() - aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 0); aPoly.SetPoint(Point(aCenter.X() + aArrowSize.Width(), aCenter.Y() - aArrowSize.Height()), 1); aPoly.SetPoint(Point(aCenter.X(), aCenter.Y() + aArrowSize.Height()), 2); diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 71301e0e4b9a..ad921b7e54cc 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1247,7 +1247,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex ) { // use transparent active color mpGridDev->SetFillColor( maSelectColor ); - mpGridDev->DrawTransparent( tools::PolyPolygon( Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); + mpGridDev->DrawTransparent( tools::PolyPolygon( tools::Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); } // column selection diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index f4378baa6898..f1432c4fdf0e 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1675,7 +1675,7 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext& rRenderContext, const Co // don't cover the cell contents. if ( rThisRowInfo.bChanged ) { - Polygon aPoly( 4, aPoints ); + tools::Polygon aPoly( 4, aPoints ); // for DrawPolygon, whitout Pen one pixel is left out // to the right and below... @@ -1690,7 +1690,7 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext& rRenderContext, const Co } else { - Polygon aPoly( 4, aPoints ); + tools::Polygon aPoly( 4, aPoints ); const Color* pColor = pInfo->pColorScale.get(); // for DrawPolygon, whitout Pen one pixel is left out @@ -1946,14 +1946,14 @@ bool ScOutputData::SetChangedClip() } else if (bHad) { - aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) ); + aPoly.Insert( tools::Polygon( mpDev->PixelToLogic(aDrawingRect) ) ); bHad = false; } nPosY += pRowInfo[nArrY].nHeight; } if (bHad) - aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) ); + aPoly.Insert( tools::Polygon( mpDev->PixelToLogic(aDrawingRect) ) ); bool bRet = (aPoly.Count() != 0); if (bRet) @@ -2134,10 +2134,10 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, Rectangle aLowerLeft ( aRectMinX1, aRectMaxY1, aRectMinX2, aRectMaxY2 ); Rectangle aUpperRight( aRectMaxX1, aRectMinY1, aRectMaxX2, aRectMinY2 ); - 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 ); + mpDev->DrawTransparent( tools::PolyPolygon( tools::Polygon( aLowerRight ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( tools::Polygon( aUpperLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( tools::Polygon( aLowerLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( tools::Polygon( aUpperRight ) ), lclCornerRectTransparency ); } } } |