gridcontrol_03: merge with DEV300_m77

1 files changed, 30 insertions, 139 deletions

diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 4ecf74afa2fd..c3ad3db80add 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -29,12 +29,6 @@
 #include "precompiled_drawinglayer.hxx"
 
 #include <drawinglayer/attribute/sdrallattribute3d.hxx>
-#include <drawinglayer/attribute/sdrattribute.hxx>
-#include <drawinglayer/attribute/fillattribute.hxx>
-
-//////////////////////////////////////////////////////////////////////////////
-// pointer compare define
-#define pointerOrContentEqual(p, q) ((p == q) || (p && q && *p == *q))
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -42,150 +36,47 @@ namespace drawinglayer
 {
     namespace attribute
     {
-        SdrLineFillShadowAttribute::SdrLineFillShadowAttribute(
-            SdrLineAttribute* pLine,
-            SdrFillAttribute* pFill,
-            SdrLineStartEndAttribute* pLineStartEnd,
-            SdrShadowAttribute* pShadow,
-            FillGradientAttribute* pFillFloatTransGradient)
-        :   mpShadow(pShadow),
-            mpLine(pLine),
-            mpLineStartEnd(pLineStartEnd),
-            mpFill(pFill),
-            mpFillFloatTransGradient(pFillFloatTransGradient)
-        {
-        }
-
-        SdrLineFillShadowAttribute::SdrLineFillShadowAttribute(
-            const SdrLineFillShadowAttribute& rCandidate)
-        :   mpShadow(0),
-            mpLine(0),
-            mpLineStartEnd(0),
-            mpFill(0),
-            mpFillFloatTransGradient(0)
+        SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D(
+            const SdrLineAttribute& rLine,
+            const SdrFillAttribute& rFill,
+            const SdrLineStartEndAttribute& rLineStartEnd,
+            const SdrShadowAttribute& rShadow,
+            const FillGradientAttribute& rFillFloatTransGradient)
+        :   maLine(rLine),
+            maFill(rFill),
+            maLineStartEnd(rLineStartEnd),
+            maShadow(rShadow),
+            maFillFloatTransGradient(rFillFloatTransGradient)
         {
-            *this = rCandidate;
         }
 
-        SdrLineFillShadowAttribute::~SdrLineFillShadowAttribute()
+        SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D()
+        :   maLine(),
+            maFill(),
+            maLineStartEnd(),
+            maShadow(),
+            maFillFloatTransGradient()
         {
-            delete mpShadow;
-            delete mpLine;
-            delete mpLineStartEnd;
-            delete mpFill;
-            delete mpFillFloatTransGradient;
         }
 
-        SdrLineFillShadowAttribute& SdrLineFillShadowAttribute::operator=(const SdrLineFillShadowAttribute& rCandidate)
+        bool SdrLineFillShadowAttribute3D::isDefault() const
         {
-            // handle mpShadow
-            {
-                // delete local mpShadow if necessary
-                if(mpShadow)
-                {
-                    delete mpShadow;
-                    mpShadow = 0;
-                }
-
-                // copy mpShadow if necessary
-                if(rCandidate.mpShadow)
-                {
-                    mpShadow = new SdrShadowAttribute(*rCandidate.mpShadow);
-                }
-            }
-
-            // handle mpLine
-            {
-                // delete local mpLine if necessary
-                if(mpLine)
-                {
-                    delete mpLine;
-                    mpLine = 0;
-                }
-
-                // copy mpLine if necessary
-                if(rCandidate.mpLine)
-                {
-                    mpLine = new SdrLineAttribute(*rCandidate.mpLine);
-                }
-            }
-
-            // handle mpLineStartEnd
-            {
-                // delete local mpLineStartEnd if necessary
-                if(mpLineStartEnd)
-                {
-                    delete mpLineStartEnd;
-                    mpLineStartEnd = 0;
-                }
-
-                // copy mpLineStartEnd if necessary
-                if(rCandidate.mpLineStartEnd)
-                {
-                    mpLineStartEnd = new SdrLineStartEndAttribute(*rCandidate.mpLineStartEnd);
-                }
-            }
-
-            // handle mpFill
-            {
-                // delete local mpFill if necessary
-                if(mpFill)
-                {
-                    delete mpFill;
-                    mpFill = 0;
-                }
-
-                // copy mpFill if necessary
-                if(rCandidate.mpFill)
-                {
-                    mpFill = new SdrFillAttribute(*rCandidate.mpFill);
-                }
-            }
-
-            // handle mpFillFloatTransGradient
-            {
-                // delete local mpFillFloatTransGradient if necessary
-                if(mpFillFloatTransGradient)
-                {
-                    delete mpFillFloatTransGradient;
-                    mpFillFloatTransGradient = 0;
-                }
-
-                // copy mpFillFloatTransGradient if necessary
-                if(rCandidate.mpFillFloatTransGradient)
-                {
-                    mpFillFloatTransGradient = new FillGradientAttribute(*rCandidate.mpFillFloatTransGradient);
-                }
-            }
-
-            return *this;
+            return(getLine().isDefault()
+                && getFill().isDefault()
+                && getLineStartEnd().isDefault()
+                && getShadow().isDefault()
+                && getFillFloatTransGradient().isDefault());
         }
 
-        bool SdrLineFillShadowAttribute::operator==(const SdrLineFillShadowAttribute& rCandidate) const
+        bool SdrLineFillShadowAttribute3D::operator==(const SdrLineFillShadowAttribute3D& rCandidate) const
         {
-            // handle mpShadow
-            if(!pointerOrContentEqual(mpShadow, rCandidate.mpShadow))
-                return false;
-
-            // handle mpLine
-            if(!pointerOrContentEqual(mpLine, rCandidate.mpLine))
-                return false;
-
-            // handle mpLineStartEnd
-            if(!pointerOrContentEqual(mpLineStartEnd, rCandidate.mpLineStartEnd))
-                return false;
-
-            // handle mpFill
-            if(!pointerOrContentEqual(mpFill, rCandidate.mpFill))
-                return false;
-
-            // handle mpFillFloatTransGradient
-            if(!pointerOrContentEqual(mpFillFloatTransGradient, rCandidate.mpFillFloatTransGradient))
-                return false;
-
-            return true;
+            return(getLine() == rCandidate.getLine()
+                && getFill() == rCandidate.getFill()
+                && getLineStartEnd() == rCandidate.getLineStartEnd()
+                && getShadow() == rCandidate.getShadow()
+                && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient());
         }
-    } // end of namespace attribute
+    } // end of namespace overlay
 } // end of namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////