Removed in-between namespaces (curve, matrix, numeric, point, polygon, range, tuple, vector). Names were too common and e.g. vector leaded to problems with some defines. This is now avoided. Also some bug fixes, addition of 3d polygon tooling etc.

4 files changed, 388 insertions, 400 deletions

diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
index e2fd154b5e11..4bb457b28d35 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b1drange.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2003-11-26 14:40:00 $
+ *  last change: $Author: aw $ $Date: 2003-11-28 11:17:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,88 +68,85 @@
 
 namespace basegfx
 {
-    namespace range
+    class B1DRange
     {
-        class B1DRange
+        ::basegfx::BasicRange                   maRange;
+
+    public:
+        B1DRange()
+        {
+        }
+
+        B1DRange(double fStartValue)
+        :   maRange(fStartValue)
+        {
+        }
+
+        B1DRange(const B1DRange& rRange)
+        :   maRange(rRange.maRange)
+        {
+        }
+
+        sal_Bool isEmpty() const
+        {
+            return maRange.isEmpty();
+        }
+
+        void reset()
+        {
+            maRange.reset();
+        }
+
+        void operator=(const B1DRange& rRange)
+        {
+            maRange = rRange.maRange;
+        }
+
+        double getMinimum() const
+        {
+            return maRange.getMinimum();
+        }
+
+        double getMaximum() const
+        {
+            return maRange.getMaximum();
+        }
+
+        double getRange() const
+        {
+            return maRange.getRange();
+        }
+
+        double getCenter() const
+        {
+            return maRange.getCenter();
+        }
+
+        sal_Bool isInside(double fValue) const
+        {
+            return maRange.isInside(fValue);
+        }
+
+        sal_Bool isInside(const B1DRange& rRange) const
+        {
+            return maRange.isInside(rRange.maRange);
+        }
+
+        sal_Bool overlaps(const B1DRange& rRange) const
+        {
+            return maRange.overlaps(rRange.maRange);
+        }
+
+        void expand(double fValue)
+        {
+            maRange.expand(fValue);
+        }
+
+        void expand(const B1DRange& rRange)
         {
-            ::basegfx::range::BasicRange                    maRange;
-
-        public:
-            B1DRange()
-            {
-            }
-
-            B1DRange(double fStartValue)
-            :   maRange(fStartValue)
-            {
-            }
-
-            B1DRange(const B1DRange& rRange)
-            :   maRange(rRange.maRange)
-            {
-            }
-
-            sal_Bool isEmpty() const
-            {
-                return maRange.isEmpty();
-            }
-
-            void reset()
-            {
-                maRange.reset();
-            }
-
-            void operator=(const B1DRange& rRange)
-            {
-                maRange = rRange.maRange;
-            }
-
-            double getMinimum() const
-            {
-                return maRange.getMinimum();
-            }
-
-            double getMaximum() const
-            {
-                return maRange.getMaximum();
-            }
-
-            double getRange() const
-            {
-                return maRange.getRange();
-            }
-
-            double getCenter() const
-            {
-                return maRange.getCenter();
-            }
-
-            sal_Bool isInside(double fValue) const
-            {
-                return maRange.isInside(fValue);
-            }
-
-            sal_Bool isInside(const B1DRange& rRange) const
-            {
-                return maRange.isInside(rRange.maRange);
-            }
-
-            sal_Bool overlaps(const B1DRange& rRange) const
-            {
-                return maRange.overlaps(rRange.maRange);
-            }
-
-            void expand(double fValue)
-            {
-                maRange.expand(fValue);
-            }
-
-            void expand(const B1DRange& rRange)
-            {
-                maRange.expand(rRange.maRange);
-            }
-        };
-    } // end of namespace range
+            maRange.expand(rRange.maRange);
+        }
+    };
 } // end of namespace basegfx
 
 #endif //   _BGFX_RANGE_B1DRANGE_HXX
diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
index 10f14abe9fd7..c30d461f259a 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2drange.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2003-11-26 14:40:01 $
+ *  last change: $Author: aw $ $Date: 2003-11-28 11:17:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,119 +72,116 @@
 
 namespace basegfx
 {
-    namespace range
+    class B2DRange
     {
-        class B2DRange
+        ::basegfx::BasicRange           maRangeX;
+        ::basegfx::BasicRange           maRangeY;
+
+    public:
+        B2DRange()
+        {
+        }
+
+        B2DRange(const B2DTuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY())
+        {
+        }
+
+        B2DRange(const B2DRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY)
+        {
+        }
+
+        sal_Bool isEmpty() const
+        {
+            return (
+                maRangeX.isEmpty()
+                || maRangeY.isEmpty()
+                );
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+        }
+
+        void operator=(const B2DRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+        }
+
+        B2DTuple getMinimum() const
+        {
+            return B2DTuple(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum()
+                );
+        }
+
+        B2DTuple getMaximum() const
+        {
+            return B2DTuple(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum()
+                );
+        }
+
+        B2DTuple getRange() const
+        {
+            return B2DTuple(
+                maRangeX.getRange(),
+                maRangeY.getRange()
+                );
+        }
+
+        B2DTuple getCenter() const
+        {
+            return B2DTuple(
+                maRangeX.getCenter(),
+                maRangeY.getCenter()
+                );
+        }
+
+        sal_Bool isInside(const B2DTuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                );
+        }
+
+        sal_Bool isInside(const B2DRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                );
+        }
+
+        sal_Bool overlaps(const B2DRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                );
+        }
+
+        void expand(const B2DTuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+        }
+
+        void expand(const B2DRange& rRange)
         {
-            ::basegfx::range::BasicRange            maRangeX;
-            ::basegfx::range::BasicRange            maRangeY;
-
-        public:
-            B2DRange()
-            {
-            }
-
-            B2DRange(const tuple::B2DTuple& rTuple)
-            :   maRangeX(rTuple.getX()),
-                maRangeY(rTuple.getY())
-            {
-            }
-
-            B2DRange(const B2DRange& rRange)
-            :   maRangeX(rRange.maRangeX),
-                maRangeY(rRange.maRangeY)
-            {
-            }
-
-            sal_Bool isEmpty() const
-            {
-                return (
-                    maRangeX.isEmpty()
-                    || maRangeY.isEmpty()
-                    );
-            }
-
-            void reset()
-            {
-                maRangeX.reset();
-                maRangeY.reset();
-            }
-
-            void operator=(const B2DRange& rRange)
-            {
-                maRangeX = rRange.maRangeX;
-                maRangeY = rRange.maRangeY;
-            }
-
-            tuple::B2DTuple getMinimum() const
-            {
-                return tuple::B2DTuple(
-                    maRangeX.getMinimum(),
-                    maRangeY.getMinimum()
-                    );
-            }
-
-            tuple::B2DTuple getMaximum() const
-            {
-                return tuple::B2DTuple(
-                    maRangeX.getMaximum(),
-                    maRangeY.getMaximum()
-                    );
-            }
-
-            tuple::B2DTuple getRange() const
-            {
-                return tuple::B2DTuple(
-                    maRangeX.getRange(),
-                    maRangeY.getRange()
-                    );
-            }
-
-            tuple::B2DTuple getCenter() const
-            {
-                return tuple::B2DTuple(
-                    maRangeX.getCenter(),
-                    maRangeY.getCenter()
-                    );
-            }
-
-            sal_Bool isInside(const tuple::B2DTuple& rTuple) const
-            {
-                return (
-                    maRangeX.isInside(rTuple.getX())
-                    && maRangeY.isInside(rTuple.getY())
-                    );
-            }
-
-            sal_Bool isInside(const B2DRange& rRange) const
-            {
-                return (
-                    maRangeX.isInside(rRange.maRangeX)
-                    && maRangeY.isInside(rRange.maRangeY)
-                    );
-            }
-
-            sal_Bool overlaps(const B2DRange& rRange) const
-            {
-                return (
-                    maRangeX.overlaps(rRange.maRangeX)
-                    && maRangeY.overlaps(rRange.maRangeY)
-                    );
-            }
-
-            void expand(const tuple::B2DTuple& rTuple)
-            {
-                maRangeX.expand(rTuple.getX());
-                maRangeY.expand(rTuple.getY());
-            }
-
-            void expand(const B2DRange& rRange)
-            {
-                maRangeX.expand(rRange.maRangeX);
-                maRangeY.expand(rRange.maRangeY);
-            }
-        };
-    } // end of namespace range
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+        }
+    };
 } // end of namespace basegfx
 
 #endif //   _BGFX_RANGE_B2DRANGE_HXX
diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/basegfx/inc/basegfx/range/b3drange.hxx
index 3d6c3c958d1a..a4d5be99f6ec 100644
--- a/basegfx/inc/basegfx/range/b3drange.hxx
+++ b/basegfx/inc/basegfx/range/b3drange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3drange.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2003-11-26 14:40:02 $
+ *  last change: $Author: aw $ $Date: 2003-11-28 11:17:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,134 +72,131 @@
 
 namespace basegfx
 {
-    namespace range
+    class B3DRange
     {
-        class B3DRange
+        ::basegfx::BasicRange           maRangeX;
+        ::basegfx::BasicRange           maRangeY;
+        ::basegfx::BasicRange           maRangeZ;
+
+    public:
+        B3DRange()
+        {
+        }
+
+        B3DRange(const B3DTuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY()),
+            maRangeZ(rTuple.getZ())
+        {
+        }
+
+        B3DRange(const B3DRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY),
+            maRangeZ(rRange.maRangeZ)
+        {
+        }
+
+        sal_Bool isEmpty() const
+        {
+            return (
+                maRangeX.isEmpty()
+                || maRangeY.isEmpty()
+                || maRangeZ.isEmpty()
+                );
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+            maRangeZ.reset();
+        }
+
+        void operator=(const B3DRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+            maRangeZ = rRange.maRangeZ;
+        }
+
+        B3DTuple getMinimum() const
+        {
+            return B3DTuple(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum(),
+                maRangeZ.getMinimum()
+                );
+        }
+
+        B3DTuple getMaximum() const
+        {
+            return B3DTuple(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum(),
+                maRangeZ.getMaximum()
+                );
+        }
+
+        B3DTuple getRange() const
+        {
+            return B3DTuple(
+                maRangeX.getRange(),
+                maRangeY.getRange(),
+                maRangeZ.getRange()
+                );
+        }
+
+        B3DTuple getCenter() const
+        {
+            return B3DTuple(
+                maRangeX.getCenter(),
+                maRangeY.getCenter(),
+                maRangeZ.getCenter()
+                );
+        }
+
+        sal_Bool isInside(const B3DTuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                && maRangeZ.isInside(rTuple.getZ())
+                );
+        }
+
+        sal_Bool isInside(const B3DRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                && maRangeZ.isInside(rRange.maRangeZ)
+                );
+        }
+
+        sal_Bool overlaps(const B3DRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                && maRangeZ.overlaps(rRange.maRangeZ)
+                );
+        }
+
+        void expand(const B3DTuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+            maRangeZ.expand(rTuple.getZ());
+        }
+
+        void expand(const B3DRange& rRange)
         {
-            ::basegfx::range::BasicRange            maRangeX;
-            ::basegfx::range::BasicRange            maRangeY;
-            ::basegfx::range::BasicRange            maRangeZ;
-
-        public:
-            B3DRange()
-            {
-            }
-
-            B3DRange(const tuple::B3DTuple& rTuple)
-            :   maRangeX(rTuple.getX()),
-                maRangeY(rTuple.getY()),
-                maRangeZ(rTuple.getZ())
-            {
-            }
-
-            B3DRange(const B3DRange& rRange)
-            :   maRangeX(rRange.maRangeX),
-                maRangeY(rRange.maRangeY),
-                maRangeZ(rRange.maRangeZ)
-            {
-            }
-
-            sal_Bool isEmpty() const
-            {
-                return (
-                    maRangeX.isEmpty()
-                    || maRangeY.isEmpty()
-                    || maRangeZ.isEmpty()
-                    );
-            }
-
-            void reset()
-            {
-                maRangeX.reset();
-                maRangeY.reset();
-                maRangeZ.reset();
-            }
-
-            void operator=(const B3DRange& rRange)
-            {
-                maRangeX = rRange.maRangeX;
-                maRangeY = rRange.maRangeY;
-                maRangeZ = rRange.maRangeZ;
-            }
-
-            tuple::B3DTuple getMinimum() const
-            {
-                return tuple::B3DTuple(
-                    maRangeX.getMinimum(),
-                    maRangeY.getMinimum(),
-                    maRangeZ.getMinimum()
-                    );
-            }
-
-            tuple::B3DTuple getMaximum() const
-            {
-                return tuple::B3DTuple(
-                    maRangeX.getMaximum(),
-                    maRangeY.getMaximum(),
-                    maRangeZ.getMaximum()
-                    );
-            }
-
-            tuple::B3DTuple getRange() const
-            {
-                return tuple::B3DTuple(
-                    maRangeX.getRange(),
-                    maRangeY.getRange(),
-                    maRangeZ.getRange()
-                    );
-            }
-
-            tuple::B3DTuple getCenter() const
-            {
-                return tuple::B3DTuple(
-                    maRangeX.getCenter(),
-                    maRangeY.getCenter(),
-                    maRangeZ.getCenter()
-                    );
-            }
-
-            sal_Bool isInside(const tuple::B3DTuple& rTuple) const
-            {
-                return (
-                    maRangeX.isInside(rTuple.getX())
-                    && maRangeY.isInside(rTuple.getY())
-                    && maRangeZ.isInside(rTuple.getZ())
-                    );
-            }
-
-            sal_Bool isInside(const B3DRange& rRange) const
-            {
-                return (
-                    maRangeX.isInside(rRange.maRangeX)
-                    && maRangeY.isInside(rRange.maRangeY)
-                    && maRangeZ.isInside(rRange.maRangeZ)
-                    );
-            }
-
-            sal_Bool overlaps(const B3DRange& rRange) const
-            {
-                return (
-                    maRangeX.overlaps(rRange.maRangeX)
-                    && maRangeY.overlaps(rRange.maRangeY)
-                    && maRangeZ.overlaps(rRange.maRangeZ)
-                    );
-            }
-
-            void expand(const tuple::B3DTuple& rTuple)
-            {
-                maRangeX.expand(rTuple.getX());
-                maRangeY.expand(rTuple.getY());
-                maRangeZ.expand(rTuple.getZ());
-            }
-
-            void expand(const B3DRange& rRange)
-            {
-                maRangeX.expand(rRange.maRangeX);
-                maRangeY.expand(rRange.maRangeY);
-                maRangeZ.expand(rRange.maRangeZ);
-            }
-        };
-    } // end of namespace range
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+            maRangeZ.expand(rRange.maRangeZ);
+        }
+    };
 } // end of namespace basegfx
 
 #endif //  _BGFX_RANGE_B3DRANGE_HXX
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index 700f2b17add4..732a95abcf70 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basicrange.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-11-26 14:30:28 $
+ *  last change: $Author: aw $ $Date: 2003-11-28 11:17:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,103 +75,100 @@
 
 namespace basegfx
 {
-    namespace range
+    class BasicRange
     {
-        class BasicRange
+    protected:
+        double                                      mfMinimum;
+        double                                      mfMaximum;
+
+    public:
+        void reset()
         {
-        protected:
-            double                                      mfMinimum;
-            double                                      mfMaximum;
+            mfMinimum = START_MINIMUM_VALUE;
+            mfMaximum = START_MAXIMUM_VALUE;
+        }
 
-        public:
-            void reset()
-            {
-                mfMinimum = START_MINIMUM_VALUE;
-                mfMaximum = START_MAXIMUM_VALUE;
-            }
+        sal_Bool isEmpty() const
+        {
+            return sal_Bool(START_MINIMUM_VALUE == mfMinimum && START_MAXIMUM_VALUE == mfMaximum);
+        }
 
-            sal_Bool isEmpty() const
-            {
-                return sal_Bool(START_MINIMUM_VALUE == mfMinimum && START_MAXIMUM_VALUE == mfMaximum);
-            }
+        double getMinimum() const { return mfMinimum; }
+        double getMaximum() const { return mfMaximum; }
 
-            double getMinimum() const { return mfMinimum; }
-            double getMaximum() const { return mfMaximum; }
+        double getRange() const
+        {
+            return (mfMaximum - mfMinimum);
+        }
 
-            double getRange() const
-            {
-                return (mfMaximum - mfMinimum);
-            }
+        double getCenter() const
+        {
+            return ((mfMaximum + mfMinimum) / 2.0);
+        }
 
-            double getCenter() const
-            {
-                return ((mfMaximum + mfMinimum) / 2.0);
-            }
+        sal_Bool isInside(double fValue) const
+        {
+            return sal_Bool((fValue >= mfMinimum) && (fValue <= mfMaximum));
+        }
 
-            sal_Bool isInside(double fValue) const
-            {
-                return sal_Bool((fValue >= mfMinimum) && (fValue <= mfMaximum));
-            }
+        sal_Bool isInside(const BasicRange& rRange) const
+        {
+            return sal_Bool((rRange.getMinimum() >= mfMinimum) && (rRange.getMaximum() <= mfMaximum));
+        }
 
-            sal_Bool isInside(const BasicRange& rRange) const
-            {
-                return sal_Bool((rRange.getMinimum() >= mfMinimum) && (rRange.getMaximum() <= mfMaximum));
-            }
+        sal_Bool overlaps(const BasicRange& rRange) const
+        {
+            return !sal_Bool((rRange.getMaximum() < mfMinimum) || (rRange.getMinimum() > mfMaximum));
+        }
 
-            sal_Bool overlaps(const BasicRange& rRange) const
-            {
-                return !sal_Bool((rRange.getMaximum() < mfMinimum) || (rRange.getMinimum() > mfMaximum));
-            }
+        BasicRange()
+        :   mfMinimum(START_MINIMUM_VALUE),
+            mfMaximum(START_MAXIMUM_VALUE)
+        {
+        }
+        BasicRange(double fStartValue)
+        :   mfMinimum(fStartValue),
+            mfMaximum(fStartValue)
+        {
+        }
+        BasicRange(const BasicRange& rRange)
+        :   mfMinimum(rRange.getMinimum()),
+            mfMaximum(rRange.getMaximum())
+        {
+        }
 
-            BasicRange()
-            :   mfMinimum(START_MINIMUM_VALUE),
-                mfMaximum(START_MAXIMUM_VALUE)
-            {
-            }
-            BasicRange(double fStartValue)
-            :   mfMinimum(fStartValue),
-                mfMaximum(fStartValue)
-            {
-            }
-            BasicRange(const BasicRange& rRange)
-            :   mfMinimum(rRange.getMinimum()),
-                mfMaximum(rRange.getMaximum())
+        void operator=(const BasicRange& rRange)
+        {
+            mfMinimum = rRange.getMinimum();
+            mfMaximum = rRange.getMaximum();
+        }
+
+        void expand(double fValue)
+        {
+            if(fValue < mfMinimum)
             {
+                mfMinimum = fValue;
             }
 
-            void operator=(const BasicRange& rRange)
+            if(fValue > mfMaximum)
             {
-                mfMinimum = rRange.getMinimum();
-                mfMaximum = rRange.getMaximum();
+                mfMaximum = fValue;
             }
+        }
 
-            void expand(double fValue)
+        void expand(const BasicRange& rRange)
+        {
+            if(rRange.getMinimum() < mfMinimum)
             {
-                if(fValue < mfMinimum)
-                {
-                    mfMinimum = fValue;
-                }
-
-                if(fValue > mfMaximum)
-                {
-                    mfMaximum = fValue;
-                }
+                mfMinimum = rRange.getMinimum();
             }
 
-            void expand(const BasicRange& rRange)
+            if(rRange.getMaximum() > mfMaximum)
             {
-                if(rRange.getMinimum() < mfMinimum)
-                {
-                    mfMinimum = rRange.getMinimum();
-                }
-
-                if(rRange.getMaximum() > mfMaximum)
-                {
-                    mfMaximum = rRange.getMaximum();
-                }
+                mfMaximum = rRange.getMaximum();
             }
-        };
-    } // end of namespace range
+        }
+    };
 } // end of namespace basegfx
 
 #endif _BGFX_RANGE_BASICRANGE_HXX