diff options
Diffstat (limited to 'drawinglayer/inc/drawinglayer/primitive2d')
47 files changed, 443 insertions, 443 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx index 50b3e5e6ecd9..d3fa3076cf39 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace drawinglayer /** AnimatedSwitchPrimitive2D class This is the basic class for simple, animated primitives. The basic idea - is to have an animation definition (AnimationEntry) who's basic + is to have an animation definition (AnimationEntry) who's basic functionality is to return a state value for any given animation time in the range of [0.0 .. 1.0]. Depending on the state, the decomposition calculates an index, which of the members of the child vector is to @@ -66,18 +66,18 @@ namespace drawinglayer to an animation state [0.0 .. 1.0]. This member contains a cloned definition and is owned by this implementation. */ - animation::AnimationEntry* mpAnimationEntry; + animation::AnimationEntry* mpAnimationEntry; /// bitfield /** flag if this is a text or graphic animation. Necessary since SdrViews need to differentiate between both types if they are on/off */ - unsigned mbIsTextAnimation : 1; + unsigned mbIsTextAnimation : 1; public: /// constructor AnimatedSwitchPrimitive2D( - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation); @@ -121,7 +121,7 @@ namespace drawinglayer public: /// constructor AnimatedBlinkPrimitive2D( - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation); @@ -151,14 +151,14 @@ namespace drawinglayer { private: /// the transformations - std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose > maMatrixStack; + std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose > maMatrixStack; protected: public: /// constructor AnimatedInterpolatePrimitive2D( const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack, - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 05b7fae6ecf8..fb4806d05c03 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ namespace drawinglayer { private: /// the fill color to use - basegfx::BColor maBColor; + basegfx::BColor maBColor; /// the last used viewInformation, used from getDecomposition for buffering - basegfx::B2DRange maLastViewport; + basegfx::B2DRange maLastViewport; protected: /// create local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index b6afe2994e08..b67bdb9e66b0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,23 +73,23 @@ namespace drawinglayer Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D - This class is strongly virtual due to the lack of getPrimitiveID() implementation. - This is by purpose, this base class shall not be incarnated and be used directly as + This class is strongly virtual due to the lack of getPrimitiveID() implementation. + This is by purpose, this base class shall not be incarnated and be used directly as a XPrimitive2D. Is is derived from boost::noncopyable to make clear that a primitive is a read-only - instance and copying or changing values is not intended. The idea is to hold all data + instance and copying or changing values is not intended. The idea is to hold all data needed for visualisation of this primitive in unchangeable form. - It is derived from comphelper::OBaseMutex to have a Mutex at hand; in a base + It is derived from comphelper::OBaseMutex to have a Mutex at hand; in a base implementation this may not be needed, but e.g. when buffering at last decomposition in a local member, multiple threads may try to decompose at the same time, so locking is needed to avoid race conditions seen from the UNO object implementation. - A method to get a simplified representation is provided by get2DDecomposition. The - default implementation returns an empty sequence. The idea is that processors - using this primitive and do not know it, may get the decomposition and process - these instead. An example is e.g. a fat line, who's decomposition may contain + A method to get a simplified representation is provided by get2DDecomposition. The + default implementation returns an empty sequence. The idea is that processors + using this primitive and do not know it, may get the decomposition and process + these instead. An example is e.g. a fat line, who's decomposition may contain the geometric representation of that line using filled polygon prmimitives. When the renderer knows how to handle fat lines, he may proccess this primitive directly; if not he can use the decomposition. With this functionality, renderers may operate by @@ -113,12 +113,12 @@ namespace drawinglayer All other implemented primitives have a defined decomposition and can thus be decomposed down to this small set. - - A renderer implementing support for this minimal set of primitives can completely + + A renderer implementing support for this minimal set of primitives can completely render primitive-based visualisations. Of course, he also has to take states into account which are representated by GroupPrimitive2D derivations, see groupprimitive2d.hxx - To support getting the geometric BoundRect, getB2DRange is used. The default + To support getting the geometric BoundRect, getB2DRange is used. The default implementation will use the get2DDecomposition result and merge a range from the entries. Thus, an implementation is only necessary for the Basic Primitives, but of course speedups are possible (and are used) by implementing the method at higher-level @@ -135,7 +135,7 @@ namespace drawinglayer the appropriate C++ implementation class ViewInformation2D. This base class does not implement any buffering; e.g. buffering the decompositon - and/or the range. These may be buffered anytime since the definition is that the primitive + and/or the range. These may be buffered anytime since the definition is that the primitive is read-only and thus unchangeable. This implies that the decomposition and/or getting the range will lead to the same result as last time, under the precondition that the parameter ViewInformation2D is the same as the last one. This is usually the case @@ -143,7 +143,7 @@ namespace drawinglayer in their get2DDecomposition/getB2DRange implementations. */ class BasePrimitive2D - : private boost::noncopyable, + : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive2DImplBase { @@ -199,7 +199,7 @@ namespace drawinglayer namespace primitive2d { /** BufferedDecompositionPrimitive2D class - + Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D which want to buffer the decomoposition result @@ -211,15 +211,15 @@ namespace drawinglayer if maBuffered2DDecomposition is empty. If yes, it uses create2DDecomposition to create the content. In all cases, maBuffered2DDecomposition is returned. - For view-dependent primitives derived from Primitive2DBufferDecomposition more needs + For view-dependent primitives derived from Primitive2DBufferDecomposition more needs to be done when the decomposition depends on parts of the parameter ViewInformation2D. This defines a standard method for processing these: Implement a view-dependent get2DDecomposition doing te following steps: (a) Locally extract needed parameters from ViewInformation2D to new, local parameters (this may be a complete local copy of ViewInformation2D) - (b) If a buffered decomposition exists, ckeck if one of the new local parameters - differs from the corresponding locally remembered (as member) ones. If yes, + (b) If a buffered decomposition exists, ckeck if one of the new local parameters + differs from the corresponding locally remembered (as member) ones. If yes, clear maBuffered2DDecomposition (d) call baseclass::get2DDecomposition which will use create2DDecomposition to fill maBuffered2DDecomposition if it's empty @@ -228,11 +228,11 @@ namespace drawinglayer (f) return maBuffered2DDecomposition */ class BufferedDecompositionPrimitive2D - : public BasePrimitive2D + : public BasePrimitive2D { private: /// a sequence used for buffering the last create2DDecomposition() result - Primitive2DSequence maBuffered2DDecomposition; + Primitive2DSequence maBuffered2DDecomposition; protected: /** access methods to maBuffered2DDecomposition. The usage of this methods may allow @@ -251,10 +251,10 @@ namespace drawinglayer // constructor/destructor BufferedDecompositionPrimitive2D(); - /** The getDecomposition default implementation will on demand use create2DDecomposition() if - maBuffered2DDecomposition is empty. It will set maBuffered2DDecomposition to this obtained decomposition - to buffer it. If the decomposition is also ViewInformation2D-dependent, this method needs to be - overloaded and the ViewInformation2D for the last decomposition need to be remembered, too, and + /** The getDecomposition default implementation will on demand use create2DDecomposition() if + maBuffered2DDecomposition is empty. It will set maBuffered2DDecomposition to this obtained decomposition + to buffer it. If the decomposition is also ViewInformation2D-dependent, this method needs to be + overloaded and the ViewInformation2D for the last decomposition need to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx index e93456151959..6a8295a3267d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,17 +51,17 @@ namespace drawinglayer { private: /// the RGBA Bitmap-data - BitmapEx maBitmapEx; + BitmapEx maBitmapEx; /** the object transformation from unit coordinates, defining size, shear, rotate and position */ - basegfx::B2DHomMatrix maTransform; + basegfx::B2DHomMatrix maTransform; public: /// constructor BitmapPrimitive2D( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 2bc5ba4db08c..7d50da4444b1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,58 +51,58 @@ namespace drawinglayer { private: /// the line definition - basegfx::B2DPoint maStart; - basegfx::B2DPoint maEnd; + basegfx::B2DPoint maStart; + basegfx::B2DPoint maEnd; /// the widths of single/double line - double mfLeftWidth; - double mfDistance; - double mfRightWidth; + double mfLeftWidth; + double mfDistance; + double mfRightWidth; /// edge overlap sizes - double mfExtendInnerStart; - double mfExtendInnerEnd; - double mfExtendOuterStart; - double mfExtendOuterEnd; + double mfExtendInnerStart; + double mfExtendInnerEnd; + double mfExtendOuterStart; + double mfExtendOuterEnd; /// the line color - basegfx::BColor maRGBColor; + basegfx::BColor maRGBColor; short mnStyle; /// bitfield /// flags to influence inside/outside creation - unsigned mbCreateInside : 1; - unsigned mbCreateOutside : 1; + unsigned mbCreateInside : 1; + unsigned mbCreateOutside : 1; /// local helpers - double getCorrectedLeftWidth() const - { - return basegfx::fTools::equal(1.0, mfLeftWidth) ? 0.0 : mfLeftWidth; + double getCorrectedLeftWidth() const + { + return basegfx::fTools::equal(1.0, mfLeftWidth) ? 0.0 : mfLeftWidth; } - - double getCorrectedDistance() const - { - return basegfx::fTools::equal(1.0, mfDistance) ? 0.0 : mfDistance; + + double getCorrectedDistance() const + { + return basegfx::fTools::equal(1.0, mfDistance) ? 0.0 : mfDistance; } - double getCorrectedRightWidth() const - { - return basegfx::fTools::equal(1.0, mfRightWidth) ? 0.0 : mfRightWidth; + double getCorrectedRightWidth() const + { + return basegfx::fTools::equal(1.0, mfRightWidth) ? 0.0 : mfRightWidth; } - - double getWidth() const - { + + double getWidth() const + { return getCorrectedLeftWidth() + getCorrectedDistance() + getCorrectedRightWidth(); } bool leftIsHairline() const { - return basegfx::fTools::equal(1.0, mfLeftWidth); + return basegfx::fTools::equal(1.0, mfLeftWidth); } bool rightIsHairline() const { - return basegfx::fTools::equal(1.0, mfRightWidth); + return basegfx::fTools::equal(1.0, mfRightWidth); } bool isInsideUsed() const diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx index 752b6e6985dd..caa2add123df 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,15 +41,15 @@ namespace drawinglayer { /** ChartPrimitive2D class - This is a helper primitive which decomposes to the ChartMetaFile - visualisation. It is used to allow specific renderers to do something + This is a helper primitive which decomposes to the ChartMetaFile + visualisation. It is used to allow specific renderers to do something direct for visualising the chart. */ class ChartPrimitive2D : public GroupPrimitive2D { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel; - basegfx::B2DHomMatrix maTransformation; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel; + basegfx::B2DHomMatrix maTransformation; public: ChartPrimitive2D( diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index 41ee01581090..e7079d3580fe 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,14 +51,14 @@ namespace drawinglayer { private: /// object's base data - basegfx::B2DHomMatrix maTransform; - com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel; + basegfx::B2DHomMatrix maTransform; + com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel; /// the created an cached awt::XControl - com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxXControl; + com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxXControl; /// the last used scaling, used from getDecomposition for buffering - basegfx::B2DVector maLastViewScaling; + basegfx::B2DVector maLastViewScaling; /** used from getXControl() to create a local awt::XControl which is remembered in mxXControl and from thereon always used and returned by getXControl() @@ -76,7 +76,7 @@ namespace drawinglayer public: /// constructor ControlPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel); /** constructor with an additional XControl as parameter to allow to hand it over at incarnation time @@ -84,7 +84,7 @@ namespace drawinglayer and thus double the XControls. */ ControlPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel, const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& rxXControl); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 27e77f20aa44..cf56b3359268 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ namespace drawinglayer { private: /// the RGBA Bitmap-data - BitmapEx maBitmapEx; + BitmapEx maBitmapEx; /** the top-left object position */ - basegfx::B2DPoint maTopLeft; + basegfx::B2DPoint maTopLeft; protected: /// local decomposition. @@ -62,7 +62,7 @@ namespace drawinglayer public: /// constructor DiscreteBitmapPrimitive2D( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const basegfx::B2DPoint& rTopLeft); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx index 97992c82c506..8bd1719a1ddb 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,75 +32,75 @@ ////////////////////////////////////////////////////////////////////////////// // define ranges for other libraries -#define PRIMITIVE2D_ID_RANGE_DRAWINGLAYER (0 << 16) -#define PRIMITIVE2D_ID_RANGE_SVX (1 << 16) -#define PRIMITIVE2D_ID_RANGE_SD (2 << 16) -#define PRIMITIVE2D_ID_RANGE_SW (3 << 16) -#define PRIMITIVE2D_ID_RANGE_SC (4 << 16) +#define PRIMITIVE2D_ID_RANGE_DRAWINGLAYER (0 << 16) +#define PRIMITIVE2D_ID_RANGE_SVX (1 << 16) +#define PRIMITIVE2D_ID_RANGE_SD (2 << 16) +#define PRIMITIVE2D_ID_RANGE_SW (3 << 16) +#define PRIMITIVE2D_ID_RANGE_SC (4 << 16) ////////////////////////////////////////////////////////////////////////////// // local primitives -#define PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 0) -#define PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 1) -#define PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 2) -#define PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 3) -#define PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 4) -#define PRIMITIVE2D_ID_BITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 5) -#define PRIMITIVE2D_ID_CONTROLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 6) -#define PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 7) -#define PRIMITIVE2D_ID_FILLBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 8) -#define PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 9) -#define PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 10) -#define PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 11) -#define PRIMITIVE2D_ID_GRIDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 12) -#define PRIMITIVE2D_ID_GROUPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 13) -#define PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 14) -#define PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 15) -#define PRIMITIVE2D_ID_MASKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 16) -#define PRIMITIVE2D_ID_MEDIAPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 17) -#define PRIMITIVE2D_ID_METAFILEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 18) -#define PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 19) -#define PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 20) -#define PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 21) -#define PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 22) -#define PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 23) -#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 24) -#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 25) -#define PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 26) -#define PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 27) -#define PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 28) -#define PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 29) -#define PRIMITIVE2D_ID_SCENEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 30) -#define PRIMITIVE2D_ID_SHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 31) -#define PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 32) -#define PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 33) -#define PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 34) -#define PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 35) -#define PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 36) -#define PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 37) +#define PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 0) +#define PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 1) +#define PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 2) +#define PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 3) +#define PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 4) +#define PRIMITIVE2D_ID_BITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 5) +#define PRIMITIVE2D_ID_CONTROLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 6) +#define PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 7) +#define PRIMITIVE2D_ID_FILLBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 8) +#define PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 9) +#define PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 10) +#define PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 11) +#define PRIMITIVE2D_ID_GRIDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 12) +#define PRIMITIVE2D_ID_GROUPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 13) +#define PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 14) +#define PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 15) +#define PRIMITIVE2D_ID_MASKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 16) +#define PRIMITIVE2D_ID_MEDIAPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 17) +#define PRIMITIVE2D_ID_METAFILEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 18) +#define PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 19) +#define PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 20) +#define PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 21) +#define PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 22) +#define PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 23) +#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 24) +#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 25) +#define PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 26) +#define PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 27) +#define PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 28) +#define PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 29) +#define PRIMITIVE2D_ID_SCENEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 30) +#define PRIMITIVE2D_ID_SHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 31) +#define PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 32) +#define PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 33) +#define PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 34) +#define PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 35) +#define PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 36) +#define PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 37) #define PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 38) #define PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 39) #define PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 40) #define PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 41) -#define PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 42) -#define PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 43) -#define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44) +#define PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 42) +#define PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 43) +#define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44) #define PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 45) -#define PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 46) -#define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47) -#define PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48) -#define PRIMITIVE2D_ID_CHARTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49) -#define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50) -#define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51) -#define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52) +#define PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 46) +#define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47) +#define PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48) +#define PRIMITIVE2D_ID_CHARTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49) +#define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50) +#define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51) +#define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52) #define PRIMITIVE2D_ID_INVERTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53) -#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54) -#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55) +#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54) +#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55) #define PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 56) #define PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 57) #define PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 58) -#define PRIMITIVE2D_ID_EPSPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59) +#define PRIMITIVE2D_ID_EPSPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59) #define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60) ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index cbc1393dd849..224a730a853f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace drawinglayer This is a helper primitive which allows embedding of single 3D primitives to the 2D primitive logic. It will get the scene it's - involved and thus the 3D transformation. With this information it + involved and thus the 3D transformation. With this information it is able to provide 2D range data for a 3D primitive. This primitive will not be visualized and decomposes to a yellow @@ -55,35 +55,35 @@ namespace drawinglayer { private: /// the sequence of 3d primitives - primitive3d::Primitive3DSequence mxChildren3D; + primitive3d::Primitive3DSequence mxChildren3D; /// the 2D scene object transformation - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maObjectTransformation; /// the 3D transformations - geometry::ViewInformation3D maViewInformation3D; + geometry::ViewInformation3D maViewInformation3D; /** if the embedded 3D primitives contain shadow, these parameters are needed to extract the shadow wich is a sequence od 2D primitives and may expand the 2D range. Since every single 3D object in a scene may individually - have shadow or not, these values need to be provided and prepared. The shadow + have shadow or not, these values need to be provided and prepared. The shadow distance itself (a 2D transformation) is part of the 3D shadow definition */ - basegfx::B3DVector maLightNormal; - double mfShadowSlant; + basegfx::B3DVector maLightNormal; + double mfShadowSlant; basegfx::B3DRange maScene3DRange; /// the primitiveSequence for on-demand created shadow primitives (see mbShadow3DChecked) - Primitive2DSequence maShadowPrimitives; + Primitive2DSequence maShadowPrimitives; /// #i96669# add simple range buffering for this primitive - basegfx::B2DRange maB2DRange; + basegfx::B2DRange maB2DRange; /// bitfield /** flag if given 3D geometry is already cheched for shadow definitions and 2d shadows are created in maShadowPrimitives */ - unsigned mbShadow3DChecked : 1; + unsigned mbShadow3DChecked : 1; /// private helpers bool impGetShadow3D(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx index a3310c00bf24..a9e90e5d012e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,13 +45,13 @@ namespace drawinglayer { private: /// the geometry definition - basegfx::B2DHomMatrix maEpsTransform; + basegfx::B2DHomMatrix maEpsTransform; /// the Eps content definition - GfxLink maGfxLink; + GfxLink maGfxLink; /// the replacement content definition - GDIMetaFile maMetaFile; + GDIMetaFile maMetaFile; protected: /// create local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 2552472b3388..0b856c2c7d5f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ namespace drawinglayer { private: /// the geometric definition - basegfx::B2DHomMatrix maTransformation; + basegfx::B2DHomMatrix maTransformation; /// the fill attributes - attribute::FillBitmapAttribute maFillBitmap; + attribute::FillBitmapAttribute maFillBitmap; protected: /// local decomposition. @@ -69,7 +69,7 @@ namespace drawinglayer public: /// constructor FillBitmapPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + const basegfx::B2DHomMatrix& rTransformation, const attribute::FillBitmapAttribute& rFillBitmap); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index f4f780404059..a1f0eca549f0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace drawinglayer gradient the various ellipses in various color steps will be created. I have added functionality to create both versions of filled decompositions: - Those who overlap and non-overlapping ones. The overlapping version is the + Those who overlap and non-overlapping ones. The overlapping version is the default one since it works with and without AntiAliasing. The non-overlapping version is used in the MetafilePrimitive2D decomposition when the old XOR paint was recorded. @@ -62,10 +62,10 @@ namespace drawinglayer { private: /// the geometric definition - basegfx::B2DRange maObjectRange; + basegfx::B2DRange maObjectRange; /// the gradient definition - attribute::FillGradientAttribute maFillGradient; + attribute::FillGradientAttribute maFillGradient; /// local helpers void generateMatricesAndColors( @@ -90,7 +90,7 @@ namespace drawinglayer public: /// constructor FillGradientPrimitive2D( - const basegfx::B2DRange& rObjectRange, + const basegfx::B2DRange& rObjectRange, const attribute::FillGradientAttribute& rFillGradient); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index d27b1957f657..9b35b9bb581b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,13 +53,13 @@ namespace drawinglayer { private: /// the geometric definition - basegfx::B2DRange maObjectRange; + basegfx::B2DRange maObjectRange; /// the hatch definition - attribute::FillHatchAttribute maFillHatch; + attribute::FillHatchAttribute maFillHatch; /// hatch background color (if used) - basegfx::BColor maBColor; + basegfx::BColor maBColor; protected: /// local decomposition. @@ -68,8 +68,8 @@ namespace drawinglayer public: /// constructor FillHatchPrimitive2D( - const basegfx::B2DRange& rObjectRange, - const basegfx::BColor& rBColor, + const basegfx::B2DRange& rObjectRange, + const basegfx::BColor& rBColor, const attribute::FillHatchAttribute& rFillHatch); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx index 2f4c52ff1532..10a4bde7bee0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace drawinglayer /** GraphicPrimitive2D class Primitive to hold graphics defined by GraphicObject and GraphicAttr - combination. This includes MetaFiles and diverse pixel-oriented graphic + combination. This includes MetaFiles and diverse pixel-oriented graphic formats. It even includes animated GIFs, Croppings and other changes defined in GraphicAttr. @@ -58,13 +58,13 @@ namespace drawinglayer { private: /// the geometric definition - basegfx::B2DHomMatrix maTransform; + basegfx::B2DHomMatrix maTransform; /// the GraphicObject with all it's content possibilities - GraphicObject maGraphicObject; + GraphicObject maGraphicObject; /// The GraphicAttr with all it's modification possibilities - GraphicAttr maGraphicAttr; + GraphicAttr maGraphicAttr; protected: /// local decomposition @@ -73,11 +73,11 @@ namespace drawinglayer public: /// constructor(s) GraphicPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr); GraphicPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx index edb7f43417c3..564d5d09a2c0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,27 +54,27 @@ namespace drawinglayer { private: /// The geometry definition for the grid area - basegfx::B2DHomMatrix maTransform; + basegfx::B2DHomMatrix maTransform; /// grid layout definitions - double mfWidth; - double mfHeight; - double mfSmallestViewDistance; - double mfSmallestSubdivisionViewDistance; - sal_uInt32 mnSubdivisionsX; - sal_uInt32 mnSubdivisionsY; + double mfWidth; + double mfHeight; + double mfSmallestViewDistance; + double mfSmallestSubdivisionViewDistance; + sal_uInt32 mnSubdivisionsX; + sal_uInt32 mnSubdivisionsY; /// Grid color for single-pixel grid points - basegfx::BColor maBColor; + basegfx::BColor maBColor; /// The Bitmap (with transparence) for grid cross points - BitmapEx maCrossMarker; + BitmapEx maCrossMarker; - /** the last used object to view transformtion and the last Viewport, + /** the last used object to view transformtion and the last Viewport, used from getDecomposition for decide buffering */ - basegfx::B2DHomMatrix maLastObjectToViewTransformation; - basegfx::B2DRange maLastViewport; + basegfx::B2DHomMatrix maLastObjectToViewTransformation; + basegfx::B2DRange maLastViewport; protected: /// create local decomposition @@ -83,7 +83,7 @@ namespace drawinglayer public: /// constructor GridPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, double fWidth, double fHeight, double fSmallestViewDistance, diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index db582069df57..ffcfc7269912 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace drawinglayer namespace primitive2d { /** GroupPrimitive2D class - + Baseclass for all grouping 2D primitives The grouping primitive in it's basic form is capable of holding @@ -58,10 +58,10 @@ namespace drawinglayer In most cases the decomposition is straightforward, so by default this primitive will not buffer the result and is not derived from BufferedDecompositionPrimitive2D, but from BasePrimitive2D. - + A renderer has to take GroupPrimitive2D derivations into account which are used to hold a state. - + Current Basic 2D StatePrimitives are: - TransparencePrimitive2D (objects with freely defined transparence) @@ -74,7 +74,7 @@ namespace drawinglayer { private: /// the children. Declared private since this shall never be changed at all after construction - Primitive2DSequence maChildren; + Primitive2DSequence maChildren; public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx index 2e70d31a1949..4422cb3e944a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ namespace drawinglayer /** HelplinePrimitive2D class This primitive provides a view-dependent helpline definition. The Helpline - is defined by a line equation (Point and vector) and a style. When the style - is a line, dependent from Viewport the visible part of that Helpline is - constructed. For Point, a cross is constructed. This primitive is highly + is defined by a line equation (Point and vector) and a style. When the style + is a line, dependent from Viewport the visible part of that Helpline is + constructed. For Point, a cross is constructed. This primitive is highly view-dependent. The visualisation uses the two given colors to create a dashed line with @@ -65,20 +65,20 @@ namespace drawinglayer { private: /// Helpline geometry definition - basegfx::B2DPoint maPosition; - basegfx::B2DVector maDirection; - HelplineStyle2D meStyle; + basegfx::B2DPoint maPosition; + basegfx::B2DVector maDirection; + HelplineStyle2D meStyle; /// Helpline style definition - basegfx::BColor maRGBColA; - basegfx::BColor maRGBColB; - double mfDiscreteDashLength; + basegfx::BColor maRGBColA; + basegfx::BColor maRGBColB; + double mfDiscreteDashLength; - /** the last used object to view transformtion and the last Viewport, + /** the last used object to view transformtion and the last Viewport, used from getDecomposition for decide buffering */ - basegfx::B2DHomMatrix maLastObjectToViewTransformation; - basegfx::B2DRange maLastViewport; + basegfx::B2DHomMatrix maLastObjectToViewTransformation; + basegfx::B2DRange maLastViewport; protected: /// create local decomposition @@ -87,11 +87,11 @@ namespace drawinglayer public: /// constructor HelplinePrimitive2D( - const basegfx::B2DPoint& rPosition, - const basegfx::B2DVector& rDirection, - HelplineStyle2D eStyle, - const basegfx::BColor& rRGBColA, - const basegfx::BColor& aRGBColB, + const basegfx::B2DPoint& rPosition, + const basegfx::B2DVector& rDirection, + HelplineStyle2D eStyle, + const basegfx::BColor& rRGBColA, + const basegfx::BColor& aRGBColB, double fDiscreteDashLength); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index 7d3ddbf143fa..98289ccadfd5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -46,19 +46,19 @@ namespace drawinglayer namespace primitive2d { // This primitive is used to represent geometry for non-visible objects, - // e.g. a PresObj's outline. To still be able to use primitives for HitTest - // functionality, the 2d decompositions will produce an as much as possible - // simplified line geometry encapsulated in this primtive when there is no - // line geometry. In a further enchanced version this may change to 'if neither - // filled nor lines' creation criteria. The whole primitive decomposes to nothing, - // so no one not knowing it will be influenced. Only helper processors for hit test + // e.g. a PresObj's outline. To still be able to use primitives for HitTest + // functionality, the 2d decompositions will produce an as much as possible + // simplified line geometry encapsulated in this primtive when there is no + // line geometry. In a further enchanced version this may change to 'if neither + // filled nor lines' creation criteria. The whole primitive decomposes to nothing, + // so no one not knowing it will be influenced. Only helper processors for hit test // (and maybe BoundRect extractors) will use it and it's children subcontent. class HiddenGeometryPrimitive2D : public GroupPrimitive2D { public: HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren); - // despite returning an empty decomposition since it's no visualisation data, + // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so // the local implementation will return the children's range virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx index ea20a1099614..224092e1acec 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index eedee6013950..8c355875d26f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ namespace drawinglayer { /** MarkerArrayPrimitive2D class - This primtive defines an array of markers. Their size is defined - in pixels and independent from the view transformation which makes + This primtive defines an array of markers. Their size is defined + in pixels and independent from the view transformation which makes this primitive highly view-dependent. It is also transformation - invariant, so that the bitmap is always visualized unscaled and + invariant, so that the bitmap is always visualized unscaled and unrotated. - It is used e.g. for grid position visualisation. The given Bitmap - (with transparence) is defined to be visible centered at each of the given + It is used e.g. for grid position visualisation. The given Bitmap + (with transparence) is defined to be visible centered at each of the given positions. It decomposes to the needed number of BitmapPrimitive2D's, so it would be efficient to handle it directly in a renderer. @@ -57,10 +57,10 @@ namespace drawinglayer { private: /// the positions for the marker - std::vector< basegfx::B2DPoint > maPositions; + std::vector< basegfx::B2DPoint > maPositions; /// the marker definintion to visualize - BitmapEx maMarker; + BitmapEx maMarker; protected: /// create local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx index a46f7d44e835..ff17956a8350 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,19 +49,19 @@ namespace drawinglayer it decomposes to it's Child content, and thus the visualisation would contaiun no clips. - The geometrc range of this primitive is completely defined by the Mask + The geometrc range of this primitive is completely defined by the Mask PolyPolygon since by definition nothing outside of the mask is visible. */ class MaskPrimitive2D : public GroupPrimitive2D { private: /// the mask PolyPolygon - basegfx::B2DPolyPolygon maMask; + basegfx::B2DPolyPolygon maMask; public: /// constructor MaskPrimitive2D( - const basegfx::B2DPolyPolygon& rMask, + const basegfx::B2DPolyPolygon& rMask, const Primitive2DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx index 9d64e204c936..375cdc7340b5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace drawinglayer This is a unified primitive for Media visualisation, e.g. animations or sounds. It's geometry is defined by Transform. For conveinience, it also contains a discrete border size (aka Pixels) which will be added - if used. This makes it a view-dependent primitive. It also gets a filled + if used. This makes it a view-dependent primitive. It also gets a filled background and the decomposition will try to create a graphic representation if te content (defined by the URL), e.g. a still frome for animated stuff. */ @@ -52,16 +52,16 @@ namespace drawinglayer { private: /// the geometry definition - basegfx::B2DHomMatrix maTransform; + basegfx::B2DHomMatrix maTransform; /// the content definition - rtl::OUString maURL; + rtl::OUString maURL; /// style: background color - basegfx::BColor maBackgroundColor; + basegfx::BColor maBackgroundColor; /// discrete border (in 'pixels') - sal_uInt32 mnDiscreteBorder; + sal_uInt32 mnDiscreteBorder; protected: /// local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx index e4763a818648..6dce36052987 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,21 +53,21 @@ namespace drawinglayer guaranteed that the Metafile is inside the geometric definition, it should be embedded to a MaskPrimitive2D. - This primitive has no decomposition yet, so when not supported by a renderer, + This primitive has no decomposition yet, so when not supported by a renderer, it will not be visualized. In the future, a decomposition implementation would be appreciated and would - have many advantages; Metafile would no longer have to be rendered by + have many advantages; Metafile would no longer have to be rendered by sub-systems and a standard way for converting Metafiles would exist. */ class MetafilePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition - basegfx::B2DHomMatrix maMetaFileTransform; + basegfx::B2DHomMatrix maMetaFileTransform; /// the content definition - GDIMetaFile maMetaFile; + GDIMetaFile maMetaFile; protected: /// local decomposition. @@ -75,7 +75,7 @@ namespace drawinglayer public: /// constructor MetafilePrimitive2D( - const basegfx::B2DHomMatrix& rMetaFileTransform, + const basegfx::B2DHomMatrix& rMetaFileTransform, const GDIMetaFile& rMetaFile); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index c96782e60fe0..15415bc20de2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,13 +43,13 @@ namespace drawinglayer This primitive is a grouping primitive and allows to define how the colors of it's child content shall be modified for visualisation. This can be (and is) used e.g. for generic shadow - visualisation by forcing all color usages of the contained + visualisation by forcing all color usages of the contained sub-content to the shadow color. For the possibilities of color modifications, please refer to the basegfx::BColorModifier definitions in basegfx. For processing there is tooling in basegfx to build a stack of - BColorModifiers to always be able to proccess the correct + BColorModifiers to always be able to proccess the correct colors. If a renderer does not handle this primitive, the content will @@ -59,12 +59,12 @@ namespace drawinglayer { private: /// The ColorModifier to use - basegfx::BColorModifier maColorModifier; + basegfx::BColorModifier maColorModifier; public: /// constructor ModifiedColorPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, const basegfx::BColorModifier& rColorModifier); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 7fc5e13a6e62..578fb07022c0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace drawinglayer namespace primitive2d { /** PagePreviewPrimitive2D class - + This primitive is needed to have the correct XDrawPage as ViewInformation for decomposing the page contents (given as PageContent here) if these contain e.g. view-dependent (in this case XDrawPage-dependent) text fields like PageNumber. If You want @@ -60,7 +60,7 @@ namespace drawinglayer Primitive2DSequence maPageContent; /// the own geometry - basegfx::B2DHomMatrix maTransform; + basegfx::B2DHomMatrix maTransform; /// content width and height double mfContentWidth; @@ -68,7 +68,7 @@ namespace drawinglayer /// bitfield /// flag to allow keeping the aspect ratio - unsigned mbKeepAspectRatio : 1; + unsigned mbKeepAspectRatio : 1; protected: /// local decomposition. Implementation will just return children diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index fb275d66544f..88c2f055489b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace drawinglayer { /** PointArrayPrimitive2D class - This primitive defines single,discrete 'pixels' for the given + This primitive defines single,discrete 'pixels' for the given positions in the given color. This makes it view-dependent since the logic size of a 'pixel' depends on the view transformation. @@ -53,13 +53,13 @@ namespace drawinglayer { private: /// the array of positions - std::vector< basegfx::B2DPoint > maPositions; + std::vector< basegfx::B2DPoint > maPositions; /// the color to use - basegfx::BColor maRGBColor; + basegfx::BColor maRGBColor; /// #i96669# add simple range buffering for this primitive - basegfx::B2DRange maB2DRange; + basegfx::B2DRange maB2DRange; public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx index 2bfeabf4305a..550852250f3e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,15 +56,15 @@ namespace drawinglayer { private: /// the hairline geometry - basegfx::B2DPolygon maPolygon; + basegfx::B2DPolygon maPolygon; /// the hairline color - basegfx::BColor maBColor; + basegfx::BColor maBColor; public: /// constructor PolygonHairlinePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rBColor); /// data read access @@ -103,17 +103,17 @@ namespace drawinglayer { private: /// the marker hairline geometry - basegfx::B2DPolygon maPolygon; + basegfx::B2DPolygon maPolygon; /// the two colors - basegfx::BColor maRGBColorA; - basegfx::BColor maRGBColorB; + basegfx::BColor maRGBColorA; + basegfx::BColor maRGBColorB; /// the dash distance in 'pixels' - double mfDiscreteDashLength; + double mfDiscreteDashLength; /// decomposition is view-dependent, remember last InverseObjectToViewTransformation - basegfx::B2DHomMatrix maLastInverseObjectToViewTransformation; + basegfx::B2DHomMatrix maLastInverseObjectToViewTransformation; protected: /// local decomposition. @@ -122,7 +122,7 @@ namespace drawinglayer public: /// constructor PolygonMarkerPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength); @@ -158,20 +158,20 @@ namespace drawinglayer /** PolygonStrokePrimitive2D class This primitive defines a line with line width, line join, line color - and stroke attributes. It will be decomposed dependent on the definition + and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled PolyPolygons for fat lines. */ class PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry - basegfx::B2DPolygon maPolygon; + basegfx::B2DPolygon maPolygon; /// the line attributes like width, join and color - attribute::LineAttribute maLineAttribute; + attribute::LineAttribute maLineAttribute; /// the line stroking (if used) - attribute::StrokeAttribute maStrokeAttribute; + attribute::StrokeAttribute maStrokeAttribute; protected: /// local decomposition. @@ -180,13 +180,13 @@ namespace drawinglayer public: /// constructor PolygonStrokePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute); /// constructor without stroking PolygonStrokePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access @@ -222,8 +222,8 @@ namespace drawinglayer { private: /// wave definition - double mfWaveWidth; - double mfWaveHeight; + double mfWaveWidth; + double mfWaveHeight; protected: /// local decomposition. @@ -232,7 +232,7 @@ namespace drawinglayer public: /// constructor PolygonWavePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute, double fWaveWidth, @@ -240,7 +240,7 @@ namespace drawinglayer /// constructor without stroking PolygonWavePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, double fWaveWidth, double fWaveHeight); @@ -278,8 +278,8 @@ namespace drawinglayer { private: /// geometric definitions for line start and end - attribute::LineStartEndAttribute maStart; - attribute::LineStartEndAttribute maEnd; + attribute::LineStartEndAttribute maStart; + attribute::LineStartEndAttribute maEnd; protected: /// local decomposition. @@ -288,17 +288,17 @@ namespace drawinglayer public: /// constructor PolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::StrokeAttribute& rStrokeAttribute, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd); /// constructor without stroking PolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 2ae5edbb1ea0..f5b35344b56b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,10 +56,10 @@ namespace drawinglayer { private: /// the hairline geometry - basegfx::B2DPolyPolygon maPolyPolygon; + basegfx::B2DPolyPolygon maPolyPolygon; /// the hairline color - basegfx::BColor maBColor; + basegfx::BColor maBColor; protected: /// local decomposition. @@ -102,14 +102,14 @@ namespace drawinglayer { private: /// the marker hairline geometry - basegfx::B2DPolyPolygon maPolyPolygon; - + basegfx::B2DPolyPolygon maPolyPolygon; + /// the two colors - basegfx::BColor maRGBColorA; - basegfx::BColor maRGBColorB; + basegfx::BColor maRGBColorA; + basegfx::BColor maRGBColorB; /// the dash distance in 'pixels' - double mfDiscreteDashLength; + double mfDiscreteDashLength; protected: /// local decomposition. @@ -118,7 +118,7 @@ namespace drawinglayer public: /// constructor PolyPolygonMarkerPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength); @@ -158,13 +158,13 @@ namespace drawinglayer { private: /// the line geometry - basegfx::B2DPolyPolygon maPolyPolygon; - + basegfx::B2DPolyPolygon maPolyPolygon; + /// the line attributes like width, join and color - attribute::LineAttribute maLineAttribute; - + attribute::LineAttribute maLineAttribute; + /// the line stroking (if used) - attribute::StrokeAttribute maStrokeAttribute; + attribute::StrokeAttribute maStrokeAttribute; protected: /// local decomposition. @@ -173,13 +173,13 @@ namespace drawinglayer public: /// constructor PolyPolygonStrokePrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute); /// constructor without stroking PolyPolygonStrokePrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access @@ -216,8 +216,8 @@ namespace drawinglayer { private: /// geometric definitions for line start and end - attribute::LineStartEndAttribute maStart; - attribute::LineStartEndAttribute maEnd; + attribute::LineStartEndAttribute maStart; + attribute::LineStartEndAttribute maEnd; protected: /// local decomposition. @@ -226,17 +226,17 @@ namespace drawinglayer public: /// constructor PolyPolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::StrokeAttribute& rStrokeAttribute, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd); /// constructor without stroking PolyPolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd); /// data read access @@ -272,15 +272,15 @@ namespace drawinglayer { private: /// the PolyPolygon geometry - basegfx::B2DPolyPolygon maPolyPolygon; + basegfx::B2DPolyPolygon maPolyPolygon; /// the polygon fill color - basegfx::BColor maBColor; + basegfx::BColor maBColor; public: /// constructor PolyPolygonColorPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor); /// data read access @@ -309,17 +309,17 @@ namespace drawinglayer /** PolyPolygonColorPrimitive2D class This primitive defines a PolyPolygon filled with a gradient. The - decomosition will create a MaskPrimitive2D containing a + decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ class PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry - basegfx::B2DPolyPolygon maPolyPolygon; + basegfx::B2DPolyPolygon maPolyPolygon; /// the gradient definition - attribute::FillGradientAttribute maFillGradient; + attribute::FillGradientAttribute maFillGradient; protected: /// local decomposition. @@ -328,7 +328,7 @@ namespace drawinglayer public: /// constructor PolyPolygonGradientPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::FillGradientAttribute& rFillGradient); /// data read access @@ -354,20 +354,20 @@ namespace drawinglayer /** PolyPolygonHatchPrimitive2D class This primitive defines a PolyPolygon filled with a hatch. The - decomosition will create a MaskPrimitive2D containing a + decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ class PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry - basegfx::B2DPolyPolygon maPolyPolygon; + basegfx::B2DPolyPolygon maPolyPolygon; /// the hatch background color (if used) - basegfx::BColor maBackgroundColor; + basegfx::BColor maBackgroundColor; /// the hatch definition - attribute::FillHatchAttribute maFillHatch; + attribute::FillHatchAttribute maFillHatch; protected: /// local decomposition. @@ -403,18 +403,18 @@ namespace drawinglayer { /** PolyPolygonBitmapPrimitive2D class - This primitive defines a PolyPolygon filled with bitmap data - (including transparence). The decomosition will create a MaskPrimitive2D + This primitive defines a PolyPolygon filled with bitmap data + (including transparence). The decomosition will create a MaskPrimitive2D containing a FillBitmapPrimitive2D. */ class PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry - basegfx::B2DPolyPolygon maPolyPolygon; + basegfx::B2DPolyPolygon maPolyPolygon; /// the bitmap fill definition (may include tiling) - attribute::FillBitmapAttribute maFillBitmap; + attribute::FillBitmapAttribute maFillBitmap; protected: /// local decomposition. @@ -423,7 +423,7 @@ namespace drawinglayer public: /// constructor PolyPolygonBitmapPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::FillBitmapAttribute& rFillBitmap); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx index 3548b8971fd3..5046faaa6fd6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace drawinglayer namespace primitive2d { /** DiscreteMetricDependentPrimitive2D class - + tooling class for BufferedDecompositionPrimitive2D baseed classes which are view-dependent regarding the size of a discrete unit. The implementation of get2DDecomposition guards the buffered local decomposition and ensures that a create2DDecomposition @@ -52,12 +52,12 @@ namespace drawinglayer is checked and updated from get2DDecomposition() it will be current and usable in create2DDecomposition() */ - double mfDiscreteUnit; + double mfDiscreteUnit; public: /// constructor DiscreteMetricDependentPrimitive2D() - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), mfDiscreteUnit(0.0) { } @@ -78,7 +78,7 @@ namespace drawinglayer namespace primitive2d { /** ViewportDependentPrimitive2D class - + tooling class for BufferedDecompositionPrimitive2D baseed classes which are view-dependent regarding the viewport. The implementation of get2DDecomposition guards the buffered local decomposition and ensures that a create2DDecomposition @@ -96,7 +96,7 @@ namespace drawinglayer public: /// constructor ViewportDependentPrimitive2D() - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maViewport() { } @@ -117,7 +117,7 @@ namespace drawinglayer namespace primitive2d { /** ViewTransformationDependentPrimitive2D class - + tooling class for BufferedDecompositionPrimitive2D based classes which are view-dependent regarding the complete Viewtransformation. The implementation of get2DDecomposition guards the buffered local decomposition and ensures that a create2DDecomposition @@ -130,12 +130,12 @@ namespace drawinglayer is checked and updated from get2DDecomposition() it will be current and usable in create2DDecomposition() */ - basegfx::B2DHomMatrix maViewTransformation; + basegfx::B2DHomMatrix maViewTransformation; public: /// constructor ViewTransformationDependentPrimitive2D() - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maViewTransformation() { } @@ -156,7 +156,7 @@ namespace drawinglayer namespace primitive2d { /** ObjectAndViewTransformationDependentPrimitive2D class - + tooling class for BufferedDecompositionPrimitive2D based classes which are view-dependent and Object-Transform dependent. The implementation of get2DDecomposition guards the buffered local decomposition and ensures that a create2DDecomposition @@ -166,17 +166,17 @@ namespace drawinglayer class ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /** the last used ViewTransformation and the last ObjectTransformation - definition for decomposition. Since this is checked and updated from + /** the last used ViewTransformation and the last ObjectTransformation + definition for decomposition. Since this is checked and updated from get2DDecomposition() it will be current and usable in create2DDecomposition() */ - basegfx::B2DHomMatrix maViewTransformation; - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maViewTransformation; + basegfx::B2DHomMatrix maObjectTransformation; public: /// constructor ObjectAndViewTransformationDependentPrimitive2D() - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maViewTransformation(), maObjectTransformation() { diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx index 7d55725cc15f..f12f03074257 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace drawinglayer The rendering is done using the default-3D renderer from basegfx which supports AntiAliasing. - The 2D primitive's geometric range is defined completely by the + The 2D primitive's geometric range is defined completely by the ObjectTransformation combined with evtl. 2D shadows from the 3D objects. The shadows of 3D objects are 2D polygons, projected with the 3D transformation. @@ -64,33 +64,33 @@ namespace drawinglayer { private: /// the 3D geometry definition - primitive3d::Primitive3DSequence mxChildren3D; + primitive3d::Primitive3DSequence mxChildren3D; /// 3D scene attribute set - attribute::SdrSceneAttribute maSdrSceneAttribute; + attribute::SdrSceneAttribute maSdrSceneAttribute; /// lighting attribute set - attribute::SdrLightingAttribute maSdrLightingAttribute; + attribute::SdrLightingAttribute maSdrLightingAttribute; /// object transformation for scene for 2D definition - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maObjectTransformation; /// scene transformation set and object transformation - geometry::ViewInformation3D maViewInformation3D; + geometry::ViewInformation3D maViewInformation3D; /// the primitiveSequence for on-demand created shadow primitives (see mbShadow3DChecked) - Primitive2DSequence maShadowPrimitives; + Primitive2DSequence maShadowPrimitives; /// bitfield /** flag if given 3D geometry is already cheched for shadow definitions and 2d shadows are created in maShadowPrimitives */ - unsigned mbShadow3DChecked : 1; + unsigned mbShadow3DChecked : 1; /// the last used NewDiscreteSize and NewUnitVisiblePart definitions for decomposition - double mfOldDiscreteSizeX; - double mfOldDiscreteSizeY; - basegfx::B2DRange maOldUnitVisiblePart; + double mfOldDiscreteSizeX; + double mfOldDiscreteSizeY; + basegfx::B2DRange maOldUnitVisiblePart; /** the last created BitmapEx, e.g. for fast HitTest. This does not really need memory since BitmapEx is internally RefCounted @@ -119,11 +119,11 @@ namespace drawinglayer Primitive2DSequence getShadow2D(const geometry::ViewInformation2D& rViewInformation) const; /** Fast HitTest which uses the last buffered BitmapEx from the last - rendered area if available. The return value describes if the check + rendered area if available. The return value describes if the check could be done with the current information, so do NOT use o_rResult when it returns false. o_rResult will be changed on return true and - then contains a definitive answer if content of this scene is hit or - not. On return false, it is normally necessary to use the geometric + then contains a definitive answer if content of this scene is hit or + not. On return false, it is normally necessary to use the geometric HitTest (see CutFindProcessor usages). The given HitPoint has to be in logic coordinates in scene's ObjectCoordinateSystem. */ @@ -131,9 +131,9 @@ namespace drawinglayer /// constructor ScenePrimitive2D( - const primitive3d::Primitive3DSequence& rxChildren3D, - const attribute::SdrSceneAttribute& rSdrSceneAttribute, - const attribute::SdrLightingAttribute& rSdrLightingAttribute, + const primitive3d::Primitive3DSequence& rxChildren3D, + const attribute::SdrSceneAttribute& rSdrSceneAttribute, + const attribute::SdrLightingAttribute& rSdrLightingAttribute, const basegfx::B2DHomMatrix& rObjectTransformation, const geometry::ViewInformation3D& rViewInformation3D); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index 40ef57724f4f..474f4fdfaa1d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -42,8 +42,8 @@ ////////////////////////////////////////////////////////////////////////////// // predefines -namespace basegfx { - class B2DPolyPolygon; +namespace basegfx { + class B2DPolyPolygon; class B2DHomMatrix; } diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx index 0ae428a6fc22..98d78c31bfd9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,16 +57,16 @@ namespace drawinglayer { private: /// the shadow transformation, normally just an offset - basegfx::B2DHomMatrix maShadowTransform; + basegfx::B2DHomMatrix maShadowTransform; /// the shadow color to which all geometry is to be forced - basegfx::BColor maShadowColor; + basegfx::BColor maShadowColor; public: /// constructor ShadowPrimitive2D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, const Primitive2DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 58da9a51fa63..a387b4468f88 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace drawinglayer namespace primitive2d { /** StructureTagPrimitive2D class - + This class is used to provode simple support for adding grouped pdf writer structured element information like used in sd from unomodel.cxx where a ViewObjectContactRedirector is used to add @@ -54,7 +54,7 @@ namespace drawinglayer { private: /// the PDF structure element this grouping represents - vcl::PDFWriter::StructElement maStructureElement; + vcl::PDFWriter::StructElement maStructureElement; public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 33d20ca4361c..1ade2f0a76d9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,16 +64,16 @@ namespace drawinglayer basegfx::BColor maTextlineColor; TextLine meFontOverline; TextLine meFontUnderline; - TextStrikeout meTextStrikeout; - TextEmphasisMark meTextEmphasisMark; - TextRelief meTextRelief; + TextStrikeout meTextStrikeout; + TextEmphasisMark meTextEmphasisMark; + TextRelief meTextRelief; /// bitfield - unsigned mbUnderlineAbove : 1; - unsigned mbWordLineMode : 1; - unsigned mbEmphasisMarkAbove : 1; - unsigned mbEmphasisMarkBelow : 1; - unsigned mbShadow : 1; + unsigned mbUnderlineAbove : 1; + unsigned mbWordLineMode : 1; + unsigned mbEmphasisMarkAbove : 1; + unsigned mbEmphasisMarkBelow : 1; + unsigned mbShadow : 1; /// helper methods void impCreateGeometryContent( diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 7f00c04ed34d..988fa4f585f3 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,14 +61,14 @@ namespace drawinglayer Primitive2DSequence maTextContent; /// the style to apply, the direction and the rotation center - const basegfx::B2DPoint maRotationCenter; - double mfDirection; + const basegfx::B2DPoint maRotationCenter; + double mfDirection; TextEffectStyle2D meTextEffectStyle2D; - /** the last used object to view transformtion used from getDecomposition + /** the last used object to view transformtion used from getDecomposition for decide buffering */ - basegfx::B2DHomMatrix maLastObjectToViewTransformation; + basegfx::B2DHomMatrix maLastObjectToViewTransformation; protected: /// create local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx index ce4616e7b0d4..9622e78d91ba 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace drawinglayer namespace primitive2d { /** TextLine definition - + This is used for both underline and overline */ enum TextLine diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index d5370b85fbd2..71d7e1ec7c89 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,16 +138,16 @@ namespace drawinglayer /** FieldType definition */ enum FieldType { - /** unspecified. If more info is needed for a FieldType, + /** unspecified. If more info is needed for a FieldType, create a new type and it's handling */ - FIELD_TYPE_COMMON, + FIELD_TYPE_COMMON, /** uses "FIELD_SEQ_BEGIN;PageField" -> special handling */ FIELD_TYPE_PAGE, /** uses URL as string -> special handling */ - FIELD_TYPE_URL + FIELD_TYPE_URL }; /** TextHierarchyFieldPrimitive2D class @@ -160,14 +160,14 @@ namespace drawinglayer class TextHierarchyFieldPrimitive2D : public GroupPrimitive2D { private: - FieldType meType; + FieldType meType; rtl::OUString maString; public: /// constructor TextHierarchyFieldPrimitive2D( const Primitive2DSequence& rChildren, - const FieldType& rFieldType, + const FieldType& rFieldType, const rtl::OUString& rString); /// data read access @@ -195,7 +195,7 @@ namespace drawinglayer Primitive to encapsulate text from an active text edit; some renderers need to suppress this output due to painting the edited text in e.g. an OutlinerEditView. It's derived from - GroupPrimitive2D, so the implicit decomposition will use the + GroupPrimitive2D, so the implicit decomposition will use the content. To suppress, this primitive needs to be parsed by the renderer without taking any action. */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx index 64629d8bd2d1..159f3305004f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace drawinglayer class TextLayouterDevice { /// internally used VirtualDevice - VirtualDevice& mrDevice; + VirtualDevice& mrDevice; public: /// constructor/destructor @@ -80,9 +80,9 @@ namespace drawinglayer /// tooling methods void setFont(const Font& rFont); void setFontAttribute( - const attribute::FontAttribute& rFontAttribute, - double fFontScaleX, - double fFontScaleY, + const attribute::FontAttribute& rFontAttribute, + double fFontScaleX, + double fFontScaleY, const ::com::sun::star::lang::Locale & rLocale); double getTextHeight() const; @@ -135,7 +135,7 @@ namespace drawinglayer { /** Create a VCL-Font based on the definitions in FontAttribute and the given FontScaling. The FontScaling defines the FontHeight - (fFontScaleY) and the FontWidth (fFontScaleX). The combination of + (fFontScaleY) and the FontWidth (fFontScaleX). The combination of both defines FontStretching, where no stretching happens at fFontScaleY == fFontScaleX */ @@ -148,13 +148,13 @@ namespace drawinglayer /** Generate FontAttribute DataSet derived from the given VCL-Font. The FontScaling with fFontScaleY, fFontScaleX relationship (see - above) will be set in return parameter o_rSize to allow further + above) will be set in return parameter o_rSize to allow further processing */ attribute::FontAttribute getFontAttributeFromVclFont( - basegfx::B2DVector& o_rSize, - const Font& rFont, - bool bRTL, + basegfx::B2DVector& o_rSize, + const Font& rFont, + bool bRTL, bool bBiDiStrong); } // end of namespace primitive2d diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx index 64249c83f164..cef58307d52b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx index bc80b888f2c2..b7a805e2a85d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace drawinglayer /** TextSimplePortionPrimitive2D class This is the basic primitive for representing a text portion. It contains - all needed information. If it is not handled by a renderer, it's decomposition + all needed information. If it is not handled by a renderer, it's decomposition will provide the text PolyPolygon outlines as filled polygons, correctly transformed. @@ -86,10 +86,10 @@ namespace drawinglayer @param rDXArray The distances between the characters. This parameter may be empty, in that case the renderer is responsible to do something useful. If it is given, it has to be of - the size aTextLength. Its values are in logical coordinates and describe the + the size aTextLength. Its values are in logical coordinates and describe the distance for each character to use. This is independent from the font width which is given with maTextTransform. The first value is the offset to use from the start - point in FontCoordinateSystem X-Direction (given by maTextTransform) to the start + point in FontCoordinateSystem X-Direction (given by maTextTransform) to the start point of the second character @param rFontAttribute @@ -105,31 +105,31 @@ namespace drawinglayer { private: /// text transformation (FontCoordinateSystem) - basegfx::B2DHomMatrix maTextTransform; + basegfx::B2DHomMatrix maTextTransform; /// The text, used from maTextPosition up to maTextPosition + maTextLength - String maText; + String maText; /// The index from where on maText is used - xub_StrLen maTextPosition; - + xub_StrLen maTextPosition; + /// The length for maText usage, starting from maTextPosition - xub_StrLen maTextLength; - + xub_StrLen maTextLength; + /// The DX array in logic units - ::std::vector< double > maDXArray; - + ::std::vector< double > maDXArray; + /// The font definition - attribute::FontAttribute maFontAttribute; - + attribute::FontAttribute maFontAttribute; + /// The Locale for the text - ::com::sun::star::lang::Locale maLocale; - + ::com::sun::star::lang::Locale maLocale; + /// font color - basegfx::BColor maFontColor; + basegfx::BColor maFontColor; /// #i96669# internal: add simple range buffering for this primitive - basegfx::B2DRange maB2DRange; + basegfx::B2DRange maB2DRange; bool mbFilled; // Whether to fill a given width with the text long mnWidthToFill; // the width to fill diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 674545ca5554..478c65ec579c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace drawinglayer { private: sal_Unicode maStrikeoutChar; - attribute::FontAttribute maFontAttribute; + attribute::FontAttribute maFontAttribute; ::com::sun::star::lang::Locale maLocale; protected: @@ -122,7 +122,7 @@ namespace drawinglayer private: double mfHeight; double mfOffset; - TextStrikeout meTextStrikeout; + TextStrikeout meTextStrikeout; protected: /// local decomposition. diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx index 508d81cdbf28..0e80da9025a5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,21 +52,21 @@ namespace drawinglayer transformation as Child-content. This allows re-usage of the refcounted Uno-Api primitives and their existung, buffered decompositions. - - It could e.g. be used to show a single object geometry in 1000 - different, transformed states without the need to create those + + It could e.g. be used to show a single object geometry in 1000 + different, transformed states without the need to create those thousand primitive contents. */ class TransformPrimitive2D : public GroupPrimitive2D { private: // the transformation to apply to the child geometry - basegfx::B2DHomMatrix maTransformation; + basegfx::B2DHomMatrix maTransformation; public: /// constructor TransformPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + const basegfx::B2DHomMatrix& rTransformation, const Primitive2DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 02374e40cab7..73e137ad8ce7 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer This is the basic primitive for applying freely defined transparence to freely defined content. The basic idea is to associate a content which is defined as a sequence of primitives and hold as child content - in the GroupPrimitive2D with a transparence channel also defined as a sequence + in the GroupPrimitive2D with a transparence channel also defined as a sequence of primitives and hold in the transparence member. The basic definition is to use the transparence content as transparence-Mask by @@ -59,14 +59,14 @@ namespace drawinglayer The defining geometry is the Range of the child primitive sequence, this means the renderers will/shall use this geometric information for - rendering, not the transparent one. The transparent one should/will be clipped + rendering, not the transparent one. The transparent one should/will be clipped accordingly. */ class TransparencePrimitive2D : public GroupPrimitive2D { private: /// The transparence-Mask who's RGB-Values are interpreted as Luminance - Primitive2DSequence maTransparence; + Primitive2DSequence maTransparence; public: /** constructor @@ -81,7 +81,7 @@ namespace drawinglayer using the common RGB_to_luminance definitions */ TransparencePrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, const Primitive2DSequence& rTransparence); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 10ca187a9fb9..6bc1f12abb93 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -58,12 +58,12 @@ namespace drawinglayer { private: /// the unified transparence - double mfTransparence; + double mfTransparence; public: /// constructor UnifiedTransparencePrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, double fTransparence); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index b3cbbaa69235..60ef801f5bbd 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace drawinglayer class WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D { private: - basegfx::B2DRange maObjectRange; - BitmapEx maBitmapEx; - WallpaperStyle meWallpaperStyle; + basegfx::B2DRange maObjectRange; + BitmapEx maBitmapEx; + WallpaperStyle meWallpaperStyle; protected: /// create local decomposition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index be5c6b3cad67..b8143c91b46d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,12 +58,12 @@ namespace drawinglayer { private: /// geometry definition - basegfx::B2DHomMatrix maTransformation; + basegfx::B2DHomMatrix maTransformation; double mfStart; double mfStop; /// color (usually red) - basegfx::BColor maColor; + basegfx::BColor maColor; protected: /// create local decomposition |