From ef46917ff3163d3fdd5152bda5d16c4503b6ab69 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 16 Aug 2015 16:45:12 -0500 Subject: 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 Reviewed-by: Norbert Thiebaud --- tools/inc/poly.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/inc') diff --git a/tools/inc/poly.h b/tools/inc/poly.h index 0a202bca1615..78058734ba34 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -47,12 +47,14 @@ public: #define MAX_POLYGONS ((sal_uInt16)0x3FF0) +namespace tools { class Polygon; +} class SAL_WARN_UNUSED ImplPolyPolygon { public: - Polygon** mpPolyAry; + tools::Polygon** mpPolyAry; sal_uIntPtr mnRefCount; sal_uInt16 mnCount; sal_uInt16 mnSize; -- cgit