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 /include/cppcanvas | |
| 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 'include/cppcanvas')
| -rw-r--r-- | include/cppcanvas/canvas.hxx | 2 | ||||
| -rw-r--r-- | include/cppcanvas/canvasgraphic.hxx | 2 | ||||
| -rw-r--r-- | include/cppcanvas/polypolygon.hxx | 4 | ||||
| -rw-r--r-- | include/cppcanvas/vclfactory.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 9b5ce34c3336..2104dee39a5e 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -47,7 +47,7 @@ namespace cppcanvas class PolyPolygon; class Canvas; - // forward declaration, since PolyPolygon also references Canvas + // forward declaration, since tools::PolyPolygon also references Canvas typedef ::boost::shared_ptr< PolyPolygon > PolyPolygonSharedPtr; // forward declaration, since cloneCanvas() also references Canvas diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index ca3db47be9e1..09d8018ef76f 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -37,7 +37,7 @@ namespace basegfx namespace cppcanvas { - // forward declaration, since PolyPolygon also derives from CanvasGraphic + // forward declaration, since tools::PolyPolygon also derives from CanvasGraphic typedef ::boost::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr; diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index 1db71e276a74..3cb186354512 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -37,12 +37,12 @@ namespace com { namespace sun { namespace star { namespace rendering } } } } -/* Definition of PolyPolygon interface */ +/* Definition of tools::PolyPolygon interface */ namespace cppcanvas { - /** This interface defines a PolyPolygon canvas object + /** This interface defines a tools::PolyPolygon canvas object Consider this object part of the view, and not of the model data. Although the given polygon is typically copied and held diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index 9d85248f9340..a48c62416569 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -35,7 +35,7 @@ namespace vcl { class Window; } class Bitmap; class BitmapEx; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Size; class Graphic; class GDIMetaFile; |