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 /sd | |
| parent | Fix GTK3 right-to-left rendering (diff) | |
| download | core-ef46917ff3163d3fdd5152bda5d16c4503b6ab69.tar.gz core-ef46917ff3163d3fdd5152bda5d16c4503b6ab69.zip | |
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 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 15d4dd30a894..47f2a694d6f7 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2409,7 +2409,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aStart.Y += aCenter.Y; aEnd.X += aCenter.X; aEnd.Y += aCenter.Y; - Polygon aPolygon( aRect, Point( aStart.X, aStart.Y ), Point( aEnd.X, aEnd.Y ), ePolyKind ); + tools::Polygon aPolygon( aRect, Point( aStart.X, aStart.Y ), Point( aEnd.X, aEnd.Y ), ePolyKind ); bool bNeedText = true; if ( mnAngle ) { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index f1bc7948e7ee..9bef488e8301 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1776,8 +1776,11 @@ bool HtmlExport::CreateHtmlForPresPages() case IMAP_OBJ_POLYGON: { - Polygon aArea(static_cast<IMapPolygonObject*>(pArea)->GetPolygon(false)); - aStr.append(CreateHTMLPolygonArea(::basegfx::B2DPolyPolygon(aArea.getB2DPolygon()), Size(aLogPos.X() - pPage->GetLftBorder(), aLogPos.Y() - pPage->GetUppBorder()), fLogicToPixel, aURL)); + tools::Polygon aArea(static_cast<IMapPolygonObject*>(pArea)->GetPolygon(false)); + aStr.append(CreateHTMLPolygonArea(::basegfx::B2DPolyPolygon(aArea.getB2DPolygon()), + Size(aLogPos.X() - pPage->GetLftBorder(), + aLogPos.Y() - pPage->GetUppBorder()), + fLogicToPixel, aURL)); } break; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 587f815e73e1..d47d60ecb93d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -691,7 +691,7 @@ void AnnotationWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle else SetFillColor(COL_BLACK); SetLineColor(); - DrawPolygon(Polygon(maPopupTriangle)); + DrawPolygon( ::tools::Polygon(maPopupTriangle)); } } |