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/drawinglayer | |
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/drawinglayer')
8 files changed, 21 insertions, 21 deletions
diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 1aae7c1a0f53..b7b2e1092850 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -34,16 +34,16 @@ namespace drawinglayer /** MaskPrimitive2D class This is the central masking primitive. It's a grouping - primitive and contains a PolyPolygon which defines the visible + primitive and contains a tools::PolyPolygon which defines the visible area. Only visualisation parts of the Child primitive sequence - inside of the mask PolyPolygon is defined to be visible. + inside of the mask tools::PolyPolygon is defined to be visible. This primitive should be handled by a renderer. If it is not handled, it decomposes to its Child content, and thus the visualisation would contaiun no clips. The geometrc range of this primitive is completely defined by the Mask - PolyPolygon since by definition nothing outside of the mask is visible. + tools::PolyPolygon since by definition nothing outside of the mask is visible. */ class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D { diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index a22a891206a6..9776978c6fae 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -33,10 +33,10 @@ namespace drawinglayer { /** PatternFillPrimitive2D class - This primitive allows filling a given PolyPolygon with a pattern + This primitive allows filling a given tools::PolyPolygon with a pattern defined by a sequence of primitives which are mapped to the unit range. The pattern is defined using a reference range which defines a rectangular - area relative to the PolyPolygon (in unit coordinates) which is virtually + area relative to the tools::PolyPolygon (in unit coordinates) which is virtually infinitely repeated. */ class DRAWINGLAYER_DLLPUBLIC PatternFillPrimitive2D : public BufferedDecompositionPrimitive2D diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index e65952250362..f80e5193a9ee 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -201,14 +201,14 @@ namespace drawinglayer { /** PolyPolygonColorPrimitive2D class - This primitive defines a PolyPolygon filled with a single color. + This primitive defines a tools::PolyPolygon filled with a single color. This is one of the non-decomposable primitives, so a renderer should process it. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the polygon fill color @@ -245,14 +245,14 @@ namespace drawinglayer { /** PolyPolygonColorPrimitive2D class - This primitive defines a PolyPolygon filled with a gradient. The + This primitive defines a tools::PolyPolygon filled with a gradient. The decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -298,14 +298,14 @@ namespace drawinglayer { /** PolyPolygonHatchPrimitive2D class - This primitive defines a PolyPolygon filled with a hatch. The + This primitive defines a tools::PolyPolygon filled with a hatch. The decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -357,14 +357,14 @@ namespace drawinglayer { /** PolyPolygonGraphicPrimitive2D class - This primitive defines a PolyPolygon filled with bitmap data + This primitive defines a tools::PolyPolygon filled with bitmap data (including transparence). The decomosition will create a MaskPrimitive2D containing a FillGraphicPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonGraphicPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -410,14 +410,14 @@ namespace drawinglayer { /** PolyPolygonSelectionPrimitive2D class - This primitive defines a PolyPolygon which gets filled with a defined color + This primitive defines a tools::PolyPolygon which gets filled with a defined color and a defined transparence, but also gets extended ('grown') by the given discrete size (thus being a view-dependent primitive) */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonSelectionPrimitive2D : public DiscreteMetricDependentPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the color diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index bb8dd1a21343..311ec94e71ae 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer This is the basic primitive for representing a text portion. It contains all needed information. If it is not handled by a renderer, its decomposition - will provide the text PolyPolygon outlines as filled polygons, correctly + will provide the text tools::PolyPolygon outlines as filled polygons, correctly transformed. To get better text quality, it is suggested to handle tis primitive directly diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 47ed330213c0..41337ac3a564 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer { /** PolyPolygonMaterialPrimitive3D class - This primitive defines a planar 3D PolyPolygon filled with a single color. + This primitive defines a planar 3D tools::PolyPolygon filled with a single color. This is one of the non-decomposable primitives, so a renderer should process it. @@ -43,7 +43,7 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC PolyPolygonMaterialPrimitive3D : public BasePrimitive3D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B3DPolyPolygon maPolyPolygon; /// the fill parameters diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 9155378f7112..030144f8e91c 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer /** SdrExtrudePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D extrude definition. - The given 2D PolyPolygon geometry is imagined as lying on the XY-plane in 3D + The given 2D tools::PolyPolygon geometry is imagined as lying on the XY-plane in 3D and gets extruded in Z-Direction by Depth. Various possibilities e.g. for creating diagonals (edge roudings in 3D) diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index fe030c9a6fe8..bf6dfb237a0b 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer /** SdrLathePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D rotation definition. - The given 2D PolyPolygon geometry is imagined as lying on the XY-plane in 3D + The given 2D tools::PolyPolygon geometry is imagined as lying on the XY-plane in 3D and gets rotated around the Y-Axis. Various possibilities e.g. for creating diagonals (edge roudings in 3D) diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx index e742e039486a..d928a84a5d35 100644 --- a/include/drawinglayer/processor2d/canvasprocessor.hxx +++ b/include/drawinglayer/processor2d/canvasprocessor.hxx @@ -82,7 +82,7 @@ namespace drawinglayer // SvtOptionsDrawinglayer incarnation to react on diverse settings const SvtOptionsDrawinglayer maDrawinglayerOpt; - // the current clipping PolyPolygon from MaskPrimitive2D, always in + // the current clipping tools::PolyPolygon from MaskPrimitive2D, always in // object coordinates basegfx::B2DPolyPolygon maClipPolyPolygon; |