diff options
Diffstat (limited to 'drawinglayer/inc/drawinglayer')
104 files changed, 915 insertions, 915 deletions
diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx index 106424b0a73a..e50c0f93bf84 100644 --- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx +++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.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 @@ -62,8 +62,8 @@ namespace drawinglayer class AnimationEntryFixed : public AnimationEntry { protected: - double mfDuration; - double mfState; + double mfDuration; + double mfState; public: AnimationEntryFixed(double fDuration, double fState = 0.0); @@ -81,10 +81,10 @@ namespace drawinglayer class AnimationEntryLinear : public AnimationEntry { protected: - double mfDuration; - double mfFrequency; - double mfStart; - double mfStop; + double mfDuration; + double mfFrequency; + double mfStart; + double mfStop; public: AnimationEntryLinear(double fDuration, double fFrequency = 250.0, double fStart = 0.0, double fStop = 1.0); @@ -102,8 +102,8 @@ namespace drawinglayer class AnimationEntryList : public AnimationEntry { protected: - double mfDuration; - ::std::vector< AnimationEntry* > maEntries; + double mfDuration; + ::std::vector< AnimationEntry* > maEntries; // helpers sal_uInt32 impGetIndexAtTime(double fTime, double &rfAddedTime) const; @@ -125,7 +125,7 @@ namespace drawinglayer class AnimationEntryLoop : public AnimationEntryList { protected: - sal_uInt32 mnRepeat; + sal_uInt32 mnRepeat; public: AnimationEntryLoop(sal_uInt32 nRepeat = 0xffffffff); diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx index 41ca480bfab0..fe6be1eb322f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.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 @@ -59,9 +59,9 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor FillBitmapAttribute( - const BitmapEx& rBitmapEx, - const basegfx::B2DPoint& rTopLeft, - const basegfx::B2DVector& rSize, + const BitmapEx& rBitmapEx, + const basegfx::B2DPoint& rTopLeft, + const basegfx::B2DVector& rSize, bool bTiling); FillBitmapAttribute(); FillBitmapAttribute(const FillBitmapAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx index 0f6cad36898a..2cbe205208d7 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -59,11 +59,11 @@ namespace drawinglayer { enum GradientStyle { - GRADIENTSTYLE_LINEAR, - GRADIENTSTYLE_AXIAL, + GRADIENTSTYLE_LINEAR, + GRADIENTSTYLE_AXIAL, GRADIENTSTYLE_RADIAL, - GRADIENTSTYLE_ELLIPTICAL, - GRADIENTSTYLE_SQUARE, + GRADIENTSTYLE_ELLIPTICAL, + GRADIENTSTYLE_SQUARE, GRADIENTSTYLE_RECT }; } // end of namespace attribute @@ -83,13 +83,13 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor FillGradientAttribute( - GradientStyle eStyle, - double fBorder, - double fOffsetX, - double fOffsetY, - double fAngle, - const basegfx::BColor& rStartColor, - const basegfx::BColor& rEndColor, + GradientStyle eStyle, + double fBorder, + double fOffsetX, + double fOffsetY, + double fAngle, + const basegfx::BColor& rStartColor, + const basegfx::BColor& rEndColor, sal_uInt16 nSteps); FillGradientAttribute(); FillGradientAttribute(const FillGradientAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx index e1430ce164e4..03723fb6774f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -59,8 +59,8 @@ namespace drawinglayer { enum HatchStyle { - HATCHSTYLE_SINGLE, - HATCHSTYLE_DOUBLE, + HATCHSTYLE_SINGLE, + HATCHSTYLE_DOUBLE, HATCHSTYLE_TRIPLE }; } // end of namespace attribute @@ -80,10 +80,10 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor FillHatchAttribute( - HatchStyle eStyle, - double fDistance, - double fAngle, - const basegfx::BColor& rColor, + HatchStyle eStyle, + double fDistance, + double fAngle, + const basegfx::BColor& rColor, bool bFillBackground); FillHatchAttribute(); FillHatchAttribute(const FillHatchAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx index 1382c506669a..9ba55aad26ac 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.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/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx index b4e006d7b750..64112d9643c3 100644 --- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.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/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx index c8745778eb21..1a16b4ef0fdc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.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,8 +56,8 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor LineStartEndAttribute( - double fWidth, - const basegfx::B2DPolyPolygon& rPolyPolygon, + double fWidth, + const basegfx::B2DPolyPolygon& rPolyPolygon, bool bCentered); LineStartEndAttribute(); LineStartEndAttribute(const LineStartEndAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx index 2b4ea4b90743..e65c31ebdec7 100644 --- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.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 class MaterialAttribute3D { private: - ImpMaterialAttribute3D* mpMaterialAttribute3D; + ImpMaterialAttribute3D* mpMaterialAttribute3D; public: // constructors/destructor MaterialAttribute3D( - const basegfx::BColor& rColor, - const basegfx::BColor& rSpecular, - const basegfx::BColor& rEmission, + const basegfx::BColor& rColor, + const basegfx::BColor& rSpecular, + const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity); MaterialAttribute3D(const basegfx::BColor& rColor); MaterialAttribute3D(); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx index c3857e617d69..d335e6295c63 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.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,19 +48,19 @@ namespace drawinglayer class SdrLineFillShadowAttribute3D { private: - const SdrLineAttribute maLine; - const SdrFillAttribute maFill; - const SdrLineStartEndAttribute maLineStartEnd; - const SdrShadowAttribute maShadow; - const FillGradientAttribute maFillFloatTransGradient; + const SdrLineAttribute maLine; + const SdrFillAttribute maFill; + const SdrLineStartEndAttribute maLineStartEnd; + const SdrShadowAttribute maShadow; + const FillGradientAttribute maFillFloatTransGradient; public: /// constructors/assignmentoperator/destructor SdrLineFillShadowAttribute3D( - const SdrLineAttribute& rLine, - const SdrFillAttribute& rFill, - const SdrLineStartEndAttribute& rLineStartEnd, - const SdrShadowAttribute& rShadow, + const SdrLineAttribute& rLine, + const SdrFillAttribute& rFill, + const SdrLineStartEndAttribute& rLineStartEnd, + const SdrShadowAttribute& rShadow, const FillGradientAttribute& rFillFloatTransGradient); SdrLineFillShadowAttribute3D(); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx index 6d6764efb918..1d4b184bc1f6 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx @@ -67,10 +67,10 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrFillAttribute( - double fTransparence, - const basegfx::BColor& rColor, - const FillGradientAttribute& rGradient, - const FillHatchAttribute& rHatch, + double fTransparence, + const basegfx::BColor& rColor, + const FillGradientAttribute& rGradient, + const FillHatchAttribute& rHatch, const SdrFillBitmapAttribute& rBitmap); SdrFillAttribute(); SdrFillAttribute(const SdrFillAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx index 9e5721620e06..575ebf147cdc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.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 @@ -60,13 +60,13 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrFillBitmapAttribute( - const Bitmap& rBitmap, - const basegfx::B2DVector& rSize, + const Bitmap& rBitmap, + const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, - const basegfx::B2DVector& rOffsetPosition, + const basegfx::B2DVector& rOffsetPosition, const basegfx::B2DVector& rRectPoint, - bool bTiling, - bool bStretch, + bool bTiling, + bool bStretch, bool bLogSize); SdrFillBitmapAttribute(); SdrFillBitmapAttribute(const SdrFillBitmapAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx index 0b42d7dbf05e..10d84f86eacc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -65,8 +65,8 @@ namespace drawinglayer public: // constructors/destructor Sdr3DLightAttribute( - const basegfx::BColor& rColor, - const basegfx::B3DVector& rDirection, + const basegfx::BColor& rColor, + const basegfx::B3DVector& rDirection, bool bSpecular); Sdr3DLightAttribute(const basegfx::BColor& rColor); Sdr3DLightAttribute(); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx index f086d4b3cbda..9ff1f18997c7 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -87,7 +87,7 @@ namespace drawinglayer // color model solver basegfx::BColor solveColorModel( const basegfx::B3DVector& rNormalInEyeCoordinates, - const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, + const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) const; }; } // end of namespace attribute diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx index c4f32026d2e3..11e364cacff9 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx @@ -66,11 +66,11 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrLineAttribute( - basegfx::B2DLineJoin eJoin, - double fWidth, - double fTransparence, - const basegfx::BColor& rColor, - const ::std::vector< double >& rDotDashArray, + basegfx::B2DLineJoin eJoin, + double fWidth, + double fTransparence, + const basegfx::BColor& rColor, + const ::std::vector< double >& rDotDashArray, double fFullDotDashLen); SdrLineAttribute(const basegfx::BColor& rColor); SdrLineAttribute(); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx index 407d3c56997a..18831d8716f3 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -64,13 +64,13 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrLineStartEndAttribute( - const basegfx::B2DPolyPolygon& rStartPolyPolygon, + const basegfx::B2DPolyPolygon& rStartPolyPolygon, const basegfx::B2DPolyPolygon& rEndPolyPolygon, - double fStartWidth, - double fEndWidth, - bool bStartActive, - bool bEndActive, - bool bStartCentered, + double fStartWidth, + double fEndWidth, + bool bStartActive, + bool bEndActive, + bool bStartCentered, bool bEndCentered); SdrLineStartEndAttribute(); SdrLineStartEndAttribute(const SdrLineStartEndAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx index f322f444605a..87c8ccbccce5 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer public: // constructors/destructor Sdr3DObjectAttribute( - ::com::sun::star::drawing::NormalsKind aNormalsKind, + ::com::sun::star::drawing::NormalsKind aNormalsKind, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY, ::com::sun::star::drawing::TextureKind2 aTextureKind, diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx index 3fabb00cca8d..d92c3c78b8c5 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx @@ -65,8 +65,8 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrShadowAttribute( - const basegfx::B2DVector& rOffset, - double fTransparence, + const basegfx::B2DVector& rOffset, + double fTransparence, const basegfx::BColor& rColor); SdrShadowAttribute(); SdrShadowAttribute(const SdrShadowAttribute& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx index b9e4d15cd6e2..4578a8fe24db 100644 --- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.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/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index e397eeb94395..b71a57b4fdf6 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.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 @@ -67,7 +67,7 @@ namespace drawinglayer { private: /// pointer to private implementation class - ImpViewInformation2D* mpViewInformation2D; + ImpViewInformation2D* mpViewInformation2D; public: /** Constructor: Create a ViewInformation2D @@ -99,9 +99,9 @@ namespace drawinglayer be preferred and overwrite the given parameter */ ViewInformation2D( - const basegfx::B2DHomMatrix& rObjectTransformation, - const basegfx::B2DHomMatrix& rViewTransformation, - const basegfx::B2DRange& rViewport, + const basegfx::B2DHomMatrix& rObjectTransformation, + const basegfx::B2DHomMatrix& rViewTransformation, + const basegfx::B2DRange& rViewport, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage, double fViewTime, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rExtendedParameters); @@ -109,7 +109,7 @@ namespace drawinglayer /** Constructor: Create a ViewInformation2D @param rViewParameters - A sequence of property values which allows holding any combination of local and various + A sequence of property values which allows holding any combination of local and various other parameters. This constructor is feeded completely with a sequence of PropertyValues which will be parsed to be able to offer the most used ones in a convenient way. */ @@ -144,7 +144,7 @@ namespace drawinglayer /// On-demand prepared Object to View transformation and it's inerse for convenience const basegfx::B2DHomMatrix& getObjectToViewTransformation() const; const basegfx::B2DHomMatrix& getInverseObjectToViewTransformation() const; - + /// On-demand prepared Viewport in discrete units for convenience const basegfx::B2DRange& getDiscreteViewport() const; diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx index e8b6299769cb..3f720a72d305 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.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 @@ -65,7 +65,7 @@ namespace drawinglayer { private: /// pointer to private implementation class - ImpViewInformation3D* mpViewInformation3D; + ImpViewInformation3D* mpViewInformation3D; public: /** Constructor: Create a ViewInformation3D @@ -104,17 +104,17 @@ namespace drawinglayer be preferred and overwrite the given parameter */ ViewInformation3D( - const basegfx::B3DHomMatrix& rObjectTransformation, - const basegfx::B3DHomMatrix& rOrientation, - const basegfx::B3DHomMatrix& rProjection, - const basegfx::B3DHomMatrix& rDeviceToView, + const basegfx::B3DHomMatrix& rObjectTransformation, + const basegfx::B3DHomMatrix& rOrientation, + const basegfx::B3DHomMatrix& rProjection, + const basegfx::B3DHomMatrix& rDeviceToView, double fViewTime, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rExtendedParameters); /** Constructor: Create a ViewInformation3D @param rViewParameters - A sequence of property values which allows holding any combination of local and various + A sequence of property values which allows holding any combination of local and various other parameters. This constructor is feeded completely with a sequence of PropertyValues which will be parsed to be able to offer the most used ones in a convenient way. */ 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 diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index b80bd9d0a8ed..3d3cf4aae0d1 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.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,21 +70,21 @@ namespace drawinglayer namespace primitive3d { /** BasePrimitive3D class - + Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information. Current Basic 3D Primitives are: - + - PolygonHairlinePrimitive3D (for 3D hairlines) - PolyPolygonMaterialPrimitive3D (for 3D filled plane polygons) That's all for 3D! */ class BasePrimitive3D - : private boost::noncopyable, + : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase { @@ -142,18 +142,18 @@ namespace drawinglayer namespace primitive3d { /** BufferedDecompositionPrimitive3D class - + Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information */ class BufferedDecompositionPrimitive3D - : public BasePrimitive3D + : public BasePrimitive3D { private: /// a sequence used for buffering the last create3DDecomposition() result - Primitive3DSequence maBuffered3DDecomposition; + Primitive3DSequence maBuffered3DDecomposition; protected: /** access methods to maBuffered3DDecomposition. The usage of this methods may allow @@ -172,10 +172,10 @@ namespace drawinglayer // constructor BufferedDecompositionPrimitive3D(); - /** The getDecomposition default implementation will on demand use create3DDecomposition() if - maBuffered3DDecomposition is empty. It will set maBuffered3DDecomposition to this obtained decomposition - to buffer it. If the decomposition is also ViewInformation-dependent, this method needs to be - overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and + /** The getDecomposition default implementation will on demand use create3DDecomposition() if + maBuffered3DDecomposition is empty. It will set maBuffered3DDecomposition to this obtained decomposition + to buffer it. If the decomposition is also ViewInformation-dependent, this method needs to be + overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 0255cf3ddb3b..2f6aeb8c93a7 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.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,30 +32,30 @@ ////////////////////////////////////////////////////////////////////////////// // define ranges for other libraries -#define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) -// #define PRIMITIVE3D_ID_RANGE_SVX (1 << 16) +#define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) +// #define PRIMITIVE3D_ID_RANGE_SVX (1 << 16) ////////////////////////////////////////////////////////////////////////////// // local primitives -#define PRIMITIVE3D_ID_GROUPPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 0) -#define PRIMITIVE3D_ID_HATCHTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 1) -#define PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 2) -#define PRIMITIVE3D_ID_POLYGONHAIRLINEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 3) -#define PRIMITIVE3D_ID_POLYGONSTROKEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 4) -#define PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 5) -#define PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 6) -#define PRIMITIVE3D_ID_SDRCUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 7) -#define PRIMITIVE3D_ID_SDREXTRUDEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 8) -#define PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 9) -#define PRIMITIVE3D_ID_SDRPOLYPOLYGONPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 10) -#define PRIMITIVE3D_ID_SDRSPHEREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 11) -#define PRIMITIVE3D_ID_SHADOWPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 12) -#define PRIMITIVE3D_ID_UNIFIEDTRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 13) -#define PRIMITIVE3D_ID_GRADIENTTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 14) -#define PRIMITIVE3D_ID_BITMAPTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 15) -#define PRIMITIVE3D_ID_TRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 16) -#define PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 17) +#define PRIMITIVE3D_ID_GROUPPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 0) +#define PRIMITIVE3D_ID_HATCHTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 1) +#define PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 2) +#define PRIMITIVE3D_ID_POLYGONHAIRLINEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 3) +#define PRIMITIVE3D_ID_POLYGONSTROKEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 4) +#define PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 5) +#define PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 6) +#define PRIMITIVE3D_ID_SDRCUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 7) +#define PRIMITIVE3D_ID_SDREXTRUDEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 8) +#define PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 9) +#define PRIMITIVE3D_ID_SDRPOLYPOLYGONPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 10) +#define PRIMITIVE3D_ID_SDRSPHEREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 11) +#define PRIMITIVE3D_ID_SHADOWPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 12) +#define PRIMITIVE3D_ID_UNIFIEDTRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 13) +#define PRIMITIVE3D_ID_GRADIENTTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 14) +#define PRIMITIVE3D_ID_BITMAPTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 15) +#define PRIMITIVE3D_ID_TRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 16) +#define PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 17) #define PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 18) ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index 6b2a3ba9c773..a51bae2d52dd 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.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 @@ -38,7 +38,7 @@ namespace drawinglayer namespace primitive3d { /** GroupPrimitive3D class - + Baseclass for all grouping 3D primitives The description/functionality is identical with the 2D case in groupprimitive2d.hxx, @@ -60,7 +60,7 @@ namespace drawinglayer { private: /// the children. Declared private since this shall never be changed at all after construction - Primitive3DSequence maChildren; + Primitive3DSequence maChildren; public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index f2f88b56bda0..ef5e09cc68e2 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.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 primitive3d { /** HatchTexturePrimitive3D class - + HatchTexturePrimitive3D is derived from GroupPrimitive3D, but implements a decomposition which is complicated enough for buffering. Since the group primitive has no default buffering, it is necessary here to add a local @@ -49,7 +49,7 @@ namespace drawinglayer { private: /// the hatch definition - attribute::FillHatchAttribute maHatch; + attribute::FillHatchAttribute maHatch; /// the buffered decomposed hatch Primitive3DSequence maBuffered3DDecomposition; @@ -65,10 +65,10 @@ namespace drawinglayer public: /// constructor HatchTexturePrimitive3D( - const attribute::FillHatchAttribute& rHatch, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillHatchAttribute& rHatch, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index d79f41077872..2b53cd913383 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -46,9 +46,9 @@ namespace drawinglayer namespace primitive3d { // This primitive is used to represent geometry for non-visible objects, - // e.g. a 3D cube without fill attributes. To still be able to use - // primitives for HitTest functionality, the 3d decompositions produce - // an as much as possible simplified fill geometry encapsulated in this + // e.g. a 3D cube without fill attributes. To still be able to use + // primitives for HitTest functionality, the 3d decompositions produce + // an as much as possible simplified fill geometry encapsulated in this // primtive when there is no fill geometry. Currently, the 3d hit test // uses only areas, so maybe in a further enchanced version this will change // to 'if neither filled nor lines' creation criteria. The whole primitive @@ -60,7 +60,7 @@ namespace drawinglayer public: HiddenGeometryPrimitive3D(const Primitive3DSequence& 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::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index b28dca4c445b..1f142c0742cd 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.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,12 +49,12 @@ namespace drawinglayer { private: /// The ColorModifier to use - basegfx::BColorModifier maColorModifier; + basegfx::BColorModifier maColorModifier; public: /// constructor ModifiedColorPrimitive3D( - const Primitive3DSequence& rChildren, + const Primitive3DSequence& rChildren, const basegfx::BColorModifier& rColorModifier); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 1b92bced8258..eba60a18c7c0 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.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,15 +53,15 @@ namespace drawinglayer { private: /// the hairline geometry - basegfx::B3DPolygon maPolygon; - + basegfx::B3DPolygon maPolygon; + /// the hairline color - basegfx::BColor maBColor; + basegfx::BColor maBColor; public: /// constructor PolygonHairlinePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor); /// data read access @@ -89,20 +89,20 @@ namespace drawinglayer /** PolygonStrokePrimitive3D class This primitive defines a 3D 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 Tubes for fat lines. */ class PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D { private: /// the line geometry - basegfx::B3DPolygon maPolygon; - + basegfx::B3DPolygon 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. @@ -111,13 +111,13 @@ namespace drawinglayer public: /// constructor PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute); /// constructor without stroking PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 7d5620305134..b353ad05792a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.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,13 +56,13 @@ namespace drawinglayer { private: /// hold the last decompositon since it's expensive - Primitive3DSequence maLast3DDecomposition; + Primitive3DSequence maLast3DDecomposition; /// visualisation parameters - double mfRadius; - double mfDegreeStepWidth; - double mfMiterMinimumAngle; - basegfx::B2DLineJoin maLineJoin; + double mfRadius; + double mfDegreeStepWidth; + double mfMiterMinimumAngle; + basegfx::B2DLineJoin maLineJoin; protected: /** access methods to maLast3DDecomposition. The usage of this methods may allow @@ -78,7 +78,7 @@ namespace drawinglayer public: /// constructor PolygonTubePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor, double fRadius, basegfx::B2DLineJoin aLineJoin, double fDegreeStepWidth = 10.0 * F_PI180, @@ -93,7 +93,7 @@ namespace drawinglayer /// compare operator virtual bool operator==(const BasePrimitive3D& rPrimitive) const; - /** local decomposition. Use own buffering since we are not derived from + /** local decomposition. Use own buffering since we are not derived from BufferedDecompositionPrimitive3D */ virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 77050889b487..440d07ef8408 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.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,19 +51,19 @@ namespace drawinglayer { private: /// the PolyPolygon geometry - basegfx::B3DPolyPolygon maPolyPolygon; + basegfx::B3DPolyPolygon maPolyPolygon; /// the fill parameters - attribute::MaterialAttribute3D maMaterial; + attribute::MaterialAttribute3D maMaterial; /// bitfield - unsigned mbDoubleSided : 1; + unsigned mbDoubleSided : 1; public: /// constructor PolyPolygonMaterialPrimitive3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, - const attribute::MaterialAttribute3D& rMaterial, + const basegfx::B3DPolyPolygon& rPolyPolygon, + const attribute::MaterialAttribute3D& rMaterial, bool bDoubleSided); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index bef18f7042c4..731ed3472025 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.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 /** SdrCubePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D cube definition. - The cube is implicitely in unit coordinates and the given transformation + The cube is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ class SdrCubePrimitive3D : public SdrPrimitive3D @@ -52,9 +52,9 @@ namespace drawinglayer public: /// constructor SdrCubePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// compare operator diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 61a67dad1c44..a46b101b4cfe 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.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 @@ -62,7 +62,7 @@ namespace drawinglayer void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - + // #i98314# void applyTextureTo3DGeometry( ::com::sun::star::drawing::TextureProjectionMode eModeX, @@ -72,7 +72,7 @@ namespace drawinglayer const basegfx::B2DVector& rTextureSize); Primitive3DSequence create3DPolyPolygonLinePrimitives( - const basegfx::B3DPolyPolygon& rUnitPolyPolygon, + const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 7dfb986d0a0d..e69af0871b04 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.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 @@ -36,7 +36,7 @@ ////////////////////////////////////////////////////////////////////////////// // predefines -namespace drawinglayer { namespace geometry { +namespace drawinglayer { namespace geometry { class ViewInformation3D; }} @@ -49,33 +49,33 @@ namespace drawinglayer /** SliceType3D definition */ enum SliceType3D { - SLICETYPE3D_REGULAR, // normal geoemtry Slice3D - SLICETYPE3D_FRONTCAP, // front cap - SLICETYPE3D_BACKCAP // back cap + SLICETYPE3D_REGULAR, // normal geoemtry Slice3D + SLICETYPE3D_FRONTCAP, // front cap + SLICETYPE3D_BACKCAP // back cap }; /// class to hold one Slice3D class Slice3D { protected: - basegfx::B3DPolyPolygon maPolyPolygon; - SliceType3D maSliceType; + basegfx::B3DPolyPolygon maPolyPolygon; + SliceType3D maSliceType; public: Slice3D( - const basegfx::B2DPolyPolygon& rPolyPolygon, - const basegfx::B3DHomMatrix& aTransform, + const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B3DHomMatrix& aTransform, SliceType3D aSliceType = SLICETYPE3D_REGULAR) - : maPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), + : maPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), maSliceType(aSliceType) { maPolyPolygon.transform(aTransform); } Slice3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, + const basegfx::B3DPolyPolygon& rPolyPolygon, SliceType3D aSliceType = SLICETYPE3D_REGULAR) - : maPolyPolygon(rPolyPolygon), + : maPolyPolygon(rPolyPolygon), maSliceType(aSliceType) { } @@ -90,24 +90,24 @@ namespace drawinglayer /// helpers for creation void createLatheSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fRotation, - sal_uInt32 nSteps, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fRotation, + sal_uInt32 nSteps, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); - + void createExtrudeSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fDepth, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fDepth, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); /// helpers for geometry extraction @@ -115,23 +115,23 @@ namespace drawinglayer basegfx::B3DPolyPolygon extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); void extractPlanesFromSlice( - ::std::vector< basegfx::B3DPolyPolygon >& rFill, + ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, - bool bCreateNormals, - bool bSmoothHorizontalNormals, - bool bSmoothNormals, - bool bSmoothLids, + bool bCreateNormals, + bool bSmoothHorizontalNormals, + bool bSmoothNormals, + bool bSmoothLids, bool bClosed, - double fSmoothNormalsMix, - double fSmoothLidsMix, - bool bCreateTextureCoordinates, + double fSmoothNormalsMix, + double fSmoothLidsMix, + bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform); void createReducedOutlines( - const geometry::ViewInformation3D& rViewInformation, + const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, - const basegfx::B3DPolygon& rLoopA, - const basegfx::B3DPolygon& rLoopB, + const basegfx::B3DPolygon& rLoopA, + const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget); } // end of namespace overlay diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 06f881a7f260..008d56ab1b96 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.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,25 +53,25 @@ namespace drawinglayer { private: /// geometry helper for slices - basegfx::B2DPolyPolygon maCorrectedPolyPolygon; - Slice3DVector maSlices; + basegfx::B2DPolyPolygon maCorrectedPolyPolygon; + Slice3DVector maSlices; /// primitive geometry data - basegfx::B2DPolyPolygon maPolyPolygon; - double mfDepth; - double mfDiagonal; - double mfBackScale; + basegfx::B2DPolyPolygon maPolyPolygon; + double mfDepth; + double mfDiagonal; + double mfBackScale; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition geometry::ViewInformation3D* mpLastRLGViewInformation; /// bitfield - unsigned mbSmoothNormals : 1; // Plane self - unsigned mbSmoothHorizontalNormals : 1; // always - unsigned mbSmoothLids : 1; // Front/back - unsigned mbCharacterMode : 1; - unsigned mbCloseFront : 1; - unsigned mbCloseBack : 1; + unsigned mbSmoothNormals : 1; // Plane self + unsigned mbSmoothHorizontalNormals : 1; // always + unsigned mbSmoothLids : 1; // Front/back + unsigned mbCharacterMode : 1; + unsigned mbCloseFront : 1; + unsigned mbCloseBack : 1; /// create slices void impCreateSlices(); @@ -86,19 +86,19 @@ namespace drawinglayer public: /// constructor SdrExtrudePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, - double fDepth, - double fDiagonal, + double fDepth, + double fDiagonal, double fBackScale, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); virtual ~SdrExtrudePrimitive3D(); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index b4e4f18c10aa..a6bce8fb07c5 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.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,27 +53,27 @@ namespace drawinglayer { private: /// geometry helper for slices - basegfx::B2DPolyPolygon maCorrectedPolyPolygon; - Slice3DVector maSlices; + basegfx::B2DPolyPolygon maCorrectedPolyPolygon; + Slice3DVector maSlices; /// primitive geometry data - basegfx::B2DPolyPolygon maPolyPolygon; - sal_uInt32 mnHorizontalSegments; - sal_uInt32 mnVerticalSegments; - double mfDiagonal; - double mfBackScale; - double mfRotation; + basegfx::B2DPolyPolygon maPolyPolygon; + sal_uInt32 mnHorizontalSegments; + sal_uInt32 mnVerticalSegments; + double mfDiagonal; + double mfBackScale; + double mfRotation; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition geometry::ViewInformation3D* mpLastRLGViewInformation; /// bitfield - unsigned mbSmoothNormals : 1; // Plane self - unsigned mbSmoothHorizontalNormals : 1; // always - unsigned mbSmoothLids : 1; // Front/back - unsigned mbCharacterMode : 1; - unsigned mbCloseFront : 1; - unsigned mbCloseBack : 1; + unsigned mbSmoothNormals : 1; // Plane self + unsigned mbSmoothHorizontalNormals : 1; // always + unsigned mbSmoothLids : 1; // Front/back + unsigned mbCharacterMode : 1; + unsigned mbCloseFront : 1; + unsigned mbCloseBack : 1; /// create slices void impCreateSlices(); @@ -84,14 +84,14 @@ namespace drawinglayer protected: /// local helpers void impCreateOutlines( - const geometry::ViewInformation3D& rViewInformation, - const basegfx::B3DPolygon& rLoopA, - const basegfx::B3DPolygon& rLoopB, + const geometry::ViewInformation3D& rViewInformation, + const basegfx::B3DPolygon& rLoopA, + const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget) const; - + bool impHasCutWith( - const basegfx::B2DPolygon& rPoly, - const basegfx::B2DPoint& rStart, + const basegfx::B2DPolygon& rPoly, + const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd) const; /// local decomposition. @@ -100,21 +100,21 @@ namespace drawinglayer public: /// constructor SdrLathePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments, - double fDiagonal, + double fDiagonal, double fBackScale, double fRotation, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); virtual ~SdrLathePrimitive3D(); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 71f868b468aa..51455ba3e7e5 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.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,17 +41,17 @@ namespace drawinglayer This 3D primitive defines a PolyPolgon in space which may have Line- and FillStyles and extra 3D surface attributes. It is assumed - that the given 3D PolyPolgon (which may contain texture and normal + that the given 3D PolyPolgon (which may contain texture and normal information) is planar in 3D. - The decomposition will include all needed 3D data for visualisation, + The decomposition will include all needed 3D data for visualisation, including FatLines and fill styles. */ class SdrPolyPolygonPrimitive3D : public SdrPrimitive3D { private: /// the planar polyPolygon evtl with normals and texture coordinates - basegfx::B3DPolyPolygon maPolyPolygon3D; + basegfx::B3DPolyPolygon maPolyPolygon3D; protected: /// local decomposition. @@ -61,9 +61,9 @@ namespace drawinglayer /// constructor SdrPolyPolygonPrimitive3D( const basegfx::B3DPolyPolygon& rPolyPolygon3D, - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// data access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index 26d5efda687b..5076c2c30e52 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.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 { /** SdrPrimitive3D class - + Base class for the more complicated geometric primitives, so derive from buffered primitive to allow overloading of create3DDecomposition there. @@ -52,10 +52,10 @@ namespace drawinglayer { private: /// object surface attributes - basegfx::B3DHomMatrix maTransform; - basegfx::B2DVector maTextureSize; - attribute::SdrLineFillShadowAttribute3D maSdrLFSAttribute; - attribute::Sdr3DObjectAttribute maSdr3DObjectAttribute; + basegfx::B3DHomMatrix maTransform; + basegfx::B2DVector maTextureSize; + attribute::SdrLineFillShadowAttribute3D maSdrLFSAttribute; + attribute::Sdr3DObjectAttribute maSdr3DObjectAttribute; protected: /** Standard implementation for primitive3D which @@ -71,9 +71,9 @@ namespace drawinglayer public: /// constructor SdrPrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index a2ec5e5f7c46..add82da4f101 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.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,15 +40,15 @@ namespace drawinglayer /** SdrSpherePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D sphere definition. - The sphere is implicitely in unit coordinates and the given transformation + The sphere is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ class SdrSpherePrimitive3D : public SdrPrimitive3D { private: /// additional geometry definitions - sal_uInt32 mnHorizontalSegments; - sal_uInt32 mnVerticalSegments; + sal_uInt32 mnHorizontalSegments; + sal_uInt32 mnVerticalSegments; protected: /// local decomposition. @@ -57,11 +57,11 @@ namespace drawinglayer public: /// constructor SdrSpherePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, - const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, - sal_uInt32 nHorizontalSegments, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, + sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index 26ac8dcd6739..416cb85d1b8a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.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,20 +53,20 @@ namespace drawinglayer { protected: /// 2D shadow definition - basegfx::B2DHomMatrix maShadowTransform; - basegfx::BColor maShadowColor; - double mfShadowTransparence; + basegfx::B2DHomMatrix maShadowTransform; + basegfx::BColor maShadowColor; + double mfShadowTransparence; /// bitfield - unsigned mbShadow3D : 1; + unsigned mbShadow3D : 1; public: /// constructor ShadowPrimitive3D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, - double fShadowTransparence, - bool bShadow3D, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, + double fShadowTransparence, + bool bShadow3D, const Primitive3DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 0eb6a6a3844e..f4d723756997 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.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,21 +51,21 @@ namespace drawinglayer { private: /// texture geometry definition - basegfx::B2DVector maTextureSize; + basegfx::B2DVector maTextureSize; /// bitfield /// flag if texture shall be modulated with white interpolated color - unsigned mbModulate : 1; + unsigned mbModulate : 1; /// flag if texture shall be filtered - unsigned mbFilter : 1; + unsigned mbFilter : 1; public: /// constructor TexturePrimitive3D( - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -95,12 +95,12 @@ namespace drawinglayer { private: /// transparency definition - double mfTransparence; + double mfTransparence; public: /// constructor UnifiedTransparenceTexturePrimitive3D( - double fTransparence, + double fTransparence, const Primitive3DSequence& rChildren); /// data read access @@ -129,23 +129,23 @@ namespace drawinglayer { /** GradientTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a gradient texture - definition. All 3D primitives embedded here will be shown with the + This 3D primitive expands TexturePrimitive3D to a gradient texture + definition. All 3D primitives embedded here will be shown with the defined gradient. */ class GradientTexturePrimitive3D : public TexturePrimitive3D { private: /// the gradient definition - attribute::FillGradientAttribute maGradient; + attribute::FillGradientAttribute maGradient; public: /// constructor GradientTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -168,23 +168,23 @@ namespace drawinglayer { /** BitmapTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a bitmap texture - definition. All 3D primitives embedded here will be shown with the + This 3D primitive expands TexturePrimitive3D to a bitmap texture + definition. All 3D primitives embedded here will be shown with the defined bitmap (maybe tiled if defined). */ class BitmapTexturePrimitive3D : public TexturePrimitive3D { private: /// bitmap fill attribute - attribute::FillBitmapAttribute maFillBitmapAttribute; + attribute::FillBitmapAttribute maFillBitmapAttribute; public: /// constructor BitmapTexturePrimitive3D( - const attribute::FillBitmapAttribute& rFillBitmapAttribute, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillBitmapAttribute& rFillBitmapAttribute, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -207,9 +207,9 @@ namespace drawinglayer { /** TransparenceTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a transparence texture + This 3D primitive expands TexturePrimitive3D to a transparence texture definition. For transparence definition, a gradient is used. The values in - that gradient will be interpreted as luminance Transparence-Values. All 3D + that gradient will be interpreted as luminance Transparence-Values. All 3D primitives embedded here will be shown with the defined transparence. */ class TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D @@ -217,8 +217,8 @@ namespace drawinglayer public: /// constructor TransparenceTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, const basegfx::B2DVector& rTextureSize); /// compare operator diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index 544fb0b2690e..15764ee73324 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.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,12 +51,12 @@ namespace drawinglayer { private: // the 3D transformation to apply - basegfx::B3DHomMatrix maTransformation; + basegfx::B3DHomMatrix maTransformation; public: /// constructor TransformPrimitive3D( - const basegfx::B3DHomMatrix& rTransformation, + const basegfx::B3DHomMatrix& rTransformation, const Primitive3DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx index 8721e0262914..885a3a477589 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.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 @@ -139,7 +139,7 @@ namespace drawinglayer case PRIMITIVE2D_ID_SOME_TEXT : { - // encapsulate e.g. with changing local varibles, e.g. + // encapsulate e.g. with changing local varibles, e.g. // sometimes it's good to know if a basic primitive is // part of a text, especially when not handling the text // self but by purpose want to handle the decomposed @@ -151,9 +151,9 @@ namespace drawinglayer } As an example a processor collecting the outlines of a sequence of primitives - only needs to handle some Basic Primitives and create outline and collect - outline polygons e.g. for primitives with area like BitmapPrimitive2D (a - rectangle) and PolyPolygonColorPrimitive2D. When also handling the Grouping + only needs to handle some Basic Primitives and create outline and collect + outline polygons e.g. for primitives with area like BitmapPrimitive2D (a + rectangle) and PolyPolygonColorPrimitive2D. When also handling the Grouping Primitives MaskPrimitive2D (e.g. ignoring it's content, using the mask polyPolygon) and TransformPrimitive2D (to have the correct local transformation), a processor creating the outline can be written using just four (4) primitives. As a tipp, it can @@ -164,7 +164,7 @@ namespace drawinglayer { private: /// The ViewInformation2D itself. It's private to isolate accesses to it - geometry::ViewInformation2D maViewInformation2D; + geometry::ViewInformation2D maViewInformation2D; protected: /* access method to allow the implementations to change the current @@ -212,7 +212,7 @@ namespace drawinglayer class CollectingProcessor2D : public BaseProcessor2D { private: - primitive2d::Primitive2DSequence maPrimitive2DSequence; + primitive2d::Primitive2DSequence maPrimitive2DSequence; public: CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation); @@ -222,9 +222,9 @@ namespace drawinglayer virtual void process(const primitive2d::Primitive2DSequence& rSource); /// helpers for adding to local sequence - void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource) - { - primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource); + void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource) + { + primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource); } /// data access and reset diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index ca300484f017..8a74992cf4f5 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.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 @@ -79,26 +79,26 @@ namespace drawinglayer private: // The Pixel renderer resets the original MapMode from the OutputDevice. // For some situations it is necessary to get it again, so it is rescued here - MapMode maOriginalMapMode; - + MapMode maOriginalMapMode; + // the (current) destination OutDev and canvas - OutputDevice* mpOutputDevice; - com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > mxCanvas; + OutputDevice* mpOutputDevice; + com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > mxCanvas; com::sun::star::rendering::ViewState maViewState; com::sun::star::rendering::RenderState maRenderState; // the modifiedColorPrimitive stack - basegfx::BColorModifierStack maBColorModifierStack; + basegfx::BColorModifierStack maBColorModifierStack; // SvtOptionsDrawinglayer incarnation to react on diverse settings - const SvtOptionsDrawinglayer maDrawinglayerOpt; + const SvtOptionsDrawinglayer maDrawinglayerOpt; // the current clipping PolyPolygon from MaskPrimitive2D, always in // object coordinates basegfx::B2DPolyPolygon maClipPolyPolygon; // determined LanguageType - LanguageType meLang; + LanguageType meLang; // as tooling, the process() implementation takes over API handling and calls this // virtual render method when the primitive implementation is BasePrimitive2D-based. @@ -113,10 +113,10 @@ namespace drawinglayer void impRenderPolygonStrokePrimitive2D(const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive); void impRenderFillBitmapPrimitive2D(const primitive2d::FillBitmapPrimitive2D& rFillBitmapPrimitive2D); void impRenderUnifiedTransparencePrimitive2D(const primitive2d::UnifiedTransparencePrimitive2D& rUniTransparenceCandidate); - + public: canvasProcessor2D( - const geometry::ViewInformation2D& rViewInformation, + const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~canvasProcessor2D(); diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx index cff47b664ad3..82708f4a7c8d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.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,7 +56,7 @@ namespace drawinglayer public: ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation); virtual ~ContourExtractor2D(); - + const std::vector< basegfx::B2DPolyPolygon >& getExtractedContour() const { return maExtractedContour; } }; } // end of namespace processor2d diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx index 7056392860ff..000048c56ce5 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.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,22 +53,22 @@ namespace drawinglayer { private: /// discrete HitTest position - basegfx::B2DPoint maDiscreteHitPosition; + basegfx::B2DPoint maDiscreteHitPosition; /// discrete HitTolerance - double mfDiscreteHitTolerance; + double mfDiscreteHitTolerance; /// bitfield - unsigned mbHit : 1; - unsigned mbHitToleranceUsed : 1; + unsigned mbHit : 1; + unsigned mbHitToleranceUsed : 1; /* this flag decides if primitives which are embedded to an - UnifiedTransparencePrimitive2D and are invisible will be taken into account for - HitTesting or not. Those primitives are created for objects which are else - completely invisible and normally their content exists of hairline + UnifiedTransparencePrimitive2D and are invisible will be taken into account for + HitTesting or not. Those primitives are created for objects which are else + completely invisible and normally their content exists of hairline primitives describing the object's contour */ - unsigned mbUseInvisiblePrimitiveContent : 1; + unsigned mbUseInvisiblePrimitiveContent : 1; /// flag to concentraze on text hits only unsigned mbHitTextOnly : 1; diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx index d750531e905a..c02aeb42695e 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.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 @@ -46,8 +46,8 @@ namespace drawinglayer class LineGeometryExtractor2D : public BaseProcessor2D { private: - std::vector< basegfx::B2DPolygon > maExtractedHairlines; - std::vector< basegfx::B2DPolyPolygon > maExtractedLineFills; + std::vector< basegfx::B2DPolygon > maExtractedHairlines; + std::vector< basegfx::B2DPolyPolygon > maExtractedLineFills; /// bitfield unsigned mbInLineGeometry : 1; @@ -58,7 +58,7 @@ namespace drawinglayer public: LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation); virtual ~LineGeometryExtractor2D(); - + const std::vector< basegfx::B2DPolygon >& getExtractedHairlines() const { return maExtractedHairlines; } const std::vector< basegfx::B2DPolyPolygon >& getExtractedLineFills() const { return maExtractedLineFills; } }; diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 522f3ec1136d..094dc72a051d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.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 @@ -37,7 +37,7 @@ ////////////////////////////////////////////////////////////////////////////// -namespace drawinglayer +namespace drawinglayer { namespace processor2d { @@ -45,16 +45,16 @@ namespace drawinglayer struct TextAsPolygonDataNode { private: - basegfx::B2DPolyPolygon maB2DPolyPolygon; - basegfx::BColor maBColor; - bool mbIsFilled; + basegfx::B2DPolyPolygon maB2DPolyPolygon; + basegfx::BColor maBColor; + bool mbIsFilled; public: TextAsPolygonDataNode( const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const basegfx::BColor& rBColor, bool bIsFilled) - : maB2DPolyPolygon(rB2DPolyPolygon), + : maB2DPolyPolygon(rB2DPolyPolygon), maBColor(rBColor), mbIsFilled(bIsFilled) { @@ -68,7 +68,7 @@ namespace drawinglayer /// typedef for a vector of that helper data typedef ::std::vector< TextAsPolygonDataNode > TextAsPolygonDataNodeVector; - + /** TextAsPolygonExtractor2D class This processor extracts text in the feeded primitives to filled polygons @@ -77,13 +77,13 @@ namespace drawinglayer { private: // extraction target - TextAsPolygonDataNodeVector maTarget; + TextAsPolygonDataNodeVector maTarget; // the modifiedColorPrimitive stack - basegfx::BColorModifierStack maBColorModifierStack; + basegfx::BColorModifierStack maBColorModifierStack; // flag if we are in a decomposed text - sal_uInt32 mnInText; + sal_uInt32 mnInText; // tooling methods void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx index bb7d9537da9b..ce3ddb589eb9 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.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 @@ -81,19 +81,19 @@ namespace drawinglayer private: /// local helper(s) Rectangle impDumpToMetaFile( - const primitive2d::Primitive2DSequence& rContent, + const primitive2d::Primitive2DSequence& rContent, GDIMetaFile& o_rContentMetafile); void impConvertFillGradientAttributeToVCLGradient( - Gradient& o_rVCLGradient, + Gradient& o_rVCLGradient, const attribute::FillGradientAttribute& rFiGrAtt, bool bIsTransparenceGradient); void impStartSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill); void impEndSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill); SvtGraphicStroke* impTryToCreateSvtGraphicStroke( - const basegfx::B2DPolygon& rB2DPolygon, - const basegfx::BColor* pColor, - const attribute::LineAttribute* pLineAttribute, - const attribute::StrokeAttribute* pStrokeAttribute, + const basegfx::B2DPolygon& rB2DPolygon, + const basegfx::BColor* pColor, + const attribute::LineAttribute* pLineAttribute, + const attribute::StrokeAttribute* pStrokeAttribute, const attribute::LineStartEndAttribute* pStart, const attribute::LineStartEndAttribute* pEnd); void impStartSvtGraphicStroke(SvtGraphicStroke* pSvtGraphicStroke); @@ -103,20 +103,20 @@ namespace drawinglayer basegfx::B2DPolyPolygon maClipPolyPolygon; /// the target MetaFile - GDIMetaFile* mpMetaFile; + GDIMetaFile* mpMetaFile; /* do not allow embedding SvtGraphicFills into each other, use a counter to prevent that */ - sal_uInt32 mnSvtGraphicFillCount; + sal_uInt32 mnSvtGraphicFillCount; /// same for SvtGraphicStroke - sal_uInt32 mnSvtGraphicStrokeCount; + sal_uInt32 mnSvtGraphicStrokeCount; /* hold the last unified transparence value to have it handy on SvtGraphicStroke creation */ - double mfCurrentUnifiedTransparence; + double mfCurrentUnifiedTransparence; /* break iterator support made static so it only needs to be fetched once, even with many single @@ -130,7 +130,7 @@ namespace drawinglayer be emulated with the VclMetafileProcessor2D. These are potentially temporarily since PDF export may use PrimitiveSequences one day directly. */ - vcl::PDFExtOutDevData* mpPDFExtOutDevData; + vcl::PDFExtOutDevData* mpPDFExtOutDevData; protected: /* the local processor for BasePrinitive2D-Implementation based primitives, @@ -141,7 +141,7 @@ namespace drawinglayer public: /// constructor/destructor VclMetafileProcessor2D( - const geometry::ViewInformation2D& rViewInformation, + const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~VclMetafileProcessor2D(); }; diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx index 273a3b82d392..ca9eb5bcc772 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.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,7 +50,7 @@ namespace drawinglayer /* The Pixel renderer resets the original MapMode from the OutputDevice. For some situations it is necessary to get it again, so it is rescued here */ - MapMode maOriginalMapMode; + MapMode maOriginalMapMode; protected: /* the local processor for BasePrinitive2D-Implementation based primitives, @@ -61,7 +61,7 @@ namespace drawinglayer public: /// constructor/destructor VclPixelProcessor2D( - const geometry::ViewInformation2D& rViewInformation, + const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~VclPixelProcessor2D(); diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx index e25ba9f55b14..741d09a0b639 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.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 @@ -75,18 +75,18 @@ namespace drawinglayer { protected: // the destination OutDev - OutputDevice* mpOutputDevice; + OutputDevice* mpOutputDevice; // the modifiedColorPrimitive stack - basegfx::BColorModifierStack maBColorModifierStack; + basegfx::BColorModifierStack maBColorModifierStack; // the current transformation. Since VCL pixel renderer transforms to pixels // and VCL MetaFile renderer to World (logic) coordinates, the local // ViewInformation2D cannot directly be used, but needs to be kept up to date - basegfx::B2DHomMatrix maCurrentTransformation; + basegfx::B2DHomMatrix maCurrentTransformation; // SvtOptionsDrawinglayer incarnation to react on diverse settings - const SvtOptionsDrawinglayer maDrawinglayerOpt; + const SvtOptionsDrawinglayer maDrawinglayerOpt; // stack value (increment and decrement) to count how deep we are in // PolygonStrokePrimitive2D's decompositions (normally only one) @@ -118,11 +118,11 @@ namespace drawinglayer // DrawMode adaption support void adaptLineToFillDrawMode() const; void adaptTextToFillDrawMode() const; - + public: // constructor/destructor VclProcessor2D( - const geometry::ViewInformation2D& rViewInformation, + const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev); virtual ~VclProcessor2D(); diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx index 4cd1242ddb29..90978cc1f335 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.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 class BaseProcessor3D { private: - geometry::ViewInformation3D maViewInformation3D; + geometry::ViewInformation3D maViewInformation3D; protected: void updateViewInformation(const geometry::ViewInformation3D& rViewInformation3D) @@ -91,7 +91,7 @@ namespace drawinglayer class CollectingProcessor3D : public BaseProcessor3D { private: - primitive3d::Primitive3DSequence maPrimitive3DSequence; + primitive3d::Primitive3DSequence maPrimitive3DSequence; public: CollectingProcessor3D(const geometry::ViewInformation3D& rViewInformation); @@ -101,9 +101,9 @@ namespace drawinglayer virtual void process(const primitive3d::Primitive3DSequence& rSource); /// helpers for adding to local sequence - void appendPrimitive3DReference(const primitive3d::Primitive3DReference& rSource) - { - primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(maPrimitive3DSequence, rSource); + void appendPrimitive3DReference(const primitive3d::Primitive3DReference& rSource) + { + primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(maPrimitive3DSequence, rSource); } /// data access and reset diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx index f8f62fab74ce..c5388002c3e1 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.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,7 +61,7 @@ namespace drawinglayer /// bitfield bool mbAnyHit : 1; - /* this flag decides if primitives which are invisible will be taken into account for + /* this flag decides if primitives which are invisible will be taken into account for HitTesting or not. */ bool mbUseInvisiblePrimitiveContent : 1; @@ -72,8 +72,8 @@ namespace drawinglayer virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate); public: - CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, - const basegfx::B3DPoint& rFront, + CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, + const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, bool bAnyHit); diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx index 178e9f02a82b..28f67efe3575 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.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 @@ -75,45 +75,45 @@ namespace drawinglayer This processor renders all feeded primitives to a 2D raster where for all primitives the two basic methods rasterconvertB3DPolygon for hairlines and - rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to + rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to e.g. base a Z-Buffer supported renderer on the 3D primitive processing. */ class DefaultProcessor3D : public BaseProcessor3D { protected: /// read-only scene infos (normal handling, etc...) - const attribute::SdrSceneAttribute& mrSdrSceneAttribute; + const attribute::SdrSceneAttribute& mrSdrSceneAttribute; /// read-only light infos (lights, etc...) - const attribute::SdrLightingAttribute& mrSdrLightingAttribute; + const attribute::SdrLightingAttribute& mrSdrLightingAttribute; /// renderer range. Need to be correctly set by the derived implementations /// normally the (0, 0, W, H) range from mpBZPixelRaster - basegfx::B2DRange maRasterRange; + basegfx::B2DRange maRasterRange; /// the modifiedColorPrimitive stack - basegfx::BColorModifierStack maBColorModifierStack; + basegfx::BColorModifierStack maBColorModifierStack; /// the current active texture - boost::shared_ptr< texture::GeoTexSvx > mpGeoTexSvx; + boost::shared_ptr< texture::GeoTexSvx > mpGeoTexSvx; /// the current active transparence texture - boost::shared_ptr< texture::GeoTexSvx > mpTransparenceGeoTexSvx; + boost::shared_ptr< texture::GeoTexSvx > mpTransparenceGeoTexSvx; /// SvtOptionsDrawinglayer incarnation to react on diverse settings - const SvtOptionsDrawinglayer maDrawinglayerOpt; + const SvtOptionsDrawinglayer maDrawinglayerOpt; /// counter for entered transparence textures sal_uInt32 mnTransparenceCounter; /// bitfield - unsigned mbModulate : 1; - unsigned mbFilter : 1; - unsigned mbSimpleTextureActive : 1; + unsigned mbModulate : 1; + unsigned mbFilter : 1; + unsigned mbSimpleTextureActive : 1; ////////////////////////////////////////////////////////////////////////////// // rendering support - + void impRenderGradientTexturePrimitive3D(const primitive3d::GradientTexturePrimitive3D& rPrimitive, bool bTransparence); void impRenderHatchTexturePrimitive3D(const primitive3d::HatchTexturePrimitive3D& rPrimitive); void impRenderBitmapTexturePrimitive3D(const primitive3d::BitmapTexturePrimitive3D& rPrimitive); @@ -125,7 +125,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // rasterconversions for filled and non-filled polygons. These NEED to be // implemented from derivations - + virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const = 0; virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const = 0; @@ -142,7 +142,7 @@ namespace drawinglayer /// data read access const attribute::SdrSceneAttribute& getSdrSceneAttribute() const { return mrSdrSceneAttribute; } const attribute::SdrLightingAttribute& getSdrLightingAttribute() const { return mrSdrLightingAttribute; } - + /// data read access renderer stuff const basegfx::BColorModifierStack& getBColorModifierStack() const { return maBColorModifierStack; } const boost::shared_ptr< texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } @@ -151,7 +151,7 @@ namespace drawinglayer bool getModulate() const { return mbModulate; } bool getFilter() const { return mbFilter; } bool getSimpleTextureActive() const { return mbSimpleTextureActive; } - + /// access to Drawinglayer configuration options const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; } }; diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx index 3712a57a1bca..968434ce0555 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.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,13 +51,13 @@ namespace drawinglayer { private: /// result holding vector (2D) - primitive2d::Primitive2DSequence maPrimitive2DSequence; + primitive2d::Primitive2DSequence maPrimitive2DSequence; /// object transformation for scene for 2d definition - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maObjectTransformation; /// the modifiedColorPrimitive stack - basegfx::BColorModifierStack maBColorModifierStack; + basegfx::BColorModifierStack maBColorModifierStack; /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx index 98f18b8d78ac..60f6ebf9097a 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.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 @@ -63,30 +63,30 @@ namespace drawinglayer BasePrimitive2DVector* mpPrimitive2DSequence; /// object transformation for scene for 2d definition - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maObjectTransformation; /// prepared data (transformations) for 2D/3D shadow calculations - basegfx::B3DHomMatrix maWorldToEye; - basegfx::B3DHomMatrix maEyeToView; - basegfx::B3DVector maLightNormal; - basegfx::B3DVector maShadowPlaneNormal; - basegfx::B3DPoint maPlanePoint; - double mfLightPlaneScalar; + basegfx::B3DHomMatrix maWorldToEye; + basegfx::B3DHomMatrix maEyeToView; + basegfx::B3DVector maLightNormal; + basegfx::B3DVector maShadowPlaneNormal; + basegfx::B3DPoint maPlanePoint; + double mfLightPlaneScalar; /* the shadow color used for sub-primitives. Can stay at black since the encapsulating 2d shadow primitive will contain the color */ - basegfx::BColor maPrimitiveColor; + basegfx::BColor maPrimitiveColor; /// bitfield /// flag if shadow plane projection preparation leaded to valid results - unsigned mbShadowProjectionIsValid : 1; + unsigned mbShadowProjectionIsValid : 1; /// flag if conversion is switched on - unsigned mbConvert : 1; + unsigned mbConvert : 1; /// flag if conversion shall use projection - unsigned mbUseProjection : 1; + unsigned mbUseProjection : 1; /// local helpers basegfx::B2DPolygon impDoShadowProjection(const basegfx::B3DPolygon& rSource); diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx index 6d2a806ce630..06724deef027 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.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 basegfx { class BZPixelRaster; } -namespace drawinglayer { +namespace drawinglayer { namespace attribute { class SdrSceneAttribute; class SdrLightingAttribute; @@ -61,26 +61,26 @@ namespace drawinglayer { /** ZBufferProcessor3D class - This 3D renderer derived from DefaultProcessor3D renders all feeded primitives to a 2D - raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle + This 3D renderer derived from DefaultProcessor3D renders all feeded primitives to a 2D + raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. */ class ZBufferProcessor3D : public DefaultProcessor3D { private: /// the raster target, a Z-Buffer - basegfx::BZPixelRaster* mpBZPixelRaster; + basegfx::BZPixelRaster* mpBZPixelRaster; /// inverse of EyeToView for rasterconversion with evtl. Phong shading - basegfx::B3DHomMatrix maInvEyeToView; + basegfx::B3DHomMatrix maInvEyeToView; /// The raster converter for Z-Buffer - ZBufferRasterConverter3D* mpZBufferRasterConverter3D; + ZBufferRasterConverter3D* mpZBufferRasterConverter3D; /* AA value. Defines how many oversámples will be used in X and Y. Values 0, 1 will switch it off while e.g. 2 will use 2x2 pixels for each pixel to create */ - sal_uInt16 mnAntiAlialize; + sal_uInt16 mnAntiAlialize; /* remembered RasterPrimitive3D's which need to be painted back to front for transparent 3D parts @@ -96,7 +96,7 @@ namespace drawinglayer public: ZBufferProcessor3D( const geometry::ViewInformation3D& rViewInformation3D, - const geometry::ViewInformation2D& rViewInformation2D, + const geometry::ViewInformation2D& rViewInformation2D, const attribute::SdrSceneAttribute& rSdrSceneAttribute, const attribute::SdrLightingAttribute& rSdrLightingAttribute, double fSizeX, diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx index 92040af2f65a..0b40ad7da7ed 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture.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 @@ -67,11 +67,11 @@ namespace drawinglayer class GeoTexSvxGradient : public GeoTexSvx { protected: - basegfx::ODFGradientInfo maGradientInfo; - basegfx::B2DRange maTargetRange; - basegfx::BColor maStart; - basegfx::BColor maEnd; - double mfBorder; + basegfx::ODFGradientInfo maGradientInfo; + basegfx::B2DRange maTargetRange; + basegfx::BColor maStart; + basegfx::BColor maEnd; + double mfBorder; // helpers void impAppendMatrix(::std::vector< basegfx::B2DHomMatrix >& rMatrices, const basegfx::B2DRange& rRange); @@ -217,11 +217,11 @@ namespace drawinglayer class GeoTexSvxHatch : public GeoTexSvx { protected: - basegfx::B2DHomMatrix maTextureTransform; - basegfx::B2DHomMatrix maBackTextureTransform; - double mfDistance; - double mfAngle; - sal_uInt32 mnSteps; + basegfx::B2DHomMatrix maTextureTransform; + basegfx::B2DHomMatrix maBackTextureTransform; + double mfDistance; + double mfAngle; + sal_uInt32 mnSteps; public: GeoTexSvxHatch(const basegfx::B2DRange& rTargetRange, double fDistance, double fAngle); @@ -245,8 +245,8 @@ namespace drawinglayer class GeoTexSvxTiled : public GeoTexSvx { protected: - basegfx::B2DPoint maTopLeft; - basegfx::B2DVector maSize; + basegfx::B2DPoint maTopLeft; + basegfx::B2DVector maSize; public: GeoTexSvxTiled(const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize); diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx index cd3cd09286a8..87bd326b5252 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture3d.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,8 +48,8 @@ namespace drawinglayer class GeoTexSvxMono : public GeoTexSvx { protected: - basegfx::BColor maSingleColor; - double mfOpacity; + basegfx::BColor maSingleColor; + double mfOpacity; public: GeoTexSvxMono(const basegfx::BColor& rSingleColor, double fOpacity); @@ -71,12 +71,12 @@ namespace drawinglayer class GeoTexSvxBitmap : public GeoTexSvx { protected: - Bitmap maBitmap; - BitmapReadAccess* mpRead; - basegfx::B2DPoint maTopLeft; - basegfx::B2DVector maSize; - double mfMulX; - double mfMulY; + Bitmap maBitmap; + BitmapReadAccess* mpRead; + basegfx::B2DPoint maTopLeft; + basegfx::B2DVector maSize; + double mfMulX; + double mfMulY; // helpers bool impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const; @@ -135,14 +135,14 @@ namespace drawinglayer class GeoTexSvxMultiHatch : public GeoTexSvx { protected: - basegfx::BColor maColor; - double mfLogicPixelSize; - GeoTexSvxHatch* mp0; - GeoTexSvxHatch* mp1; - GeoTexSvxHatch* mp2; + basegfx::BColor maColor; + double mfLogicPixelSize; + GeoTexSvxHatch* mp0; + GeoTexSvxHatch* mp1; + GeoTexSvxHatch* mp2; // bitfield - unsigned mbFillBackground : 1; + unsigned mbFillBackground : 1; // helpers bool impIsOnHatch(const basegfx::B2DPoint& rUV) const; |