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.

1 files changed, 74 insertions, 77 deletions

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