#i39532# moved from Primitive2DReference to Primitive2DSequence where possible to avoid extra-group primitive creations and deeper hierarchies as necessary

6 files changed, 32 insertions, 27 deletions

diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
index d5e4dbdf0e38..d15fef450931 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sdrallattribute3d.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2006-10-19 10:30:35 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -89,7 +89,7 @@ namespace drawinglayer
             const FillGradientAttribute* getFillFloatTransGradient() const { return mpFillFloatTransGradient; }
         };
     } // end of namespace overlay
-} // end of namespace sdr
+} // end of namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index 834b13f9b38b..760455023c98 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: baseprocessor2d.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2007-01-25 12:56:41 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -77,7 +77,7 @@ namespace drawinglayer
         class CollectingProcessor2D : public BaseProcessor2D
         {
         private:
-            primitive2d::Primitive2DSequence                maPrimitiveSequence;
+            primitive2d::Primitive2DSequence                maPrimitive2DSequence;
 
         public:
             CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation);
@@ -88,17 +88,17 @@ namespace drawinglayer
             // helpers for adding to local sequence
             void appendPrimitive2DSequence(const primitive2d::Primitive2DSequence& rSource)
             {
-                primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maPrimitiveSequence, rSource);
+                primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maPrimitive2DSequence, rSource);
             }
 
             void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource)
             {
-                primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitiveSequence, rSource);
+                primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource);
             }
 
             // data access and reset
-            const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitiveSequence; }
-            void reset() { maPrimitiveSequence = primitive2d::Primitive2DSequence(); }
+            const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
+            void reset() { maPrimitive2DSequence = primitive2d::Primitive2DSequence(); }
         };
     } // end of namespace processor2d
 } // end of namespace drawinglayer
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
index 3dc0ef43eff8..e89066074357 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: baseprocessor3d.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2006-10-19 10:33:20 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -73,7 +73,7 @@ namespace drawinglayer
         class CollectingProcessor3D : public BaseProcessor3D
         {
         private:
-            primitive3d::Primitive3DSequence                        maPrimitiveSequence;
+            primitive3d::Primitive3DSequence                        maPrimitive3DSequence;
 
         public:
             CollectingProcessor3D(double fTime);
@@ -84,16 +84,17 @@ namespace drawinglayer
             // helpers for adding to local sequence
             void appendPrimitive3DSequence(const primitive3d::Primitive3DSequence& rSource)
             {
-                primitive3d::appendPrimitive3DSequenceToPrimitive3DSequence(maPrimitiveSequence, rSource);
+                primitive3d::appendPrimitive3DSequenceToPrimitive3DSequence(maPrimitive3DSequence, rSource);
             }
 
             void appendPrimitive3DReference(const primitive3d::Primitive3DReference& rSource)
             {
-                primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(maPrimitiveSequence, rSource);
+                primitive3d::appendPrimitive3DReferenceToPrimitive3DSequence(maPrimitive3DSequence, rSource);
             }
 
-            // data access
-            const primitive3d::Primitive3DSequence& getPrimitive3DSequence() const { return maPrimitiveSequence; }
+            // data access and reset
+            const primitive3d::Primitive3DSequence& getPrimitive3DSequence() const { return maPrimitive3DSequence; }
+            void reset() { maPrimitive3DSequence = primitive3d::Primitive3DSequence(); }
         };
     } // end of namespace processor3d
 } // end of namespace drawinglayer
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 2487919b2f94..b00506f1d6de 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fillhatchprimitive2d.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: aw $ $Date: 2007-03-06 12:34:29 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -90,12 +90,16 @@ namespace drawinglayer
                     // rotated 45 degrees
                     texture::GeoTexSvxHatch aHatch(getObjectRange(), maFillHatch.getDistance(), fAngle + F_PI4);
                     aHatch.appendTransformations(aMatrices);
+
+                    // fall-through by purpose
                 }
                 case attribute::HATCHSTYLE_DOUBLE:
                 {
                     // rotated 90 degrees
                     texture::GeoTexSvxHatch aHatch(getObjectRange(), maFillHatch.getDistance(), fAngle + F_PI2);
                     aHatch.appendTransformations(aMatrices);
+
+                    // fall-through by purpose
                 }
                 case attribute::HATCHSTYLE_SINGLE:
                 {
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index e68d2870a315..665b4a97681f 100644
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: baseprocessor2d.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2006-10-19 10:35:37 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,14 +66,14 @@ namespace drawinglayer
     {
         CollectingProcessor2D::CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation)
         :   BaseProcessor2D(rViewInformation),
-            maPrimitiveSequence()
+            maPrimitive2DSequence()
         {
         }
 
         void CollectingProcessor2D::process(const primitive2d::Primitive2DSequence& rSource)
         {
             // accept everything
-            primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maPrimitiveSequence, rSource);
+            primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maPrimitive2DSequence, rSource);
         }
     } // end of namespace processor2d
 } // end of namespace drawinglayer
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index b8da56b28719..2fae46732caf 100644
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: baseprocessor3d.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: aw $ $Date: 2006-10-19 10:39:22 $
+ *  last change: $Author: aw $ $Date: 2007-07-06 13:38:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,14 +66,14 @@ namespace drawinglayer
     {
         CollectingProcessor3D::CollectingProcessor3D(double fTime)
         :   BaseProcessor3D(fTime),
-            maPrimitiveSequence()
+            maPrimitive3DSequence()
         {
         }
 
         void CollectingProcessor3D::process(const primitive3d::Primitive3DSequence& rSource)
         {
             // accept everything
-            primitive3d::appendPrimitive3DSequenceToPrimitive3DSequence(maPrimitiveSequence, rSource);
+            primitive3d::appendPrimitive3DSequenceToPrimitive3DSequence(maPrimitive3DSequence, rSource);
         }
     } // end of namespace processor3d
 } // end of namespace drawinglayer