#i39532# primitive

7 files changed, 113 insertions, 126 deletions

diff --git a/drawinglayer/source/attribute/fillattribute.cxx b/drawinglayer/source/attribute/fillattribute.cxx
index 197f65071a0f..3807fbb293ae 100644
--- a/drawinglayer/source/attribute/fillattribute.cxx
+++ b/drawinglayer/source/attribute/fillattribute.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fillattribute.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:33 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,7 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
 #include <drawinglayer/attribute/fillattribute.hxx>
 #endif
 
@@ -47,7 +47,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        fillGradientAttribute::fillGradientAttribute(GradientStyle eStyle, double fBorder, double fOffsetX, double fOffsetY, double fAngle,
+        FillGradientAttribute::FillGradientAttribute(GradientStyle eStyle, double fBorder, double fOffsetX, double fOffsetY, double fAngle,
             const basegfx::BColor& rStartColor, const basegfx::BColor& rEndColor, sal_uInt16 nSteps)
         :   maStartColor(rStartColor),
             maEndColor(rEndColor),
@@ -60,7 +60,7 @@ namespace drawinglayer
         {
         }
 
-        bool fillGradientAttribute::operator==(const fillGradientAttribute& rCandidate) const
+        bool FillGradientAttribute::operator==(const FillGradientAttribute& rCandidate) const
         {
             return (meStyle == rCandidate.meStyle
                 && maStartColor == rCandidate.maStartColor
@@ -80,7 +80,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        fillHatchAttribute::fillHatchAttribute(HatchStyle eStyle, double fDistance, double fAngle, const basegfx::BColor& rColor, bool bFillBackground)
+        FillHatchAttribute::FillHatchAttribute(HatchStyle eStyle, double fDistance, double fAngle, const basegfx::BColor& rColor, bool bFillBackground)
         :   mfDistance(fDistance),
             mfAngle(fAngle),
             maColor(rColor),
@@ -89,7 +89,7 @@ namespace drawinglayer
         {
         }
 
-        bool fillHatchAttribute::operator==(const fillHatchAttribute& rCandidate) const
+        bool FillHatchAttribute::operator==(const FillHatchAttribute& rCandidate) const
         {
             return (meStyle == rCandidate.meStyle
                 && mfDistance == rCandidate.mfDistance
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index 625657412eaa..daf02163a2f9 100644
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fillbitmapattribute.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:33 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,7 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
 #include <drawinglayer/attribute/fillbitmapattribute.hxx>
 #endif
 
@@ -43,7 +43,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        fillBitmapAttribute::fillBitmapAttribute(const Bitmap& rBitmap, const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize, bool bTiling)
+        FillBitmapAttribute::FillBitmapAttribute(const Bitmap& rBitmap, const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize, bool bTiling)
         :   maBitmap(rBitmap),
             maTopLeft(rTopLeft),
             maSize(rSize),
@@ -51,7 +51,7 @@ namespace drawinglayer
         {
         }
 
-        bool fillBitmapAttribute::operator==(const fillBitmapAttribute& rCandidate) const
+        bool FillBitmapAttribute::operator==(const FillBitmapAttribute& rCandidate) const
         {
             return (maBitmap == rCandidate.maBitmap
                 && maTopLeft == rCandidate.maTopLeft
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index 4a2c0b30cdbc..b4c9d7257429 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: materialattribute3d.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:33 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,7 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX
 #include <drawinglayer/attribute/materialattribute3d.hxx>
 #endif
 
@@ -47,7 +47,7 @@ namespace drawinglayer
 {
     namespace
     {
-        class impMaterialAttribute3D
+        class ImpMaterialAttribute3D
         {
         public:
             // materialAttribute3D definitions
@@ -59,7 +59,7 @@ namespace drawinglayer
             // refcounter
             sal_uInt32                                  mnRefCount;
 
-            impMaterialAttribute3D(const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity)
+            ImpMaterialAttribute3D(const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity)
             :   maColor(rColor),
                 maSpecular(rSpecular),
                 maEmission(rEmission),
@@ -68,7 +68,7 @@ namespace drawinglayer
             {
             }
 
-            impMaterialAttribute3D(const basegfx::BColor& rColor)
+            ImpMaterialAttribute3D(const basegfx::BColor& rColor)
             :   maColor(rColor),
                 maSpecular(1.0, 1.0, 1.0),
                 maEmission(),
@@ -77,13 +77,13 @@ namespace drawinglayer
             {
             }
 
-            impMaterialAttribute3D()
+            ImpMaterialAttribute3D()
             :   mnSpecularIntensity(0),
                 mnRefCount(0L)
             {
             }
 
-            bool operator==(const impMaterialAttribute3D& rCandidate) const
+            bool operator==(const ImpMaterialAttribute3D& rCandidate) const
             {
                 return (maColor == rCandidate.maColor
                     && maSpecular == rCandidate.maSpecular
@@ -105,28 +105,28 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        materialAttribute3D::materialAttribute3D(const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity)
-        :   mpMaterialAttribute3D(new impMaterialAttribute3D(rColor, rSpecular, rEmission, nSpecularIntensity))
+        MaterialAttribute3D::MaterialAttribute3D(const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity)
+        :   mpMaterialAttribute3D(new ImpMaterialAttribute3D(rColor, rSpecular, rEmission, nSpecularIntensity))
         {
         }
 
-        materialAttribute3D::materialAttribute3D(const basegfx::BColor& rColor)
-        :   mpMaterialAttribute3D(new impMaterialAttribute3D(rColor))
+        MaterialAttribute3D::MaterialAttribute3D(const basegfx::BColor& rColor)
+        :   mpMaterialAttribute3D(new ImpMaterialAttribute3D(rColor))
         {
         }
 
-        materialAttribute3D::materialAttribute3D()
-        :   mpMaterialAttribute3D(new impMaterialAttribute3D())
+        MaterialAttribute3D::MaterialAttribute3D()
+        :   mpMaterialAttribute3D(new ImpMaterialAttribute3D())
         {
         }
 
-        materialAttribute3D::materialAttribute3D(const materialAttribute3D& rCandidate)
+        MaterialAttribute3D::MaterialAttribute3D(const MaterialAttribute3D& rCandidate)
         :   mpMaterialAttribute3D(rCandidate.mpMaterialAttribute3D)
         {
             mpMaterialAttribute3D->mnRefCount++;
         }
 
-        materialAttribute3D::~materialAttribute3D()
+        MaterialAttribute3D::~MaterialAttribute3D()
         {
             if(mpMaterialAttribute3D->mnRefCount)
             {
@@ -138,7 +138,7 @@ namespace drawinglayer
             }
         }
 
-        materialAttribute3D& materialAttribute3D::operator=(const materialAttribute3D& rCandidate)
+        MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D& rCandidate)
         {
             if(rCandidate.mpMaterialAttribute3D != mpMaterialAttribute3D)
             {
@@ -158,7 +158,7 @@ namespace drawinglayer
             return *this;
         }
 
-        bool materialAttribute3D::operator==(const materialAttribute3D& rCandidate) const
+        bool MaterialAttribute3D::operator==(const MaterialAttribute3D& rCandidate) const
         {
             if(rCandidate.mpMaterialAttribute3D == mpMaterialAttribute3D)
             {
@@ -168,22 +168,22 @@ namespace drawinglayer
             return (*rCandidate.mpMaterialAttribute3D == *mpMaterialAttribute3D);
         }
 
-        const basegfx::BColor& materialAttribute3D::getColor() const
+        const basegfx::BColor& MaterialAttribute3D::getColor() const
         {
             return mpMaterialAttribute3D->getColor();
         }
 
-        const basegfx::BColor& materialAttribute3D::getSpecular() const
+        const basegfx::BColor& MaterialAttribute3D::getSpecular() const
         {
             return mpMaterialAttribute3D->getSpecular();
         }
 
-        const basegfx::BColor& materialAttribute3D::getEmission() const
+        const basegfx::BColor& MaterialAttribute3D::getEmission() const
         {
             return mpMaterialAttribute3D->getEmission();
         }
 
-        sal_uInt16 materialAttribute3D::getSpecularIntensity() const
+        sal_uInt16 MaterialAttribute3D::getSpecularIntensity() const
         {
             return mpMaterialAttribute3D->getSpecularIntensity();
         }
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 1ac32323c7ef..2fa01f0ec661 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdrallattribute3d.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:33 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,15 +33,15 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX
 #include <drawinglayer/attribute/sdrallattribute3d.hxx>
 #endif
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE_HXX
 #include <drawinglayer/attribute/sdrattribute.hxx>
 #endif
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
 #include <drawinglayer/attribute/fillattribute.hxx>
 #endif
 
@@ -55,12 +55,12 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrLineFillShadowAttribute::sdrLineFillShadowAttribute(
-            sdrLineAttribute* pLine,
-            sdrFillAttribute* pFill,
-            sdrLineStartEndAttribute* pLineStartEnd,
-            sdrShadowAttribute* pShadow,
-            fillGradientAttribute* pFillFloatTransGradient)
+        SdrLineFillShadowAttribute::SdrLineFillShadowAttribute(
+            SdrLineAttribute* pLine,
+            SdrFillAttribute* pFill,
+            SdrLineStartEndAttribute* pLineStartEnd,
+            SdrShadowAttribute* pShadow,
+            FillGradientAttribute* pFillFloatTransGradient)
         :   mpShadow(pShadow),
             mpLine(pLine),
             mpLineStartEnd(pLineStartEnd),
@@ -69,7 +69,7 @@ namespace drawinglayer
         {
         }
 
-        sdrLineFillShadowAttribute::sdrLineFillShadowAttribute(const sdrLineFillShadowAttribute& rCandidate)
+        SdrLineFillShadowAttribute::SdrLineFillShadowAttribute(const SdrLineFillShadowAttribute& rCandidate)
         :   mpShadow(0L),
             mpLine(0L),
             mpLineStartEnd(0L),
@@ -82,7 +82,7 @@ namespace drawinglayer
             }
         }
 
-        sdrLineFillShadowAttribute::~sdrLineFillShadowAttribute()
+        SdrLineFillShadowAttribute::~SdrLineFillShadowAttribute()
         {
             delete mpShadow;
             delete mpLine;
@@ -91,7 +91,7 @@ namespace drawinglayer
             delete mpFillFloatTransGradient;
         }
 
-        sdrLineFillShadowAttribute& sdrLineFillShadowAttribute::operator=(const sdrLineFillShadowAttribute& rCandidate)
+        SdrLineFillShadowAttribute& SdrLineFillShadowAttribute::operator=(const SdrLineFillShadowAttribute& rCandidate)
         {
             // handle mpShadow
             {
@@ -105,7 +105,7 @@ namespace drawinglayer
                 // copy mpShadow if necessary
                 if(!mpShadow && rCandidate.mpShadow)
                 {
-                    mpShadow = new sdrShadowAttribute(*rCandidate.mpShadow);
+                    mpShadow = new SdrShadowAttribute(*rCandidate.mpShadow);
                 }
             }
 
@@ -121,7 +121,7 @@ namespace drawinglayer
                 // copy mpLine if necessary
                 if(!mpLine && rCandidate.mpLine)
                 {
-                    mpLine = new sdrLineAttribute(*rCandidate.mpLine);
+                    mpLine = new SdrLineAttribute(*rCandidate.mpLine);
                 }
             }
 
@@ -137,7 +137,7 @@ namespace drawinglayer
                 // copy mpLineStartEnd if necessary
                 if(!mpLineStartEnd && rCandidate.mpLineStartEnd)
                 {
-                    mpLineStartEnd = new sdrLineStartEndAttribute(*rCandidate.mpLineStartEnd);
+                    mpLineStartEnd = new SdrLineStartEndAttribute(*rCandidate.mpLineStartEnd);
                 }
             }
 
@@ -153,7 +153,7 @@ namespace drawinglayer
                 // copy mpFill if necessary
                 if(!mpFill && rCandidate.mpFill)
                 {
-                    mpFill = new sdrFillAttribute(*rCandidate.mpFill);
+                    mpFill = new SdrFillAttribute(*rCandidate.mpFill);
                 }
             }
 
@@ -169,14 +169,14 @@ namespace drawinglayer
                 // copy mpFillFloatTransGradient if necessary
                 if(!mpFillFloatTransGradient && rCandidate.mpFillFloatTransGradient)
                 {
-                    mpFillFloatTransGradient = new fillGradientAttribute(*rCandidate.mpFillFloatTransGradient);
+                    mpFillFloatTransGradient = new FillGradientAttribute(*rCandidate.mpFillFloatTransGradient);
                 }
             }
 
             return *this;
         }
 
-        bool sdrLineFillShadowAttribute::operator==(const sdrLineFillShadowAttribute& rCandidate) const
+        bool SdrLineFillShadowAttribute::operator==(const SdrLineFillShadowAttribute& rCandidate) const
         {
             // handle mpShadow
             if(!pointerOrContentEqual(mpShadow, rCandidate.mpShadow))
diff --git a/drawinglayer/source/attribute/sdrattribute.cxx b/drawinglayer/source/attribute/sdrattribute.cxx
index 6c4a8ff84501..0ce4a4f56763 100644
--- a/drawinglayer/source/attribute/sdrattribute.cxx
+++ b/drawinglayer/source/attribute/sdrattribute.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdrattribute.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:34 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,15 +33,15 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE_HXX
 #include <drawinglayer/attribute/sdrattribute.hxx>
 #endif
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX
 #include <drawinglayer/attribute/fillattribute.hxx>
 #endif
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX
 #include <drawinglayer/attribute/sdrfillbitmapattribute.hxx>
 #endif
 
@@ -51,7 +51,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrLineAttribute::sdrLineAttribute(
+        SdrLineAttribute::SdrLineAttribute(
             basegfx::tools::B2DLineJoin eJoin, double fWidth, double fTransparence, const basegfx::BColor& rColor,
             const ::std::vector< double >& rDotDashArray, double fFullDotDashLen)
         :   meJoin(eJoin),
@@ -63,11 +63,11 @@ namespace drawinglayer
         {
         }
 
-        sdrLineAttribute::~sdrLineAttribute()
+        SdrLineAttribute::~SdrLineAttribute()
         {
         }
 
-        bool sdrLineAttribute::operator==(const sdrLineAttribute& rCandidate) const
+        bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const
         {
             return (meJoin == rCandidate.meJoin
                 && mfWidth == rCandidate.mfWidth
@@ -84,7 +84,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrLineStartEndAttribute::sdrLineStartEndAttribute(
+        SdrLineStartEndAttribute::SdrLineStartEndAttribute(
             const basegfx::B2DPolyPolygon& rStartPolyPolygon, const basegfx::B2DPolyPolygon& rEndPolyPolygon,
             double fStartWidth, double fEndWidth, bool bStartActive, bool bEndActive, bool bStartCentered, bool bEndCentered)
         :   maStartPolyPolygon(rStartPolyPolygon),
@@ -98,11 +98,11 @@ namespace drawinglayer
         {
         }
 
-        sdrLineStartEndAttribute::~sdrLineStartEndAttribute()
+        SdrLineStartEndAttribute::~SdrLineStartEndAttribute()
         {
         }
 
-        bool sdrLineStartEndAttribute::operator==(const sdrLineStartEndAttribute& rCandidate) const
+        bool SdrLineStartEndAttribute::operator==(const SdrLineStartEndAttribute& rCandidate) const
         {
             return (mbStartActive == rCandidate.mbStartActive
                 && mbEndActive == rCandidate.mbEndActive
@@ -122,18 +122,18 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrShadowAttribute::sdrShadowAttribute(const basegfx::B2DVector& rOffset, double fTransparence, const basegfx::BColor& rColor)
+        SdrShadowAttribute::SdrShadowAttribute(const basegfx::B2DVector& rOffset, double fTransparence, const basegfx::BColor& rColor)
         :   maOffset(rOffset),
             mfTransparence(fTransparence),
             maColor(rColor)
         {
         }
 
-        sdrShadowAttribute::~sdrShadowAttribute()
+        SdrShadowAttribute::~SdrShadowAttribute()
         {
         }
 
-        bool sdrShadowAttribute::operator==(const sdrShadowAttribute& rCandidate) const
+        bool SdrShadowAttribute::operator==(const SdrShadowAttribute& rCandidate) const
         {
             return (mfTransparence == rCandidate.mfTransparence
                 && maColor == rCandidate.maColor
@@ -148,9 +148,12 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrFillAttribute::sdrFillAttribute(
-            double fTransparence, const basegfx::BColor& rColor, fillGradientAttribute* pGradient,
-            fillHatchAttribute* pHatch, sdrFillBitmapAttribute* pBitmap)
+        SdrFillAttribute::SdrFillAttribute(
+            double fTransparence,
+            const basegfx::BColor& rColor,
+            FillGradientAttribute* pGradient,
+            FillHatchAttribute* pHatch,
+            SdrFillBitmapAttribute* pBitmap)
         :   mfTransparence(fTransparence),
             maColor(rColor),
             mpGradient(pGradient),
@@ -159,7 +162,7 @@ namespace drawinglayer
         {
         }
 
-        sdrFillAttribute::sdrFillAttribute(const sdrFillAttribute& rCandidate)
+        SdrFillAttribute::SdrFillAttribute(const SdrFillAttribute& rCandidate)
         :   mfTransparence(1.0),
             mpGradient(0L),
             mpHatch(0L),
@@ -171,14 +174,14 @@ namespace drawinglayer
             }
         }
 
-        sdrFillAttribute::~sdrFillAttribute()
+        SdrFillAttribute::~SdrFillAttribute()
         {
             delete mpGradient;
             delete mpHatch;
             delete mpBitmap;
         }
 
-        sdrFillAttribute& sdrFillAttribute::operator=(const sdrFillAttribute& rCandidate)
+        SdrFillAttribute& SdrFillAttribute::operator=(const SdrFillAttribute& rCandidate)
         {
             // copy data
             mfTransparence = rCandidate.mfTransparence;
@@ -196,7 +199,7 @@ namespace drawinglayer
                 // copy mpGradient if necessary
                 if(!mpGradient && rCandidate.mpGradient)
                 {
-                    mpGradient = new fillGradientAttribute(*rCandidate.mpGradient);
+                    mpGradient = new FillGradientAttribute(*rCandidate.mpGradient);
                 }
             }
 
@@ -212,7 +215,7 @@ namespace drawinglayer
                 // copy mpHatch if necessary
                 if(!mpHatch && rCandidate.mpHatch)
                 {
-                    mpHatch = new fillHatchAttribute(*rCandidate.mpHatch);
+                    mpHatch = new FillHatchAttribute(*rCandidate.mpHatch);
                 }
             }
 
@@ -228,14 +231,14 @@ namespace drawinglayer
                 // copy mpBitmap if necessary
                 if(!mpBitmap && rCandidate.mpBitmap)
                 {
-                    mpBitmap = new sdrFillBitmapAttribute(*rCandidate.mpBitmap);
+                    mpBitmap = new SdrFillBitmapAttribute(*rCandidate.mpBitmap);
                 }
             }
 
             return *this;
         }
 
-        bool sdrFillAttribute::operator==(const sdrFillAttribute& rCandidate) const
+        bool SdrFillAttribute::operator==(const SdrFillAttribute& rCandidate) const
         {
             if(mfTransparence != rCandidate.mfTransparence)
                 return false;
diff --git a/drawinglayer/source/attribute/sdrattribute3d.cxx b/drawinglayer/source/attribute/sdrattribute3d.cxx
index ccbe27181256..831e23484c40 100644
--- a/drawinglayer/source/attribute/sdrattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrattribute3d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdrattribute3d.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:34 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,7 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE3D_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE3D_HXX
 #include <drawinglayer/attribute/sdrattribute3d.hxx>
 #endif
 
@@ -43,13 +43,13 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdr3DObjectAttribute::sdr3DObjectAttribute(
+        Sdr3DObjectAttribute::Sdr3DObjectAttribute(
             ::com::sun::star::drawing::NormalsKind  aNormalsKind,
             ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX,
             ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY,
             ::com::sun::star::drawing::TextureKind2 aTextureKind,
             ::com::sun::star::drawing::TextureMode aTextureMode,
-            const materialAttribute3D& rMaterial,
+            const MaterialAttribute3D& rMaterial,
             bool bNormalsInvert,
             bool bDoubleSided,
             bool bShadow3D,
@@ -67,22 +67,18 @@ namespace drawinglayer
         {
         }
 
-        sdr3DObjectAttribute::~sdr3DObjectAttribute()
-        {
-        }
-
-        bool sdr3DObjectAttribute::operator==(const sdr3DObjectAttribute& rCandidate) const
+        bool Sdr3DObjectAttribute::operator==(const Sdr3DObjectAttribute& rCandidate) const
         {
             return (maNormalsKind == rCandidate.maNormalsKind
-            && maTextureProjectionX == rCandidate.maTextureProjectionX
-            && maTextureProjectionY == rCandidate.maTextureProjectionY
-            && maTextureKind == rCandidate.maTextureKind
-            && maTextureMode == rCandidate.maTextureMode
-            && maMaterial == rCandidate.maMaterial
-            && mbNormalsInvert == rCandidate.mbNormalsInvert
-            && mbDoubleSided == rCandidate.mbDoubleSided
-            && mbShadow3D == rCandidate.mbShadow3D
-            && mbTextureFilter == rCandidate.mbTextureFilter);
+                && maTextureProjectionX == rCandidate.maTextureProjectionX
+                && maTextureProjectionY == rCandidate.maTextureProjectionY
+                && maTextureKind == rCandidate.maTextureKind
+                && maTextureMode == rCandidate.maTextureMode
+                && maMaterial == rCandidate.maMaterial
+                && mbNormalsInvert == rCandidate.mbNormalsInvert
+                && mbDoubleSided == rCandidate.mbDoubleSided
+                && mbShadow3D == rCandidate.mbShadow3D
+                && mbTextureFilter == rCandidate.mbTextureFilter);
         }
     } // end of namespace attribute
 } // end of namespace drawinglayer
@@ -93,18 +89,14 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdr3DLightAttribute::sdr3DLightAttribute(const basegfx::BColor& rColor, const basegfx::B3DVector& rDirection, bool bSpecular)
+        Sdr3DLightAttribute::Sdr3DLightAttribute(const basegfx::BColor& rColor, const basegfx::B3DVector& rDirection, bool bSpecular)
         :   maColor(rColor),
             maDirection(rDirection),
             mbSpecular(bSpecular)
         {
         }
 
-        sdr3DLightAttribute::~sdr3DLightAttribute()
-        {
-        }
-
-        bool sdr3DLightAttribute::operator==(const sdr3DLightAttribute& rCandidate) const
+        bool Sdr3DLightAttribute::operator==(const Sdr3DLightAttribute& rCandidate) const
         {
             return (maColor == rCandidate.maColor
                 && maDirection == rCandidate.maDirection
@@ -119,26 +111,22 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrLightingAttribute::sdrLightingAttribute(
+        SdrLightingAttribute::SdrLightingAttribute(
             const basegfx::BColor& rAmbientLight,
-            const ::std::vector< sdr3DLightAttribute >& rLightVector)
+            const ::std::vector< Sdr3DLightAttribute >& rLightVector)
         :   maAmbientLight(rAmbientLight),
             maLightVector(rLightVector)
         {
         }
 
-        sdrLightingAttribute::~sdrLightingAttribute()
-        {
-        }
-
-        bool sdrLightingAttribute::operator==(const sdrLightingAttribute& rCandidate) const
+        bool SdrLightingAttribute::operator==(const SdrLightingAttribute& rCandidate) const
         {
             return (maAmbientLight == rCandidate.maAmbientLight
                 && maLightVector == rCandidate.maLightVector);
         }
 
         // color model solver
-        basegfx::BColor sdrLightingAttribute::solveColorModel(
+        basegfx::BColor SdrLightingAttribute::solveColorModel(
             const basegfx::B3DVector& rNormalInEyeCoordinates,
             const basegfx::BColor& rColor, const basegfx::BColor& rSpecular,
             const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) const
@@ -160,7 +148,7 @@ namespace drawinglayer
 
                 for(sal_uInt32 a(0L); a < nLightCount; a++)
                 {
-                    const sdr3DLightAttribute& rLight(maLightVector[a]);
+                    const Sdr3DLightAttribute& rLight(maLightVector[a]);
                     const double fCosFac(rLight.getDirection().scalar(aEyeNormal));
 
                     if(basegfx::fTools::more(fCosFac, 0.0))
@@ -198,7 +186,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrSceneAttribute::sdrSceneAttribute(
+        SdrSceneAttribute::SdrSceneAttribute(
             double fDistance,
             double fShadowSlant,
             ::com::sun::star::drawing::ProjectionMode aProjectionMode,
@@ -212,11 +200,7 @@ namespace drawinglayer
         {
         }
 
-        sdrSceneAttribute::~sdrSceneAttribute()
-        {
-        }
-
-        bool sdrSceneAttribute::operator==(const sdrSceneAttribute& rCandidate) const
+        bool SdrSceneAttribute::operator==(const SdrSceneAttribute& rCandidate) const
         {
             return (mfDistance == rCandidate.mfDistance
                 && mfShadowSlant == rCandidate.mfShadowSlant
diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
index 4f7e8b5947a2..afa2ee17f261 100644
--- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdrfillbitmapattribute.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-08-09 16:47:34 $
+ *  last change: $Author: aw $ $Date: 2006-10-19 10:36:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,11 +33,11 @@
  *
  ************************************************************************/
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX
 #include <drawinglayer/attribute/sdrfillbitmapattribute.hxx>
 #endif
 
-#ifndef _DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
+#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
 #include <drawinglayer/attribute/fillbitmapattribute.hxx>
 #endif
 
@@ -55,7 +55,7 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        sdrFillBitmapAttribute::sdrFillBitmapAttribute(
+        SdrFillBitmapAttribute::SdrFillBitmapAttribute(
             const Bitmap& rBitmap, const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset,
             const basegfx::B2DVector& rOffsetPosition, const basegfx::B2DVector& rRectPoint,
             bool bTiling, bool bStretch, bool bLogSize)
@@ -70,7 +70,7 @@ namespace drawinglayer
         {
         }
 
-        bool sdrFillBitmapAttribute::operator==(const sdrFillBitmapAttribute& rCandidate) const
+        bool SdrFillBitmapAttribute::operator==(const SdrFillBitmapAttribute& rCandidate) const
         {
             return (maBitmap == rCandidate.maBitmap
                 && maSize == rCandidate.maSize
@@ -82,7 +82,7 @@ namespace drawinglayer
                 && mbLogSize == rCandidate.mbLogSize);
         }
 
-        fillBitmapAttribute sdrFillBitmapAttribute::getFillBitmapAttribute(const basegfx::B2DRange& rRange) const
+        FillBitmapAttribute SdrFillBitmapAttribute::getFillBitmapAttribute(const basegfx::B2DRange& rRange) const
         {
             // get logical size of bitmap (before expanding eventually)
             Bitmap aBitmap(maBitmap);
@@ -236,7 +236,7 @@ namespace drawinglayer
                 aBitmapSize.setY(aBitmapSize.getY() / fRangeHeight);
             }
 
-            return fillBitmapAttribute(aBitmap, aBitmapTopLeft, aBitmapSize, mbTiling);
+            return FillBitmapAttribute(aBitmap, aBitmapTopLeft, aBitmapSize, mbTiling);
         }
     } // end of namespace attribute
 } // end of namespace drawinglayer