includes were one inc too deep, correcting

33 files changed, 2811 insertions, 76 deletions

diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
new file mode 100644
index 000000000000..4d5617eff4a8
--- /dev/null
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dcubicbezier.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:08 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_CURVE_B2DCUBICBEZIER_HXX
+#define _BGFX_CURVE_B2DCUBICBEZIER_HXX
+
+#ifndef _BGFX_POINT_B2DPOINT_HXX
+#include <basegfx/point/b2dpoint.hxx>
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace curve
+    {
+        class B2DCubicBezier
+        {
+            point::B2DPoint                                 maStartPoint;
+            point::B2DPoint                                 maEndPoint;
+            point::B2DPoint                                 maControlPointA;
+            point::B2DPoint                                 maControlPointB;
+
+        public:
+            B2DCubicBezier();
+            B2DCubicBezier(const B2DCubicBezier& rBezier);
+            B2DCubicBezier(const point::B2DPoint& rStart, const point::B2DPoint& rEnd);
+            B2DCubicBezier(const point::B2DPoint& rStart, const point::B2DPoint& rControlPointA,
+                const point::B2DPoint& rControlPointB, const point::B2DPoint& rEnd);
+            ~B2DCubicBezier();
+
+            // assignment operator
+            B2DCubicBezier& operator=(const B2DCubicBezier& rBezier);
+
+            // compare operators
+            bool operator==(const B2DCubicBezier& rBezier) const;
+            bool operator!=(const B2DCubicBezier& rBezier) const;
+
+            // test if vectors are used
+            bool isBezier() const;
+
+            // test if contained bezier is trivial and reset vectors accordingly
+            void testAndSolveTrivialBezier();
+
+            // data interface
+            point::B2DPoint getStartPoint() const { return maStartPoint; }
+            void setStartPoint(const point::B2DPoint& rValue) { maStartPoint = rValue; }
+
+            point::B2DPoint getEndPoint() const { return maEndPoint; }
+            void setEndPoint(const point::B2DPoint& rValue) { maEndPoint = rValue; }
+
+            point::B2DPoint getControlPointA() const { return maControlPointA; }
+            void setControlPointA(const point::B2DPoint& rValue) { maControlPointA = rValue; }
+
+            point::B2DPoint getControlPointB() const { return maControlPointB; }
+            void setControlPointB(const point::B2DPoint& rValue) { maControlPointB = rValue; }
+        };
+    } // end of namespace curve
+} // end of namespace basegfx
+
+#endif //   _BGFX_CURVE_B2DCUBICBEZIER_HXX
diff --git a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
new file mode 100644
index 000000000000..6b7640bdd8b3
--- /dev/null
+++ b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dquadraticbezier.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:08 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
+#define _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
+
+#ifndef _BGFX_POINT_B2DPOINT_HXX
+#include <basegfx/point/b2dpoint.hxx>
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace curve
+    {
+        class B2DQuadraticBezier
+        {
+            point::B2DPoint                                 maStartPoint;
+            point::B2DPoint                                 maEndPoint;
+            point::B2DPoint                                 maControlPoint;
+
+        public:
+            B2DQuadraticBezier();
+            B2DQuadraticBezier(const B2DQuadraticBezier& rBezier);
+            B2DQuadraticBezier(const point::B2DPoint& rStart, const point::B2DPoint& rEnd);
+            B2DQuadraticBezier(const point::B2DPoint& rStart,
+                const point::B2DPoint& rControlPoint, const point::B2DPoint& rEnd);
+            ~B2DQuadraticBezier();
+
+            // assignment operator
+            B2DQuadraticBezier& operator=(const B2DQuadraticBezier& rBezier);
+
+            // compare operators
+            bool operator==(const B2DQuadraticBezier& rBezier) const;
+            bool operator!=(const B2DQuadraticBezier& rBezier) const;
+
+            // test if control point is placed on the edge
+            bool isBezier() const;
+
+            // data interface
+            point::B2DPoint getStartPoint() const { return maStartPoint; }
+            void setStartPoint(const point::B2DPoint& rValue) { maStartPoint = rValue; }
+
+            point::B2DPoint getEndPoint() const { return maEndPoint; }
+            void setEndPoint(const point::B2DPoint& rValue) { maEndPoint = rValue; }
+
+            point::B2DPoint getControlPoint() const { return maControlPoint; }
+            void setControlPoint(const point::B2DPoint& rValue) { maControlPoint = rValue; }
+        };
+    } // end of namespace curve
+} // end of namespace basegfx
+
+#endif //   _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
new file mode 100644
index 000000000000..b0e2d25cbd7f
--- /dev/null
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dhommatrix.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:30 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
+#define _BGFX_MATRIX_B2DHOMMATRIX_HXX
+
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
+#endif
+
+// predeclaration
+class Impl2DHomMatrix;
+
+namespace basegfx
+{
+    namespace tuple
+    {
+        // predeclaration
+        class B2DTuple;
+    } // end of namespace tuple
+
+    namespace matrix
+    {
+        class B2DHomMatrix
+        {
+        private:
+            Impl2DHomMatrix*                            mpM;
+
+            void implPrepareChange();
+
+        public:
+            B2DHomMatrix();
+            B2DHomMatrix(const B2DHomMatrix& rMat);
+            ~B2DHomMatrix();
+
+            double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
+            void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
+
+            // Auf Einheitsmatrix zuruecksetzen
+            bool isIdentity() const;
+            void identity();
+
+            // Invertierung
+            bool isInvertible() const;
+            bool invert();
+
+            // Normalisierung
+            bool isNormalized() const;
+            void normalize();
+
+            // Determinante
+            double determinant() const;
+
+            // Trace
+            double trace() const;
+
+            // Transpose
+            void transpose();
+
+            // Rotation
+            void rotate(double fRadiant);
+
+            // Translation
+            void translate(double fX, double fY);
+
+            // Skalierung
+            void scale(double fX, double fY);
+
+            // Shearing-Matrices
+            void shearX(double fSx);
+            void shearY(double fSy);
+
+            // Addition, Subtraktion
+            B2DHomMatrix& operator+=(const B2DHomMatrix& rMat);
+            B2DHomMatrix& operator-=(const B2DHomMatrix& rMat);
+
+            // Vergleichsoperatoren
+            bool operator==(const B2DHomMatrix& rMat) const;
+            bool operator!=(const B2DHomMatrix& rMat) const;
+
+            // Multiplikation, Division mit Konstante
+            B2DHomMatrix& operator*=(double fValue);
+            B2DHomMatrix& operator/=(double fValue);
+
+            // Matritzenmultiplikation von links auf die lokale
+            B2DHomMatrix& operator*=(const B2DHomMatrix& rMat);
+
+            // assignment operator
+            B2DHomMatrix& operator=(const B2DHomMatrix& rMat);
+
+            // Help routine to decompose given homogen 3x3 matrix to components. A correction of
+            // the components is done to avoid inaccuracies.
+            // Zerlegung
+            bool decompose(tuple::B2DTuple& rScale, tuple::B2DTuple& rTranslate, double& rRotate, double& rShearX) const;
+        };
+
+        // Addition, Subtraktion
+        inline B2DHomMatrix operator+(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+        {
+            B2DHomMatrix aSum(rMatA);
+            aSum += rMatB;
+            return aSum;
+        }
+
+        inline B2DHomMatrix operator-(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+        {
+            B2DHomMatrix aDiv(rMatA);
+            aDiv -= rMatB;
+            return aDiv;
+        }
+
+        // Multiplikation, Division mit Konstante
+        inline B2DHomMatrix operator*(const B2DHomMatrix& rMat, double fValue)
+        {
+            B2DHomMatrix aNew(rMat);
+            aNew *= fValue;
+            return aNew;
+        }
+
+        inline B2DHomMatrix operator/(const B2DHomMatrix& rMat, double fValue)
+        {
+            B2DHomMatrix aNew(rMat);
+            aNew *= 1.0 / fValue;
+            return aNew;
+        }
+
+        inline B2DHomMatrix operator*(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+        {
+            B2DHomMatrix aMul(rMatB);
+            aMul *= rMatA;
+            return aMul;
+        }
+    } // end of namespace matrix
+} // end of namespace basegfx
+
+#endif // _BGFX_MATRIX_B2DHOMMATRIX_HXX
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
new file mode 100644
index 000000000000..db024b816c40
--- /dev/null
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b3dhommatrix.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:30 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX
+#define _BGFX_MATRIX_B3DHOMMATRIX_HXX
+
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
+#endif
+
+// predeclaration
+class Impl3DHomMatrix;
+
+namespace basegfx
+{
+    namespace tuple
+    {
+        // predeclaration
+        class B3DTuple;
+    } // end of namespace tuple
+
+    namespace matrix
+    {
+        class B3DHomMatrix
+        {
+        private:
+            Impl3DHomMatrix*                            mpM;
+
+            void implPrepareChange();
+
+        public:
+            B3DHomMatrix();
+            B3DHomMatrix(const B3DHomMatrix& rMat);
+            ~B3DHomMatrix();
+
+            double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
+            void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
+
+            bool isIdentity() const;
+            /// Reset to the identity matrix
+            void identity();
+
+            bool isInvertible() const;
+            /// Invert the matrix (if possible)
+            bool invert();
+
+            bool isNormalized() const;
+            /// Normalize (i.e. force w=1) the matrix
+            void normalize();
+
+            /// Calc the matrix determinant
+            double determinant() const;
+
+            /// Calc the matrix trace
+            double trace() const;
+
+            /// Transpose the matrix
+            void transpose();
+
+            /// Rotation
+            void rotate(double fAngleX,double fAngleY,double fAngleZ);
+
+            /// Translation
+            void translate(double fX, double fY, double fZ);
+
+            /// Scaling
+            void scale(double fX, double fY, double fZ);
+
+            // Shearing-Matrices
+            void shearXY(double fSx, double fSy);
+            void shearYZ(double fSy, double fSz);
+            void shearXZ(double fSx, double fSz);
+
+            // Projection matrices, used for converting between eye and
+            // clip coordinates
+            void frustum(double fLeft = -1.0, double fRight = 1.0,
+                double fBottom = -1.0, double fTop = 1.0,
+                double fNear = 0.001, double fFar = 1.0);
+
+            void ortho(double fLeft = -1.0, double fRight = 1.0,
+                double fBottom = -1.0, double fTop = 1.0,
+                double fNear = 0.0, double fFar = 1.0);
+
+            // addition, subtraction
+            B3DHomMatrix& operator+=(const B3DHomMatrix& rMat);
+            B3DHomMatrix& operator-=(const B3DHomMatrix& rMat);
+
+            // comparison
+            bool operator==(const B3DHomMatrix& rMat) const;
+            bool operator!=(const B3DHomMatrix& rMat) const;
+
+            // multiplication, division by constant value
+            B3DHomMatrix& operator*=(double fValue);
+            B3DHomMatrix& operator/=(double fValue);
+
+            // matrix multiplication (from the left)
+            B3DHomMatrix& operator*=(const B3DHomMatrix& rMat);
+
+            // assignment operator
+            B3DHomMatrix& operator=(const B3DHomMatrix& rMat);
+
+            // decomposition
+            bool decompose(tuple::B3DTuple& rScale, tuple::B3DTuple& rTranslate, tuple::B3DTuple& rRotate, tuple::B3DTuple& rShear) const;
+        };
+
+        // addition, subtraction
+        inline B3DHomMatrix operator+(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+        {
+            B3DHomMatrix aSum(rMatA);
+            aSum += rMatB;
+            return aSum;
+        }
+
+        inline B3DHomMatrix operator-(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+        {
+            B3DHomMatrix aDiv(rMatA);
+            aDiv -= rMatB;
+            return aDiv;
+        }
+
+        // multiplication, division by constant value
+        inline B3DHomMatrix operator*(const B3DHomMatrix& rMat, double fValue)
+        {
+            B3DHomMatrix aNew(rMat);
+            aNew *= fValue;
+            return aNew;
+        }
+
+        inline B3DHomMatrix operator/(const B3DHomMatrix& rMat, double fValue)
+        {
+            B3DHomMatrix aNew(rMat);
+            aNew *= 1.0 / fValue;
+            return aNew;
+        }
+
+        inline B3DHomMatrix operator*(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+        {
+            B3DHomMatrix aMul(rMatB);
+            aMul *= rMatA;
+            return aMul;
+        }
+    } // end of namespace matrix
+} // end of namespace basegfx
+
+#endif // _BGFX_MATRIX_B3DHOMMATRIX_HXX
diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx
new file mode 100644
index 000000000000..723fff6e4aab
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx
@@ -0,0 +1,276 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dhompoint.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:48 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B2DHOMPOINT_HXX
+#define _BGFX_POINT_B2DHOMPOINT_HXX
+
+#ifndef _BGFX_POINT_B2DPOINT_HXX
+#include <basegfx/point/b2dpoint.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace point
+    {
+        /** Basic homogen Point class with two double values and one homogen factor
+
+            This class provides access to homogen coordinates in 2D.
+            For this purpose all the operators which need to do specific
+            action due to their homogenity are implemented here.
+            The only caveat are member methods which are declared as const
+            but do change the content. These are documented for that reason.
+            The class is designed to provide homogenous coordinates without
+            direct access to the homogen part (mfW). This is also the reason
+            for leaving out the [] operators which return references to members.
+
+            @see B2DTuple
+        */
+        class B2DHomPoint
+        {
+        protected:
+            /// This member contains the coordinate part of the point
+            tuple::B2DTuple                             maTuple;
+
+            /// This Member holds the homogenous part of the point
+            double                                      mfW;
+
+            /** Test if this homogen point does have a homogenous part
+
+                @return Returns true if this point has no homogenous part
+            */
+            bool implIsHomogenized() const;
+
+            /** Remove homogenous part of this Point
+
+                This method does necessary calculations to remove
+                the evtl. homogenous part of this Point. This may
+                change all members.
+            */
+            void implHomogenize();
+
+            /** Test and on demand remove homogenous part
+
+                This method tests if this Point does have a homogenous part
+                and then evtl. takes actions to remove that part.
+
+                @attention Even when this method is const it may change all
+                members of this instance. This is due to the fact that changing
+                the homogenous part of a homogenous point does from a mathematical
+                point of view not change the point at all.
+            */
+            void implTestAndHomogenize() const;
+
+        public:
+            /** Create a homogen point
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the Point. The homogenous part is initialized to 1.0.
+            */
+            B2DHomPoint(double fVal = 0.0)
+            :   maTuple(fVal),
+                mfW(1.0)
+            {}
+
+            /** Create a homogen point
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the Point. The homogenous part is initialized to 1.0.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the Point. The homogenous part is initialized to 1.0.
+            */
+            B2DHomPoint(double fX, double fY)
+            :   maTuple(fX, fY),
+                mfW(1.0)
+            {}
+
+            /** Create a copy of a 2D Point
+
+                @param rVec
+                The 2D point which will be copied. The homogenous part
+                is initialized to 1.0.
+            */
+            B2DHomPoint(const B2DPoint& rVec)
+            :   maTuple(rVec),
+                mfW(1.0)
+            {}
+
+            /** Create a copy of a homogen point
+
+                @param rVec
+                The homogen point which will be copied. The homogenous part
+                is copied, too.
+            */
+            B2DHomPoint(const B2DHomPoint& rVec)
+            :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY()),
+                mfW(rVec.mfW)
+            {}
+
+            ~B2DHomPoint()
+            {}
+
+            /** Get a 2D point from this homogenous point
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding 2D point for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            B2DPoint getB2DPoint() const;
+
+            /** Get X-coordinate
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding X-coordinate for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            double getX() const;
+
+            /** Get Y-coordinate
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding Y-coordinate for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            double getY() const;
+
+            /** Set X-coordinate of the homogen point.
+
+                This method sets the X-coordinate of the homogen point. If
+                the point does have a homogenous part this is taken into account.
+
+                @param fX
+                The to-be-set X-coordinate without homogenous part.
+            */
+            void setX(double fX);
+
+            /** Set Y-coordinate of the homogen point.
+
+                This method sets the Y-coordinate of the homogen point. If
+                the point does have a homogenous part this is taken into account.
+
+                @param fY
+                The to-be-set Y-coordinate without homogenous part.
+            */
+            void setY(double fY);
+
+            // operators
+            //////////////////////////////////////////////////////////////////////
+
+            B2DHomPoint& operator+=( const B2DHomPoint& rPnt );
+
+            B2DHomPoint& operator-=( const B2DHomPoint& rPnt );
+
+            B2DHomPoint& operator*=(double t);
+
+            B2DHomPoint& operator*=( const matrix::B2DHomMatrix& rMat );
+
+            B2DHomPoint& operator/=(double t);
+
+            B2DHomPoint& operator-(void);
+
+            bool operator==( const B2DHomPoint& rPnt ) const;
+
+            bool operator!=( const B2DHomPoint& rPnt ) const;
+
+            B2DHomPoint& operator=( const B2DHomPoint& rPnt );
+        };
+
+        // external operators
+        //////////////////////////////////////////////////////////////////////////
+
+        B2DHomPoint min(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+        B2DHomPoint max(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+        B2DHomPoint abs(const B2DHomPoint& rVec);
+
+        B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t);
+
+        B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2);
+
+        B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3);
+
+        B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+        B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+        B2DHomPoint operator*(const B2DHomPoint& rVec, double t);
+
+        B2DHomPoint operator*(double t, const B2DHomPoint& rVec);
+
+        B2DHomPoint operator*( const matrix::B2DHomMatrix& rMat, const B2DHomPoint& rPoint );
+
+        B2DHomPoint operator/(const B2DHomPoint& rVec, double t);
+
+        B2DHomPoint operator/(double t, const B2DHomPoint& rVec);
+    } // end of namespace point
+} // end of namespace basegfx
+
+#endif // _BGFX_POINT_B2DHOMPOINT_HXX
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
new file mode 100644
index 000000000000..723e734abce9
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b2dpoint.hxx
@@ -0,0 +1,153 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dpoint.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:49 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B2DPOINT_HXX
+#define _BGFX_POINT_B2DPOINT_HXX
+
+#ifndef _BGFX_TUPLE_B2DTUPLE_HXX
+#include <basegfx/tuple/b2dtuple.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace matrix
+    {
+        // predeclaration
+        class B2DHomMatrix;
+    } // end of namespace matrix;
+
+    namespace point
+    {
+        /** Base Point class with two double values
+
+            This class derives all operators and common handling for
+            a 2D data class from B2DTuple. All necessary extensions
+            which are special for points will be added here.
+
+            @see B2DTuple
+        */
+        class B2DPoint : public tuple::B2DTuple
+        {
+        public:
+            /** Create a 2D Point
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the 2D Point.
+            */
+            B2DPoint(double fVal = 0.0)
+            :   B2DTuple(fVal)
+            {}
+
+            /** Create a 2D Point
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the 2D Point.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the 2D Point.
+            */
+            B2DPoint(double fX, double fY)
+            :   B2DTuple(fX, fY)
+            {}
+
+            /** Create a copy of a 2D Point
+
+                @param rPoint
+                The 2D Point which will be copied.
+            */
+            B2DPoint(const B2DPoint& rPoint)
+            :   B2DTuple(rPoint)
+            {}
+
+            /** constructor with tuple to allow copy-constructing
+                from B2DTuple-based classes
+            */
+            B2DPoint(const B2DTuple& rTuple)
+            :   B2DTuple(rTuple)
+            {}
+
+            ~B2DPoint()
+            {}
+
+            /** assignment operator to allow assigning the results
+                of B2DTuple calculations
+            */
+            B2DPoint& operator=( const B2DTuple& rPoint );
+
+            /** Transform point by given transformation matrix.
+
+                The translational components of the matrix are, in
+                contrast to B2DVector, applied.
+            */
+            B2DPoint& operator*=( const matrix::B2DHomMatrix& rMat );
+
+            static const B2DPoint& getEmptyPoint()
+            {
+                return (const B2DPoint&) tuple::B2DTuple::getEmptyTuple();
+            }
+        };
+    } // end of namespace point
+} // end of namespace basegfx
+
+#endif //  _BGFX_POINT_B2DPOINT_HXX
diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
new file mode 100644
index 000000000000..881a9de2f0fb
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b3dhompoint.hxx
@@ -0,0 +1,446 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b3dhompoint.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:49 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B3DHOMPOINT_HXX
+#define _BGFX_POINT_B3DHOMPOINT_HXX
+
+#ifndef _BGFX_POINT_B3DPOINT_HXX
+#include <basegfx/point/b3dpoint.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace point
+    {
+        /** Basic homogen Point class with three double values and one homogen factor
+
+            This class provides access to homogen coordinates in 3D.
+            For this purpose all the operators which need to do specific
+            action due to their homogenity are implemented here.
+            The only caveat are member methods which are declared as const
+            but do change the content. These are documented for that reason.
+            The class is designed to provide homogenous coordinates without
+            direct access to the homogen part (mfW). This is also the reason
+            for leaving out the [] operators which return references to members.
+
+            @see B3DTuple
+        */
+        class B3DHomPoint
+        {
+        protected:
+            /// This member contains the coordinate part of the point
+            tuple::B3DTuple                             maTuple;
+
+            /// This Member holds the homogenous part of the point
+            double                                      mfW;
+
+            /** Test if this homogen point does have a homogenous part
+
+                @return Returns true if this point has no homogenous part
+            */
+            bool implIsHomogenized() const
+            {
+                const double fOne(1.0);
+                return ::basegfx::numeric::fTools::equal(mfW, fOne);
+            }
+
+            /** Remove homogenous part of this Point
+
+                This method does necessary calculations to remove
+                the evtl. homogenous part of this Point. This may
+                change all members.
+            */
+            void implHomogenize();
+
+            /** Test and on demand remove homogenous part
+
+                This method tests if this Point does have a homogenous part
+                and then evtl. takes actions to remove that part.
+
+                @attention Even when this method is const it may change all
+                members of this instance. This is due to the fact that changing
+                the homogenous part of a homogenous point does from a mathematical
+                point of view not change the point at all.
+            */
+            void implTestAndHomogenize() const
+            {
+                if(!implIsHomogenized())
+                    ((B3DHomPoint*)this)->implHomogenize();
+            }
+
+        public:
+            /** Create a homogen point
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the Point. The homogenous part is initialized to 1.0.
+            */
+            B3DHomPoint(double fVal = 0.0)
+            :   maTuple(fVal),
+                mfW(1.0)
+            {}
+
+            /** Create a homogen point
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the Point. The homogenous part is initialized to 1.0.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the Point. The homogenous part is initialized to 1.0.
+
+                @param fZ
+                This parameter is used to initialize the Z-coordinate
+                of the Point. The homogenous part is initialized to 1.0.
+            */
+            B3DHomPoint(double fX, double fY, double fZ)
+            :   maTuple(fX, fY, fZ),
+                mfW(1.0)
+            {}
+
+            /** Create a copy of a 3D Point
+
+                @param rVec
+                The 3D point which will be copied. The homogenous part
+                is initialized to 1.0.
+            */
+            B3DHomPoint(const B3DPoint& rVec)
+            :   maTuple(rVec),
+                mfW(1.0)
+            {}
+
+            /** Create a copy of a homogen point
+
+                @param rVec
+                The homogen point which will be copied. The homogenous part
+                is copied, too.
+            */
+            B3DHomPoint(const B3DHomPoint& rVec)
+            :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY(), rVec.maTuple.getZ()),
+                mfW(rVec.mfW)
+            {}
+
+            ~B3DHomPoint()
+            {}
+
+            /** get a 3D point from this homogenous point
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding 3D point for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            B3DPoint getB3DPoint() const
+            {
+                implTestAndHomogenize();
+                return B3DPoint(maTuple.getX(), maTuple.getY(), maTuple.getZ());
+            }
+
+            /** get X-coordinate
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding X-coordinate for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            double getX() const
+            {
+                implTestAndHomogenize();
+                return maTuple.getX();
+            }
+
+            /** get Y-coordinate
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding Y-coordinate for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            double getY() const
+            {
+                implTestAndHomogenize();
+                return maTuple.getY();
+            }
+
+            /** get Z-coordinate
+
+                This method normalizes this homogen point if necessary and
+                returns the corresponding Z-coordinate for this homogen point.
+
+                @attention Even when this method is const it may change all
+                members of this instance.
+            */
+            double getZ() const
+            {
+                implTestAndHomogenize();
+                return maTuple.getY();
+            }
+
+            /** Set X-coordinate of the homogen point.
+
+                This method sets the X-coordinate of the homogen point. If
+                the point does have a homogenous part this is taken into account.
+
+                @param fX
+                The to-be-set X-coordinate without homogenous part.
+            */
+            void setX(double fX)
+            {
+                maTuple.setX(implIsHomogenized() ? fX : fX * mfW );
+            }
+
+            /** Set Y-coordinate of the homogen point.
+
+                This method sets the Y-coordinate of the homogen point. If
+                the point does have a homogenous part this is taken into account.
+
+                @param fY
+                The to-be-set Y-coordinate without homogenous part.
+            */
+            void setY(double fY)
+            {
+                maTuple.setY(implIsHomogenized() ? fY : fY * mfW );
+            }
+
+            /** Set Z-coordinate of the homogen point.
+
+                This method sets the Z-coordinate of the homogen point. If
+                the point does have a homogenous part this is taken into account.
+
+                @param fZ
+                The to-be-set Z-coordinate without homogenous part.
+            */
+            void setZ(double fZ)
+            {
+                maTuple.setZ(implIsHomogenized() ? fZ : fZ * mfW );
+            }
+
+            // operators
+            //////////////////////////////////////////////////////////////////////
+
+            B3DHomPoint& operator+=( const B3DHomPoint& rPnt )
+            {
+                maTuple.setX(getX() * rPnt.mfW + rPnt.getX() * mfW);
+                maTuple.setY(getY() * rPnt.mfW + rPnt.getY() * mfW);
+                maTuple.setZ(getZ() * rPnt.mfW + rPnt.getZ() * mfW);
+                mfW = mfW * rPnt.mfW;
+
+                return *this;
+            }
+
+            B3DHomPoint& operator-=( const B3DHomPoint& rPnt )
+            {
+                maTuple.setX(getX() * rPnt.mfW - rPnt.getX() * mfW);
+                maTuple.setY(getY() * rPnt.mfW - rPnt.getY() * mfW);
+                maTuple.setZ(getZ() * rPnt.mfW - rPnt.getZ() * mfW);
+                mfW = mfW * rPnt.mfW;
+
+                return *this;
+            }
+
+            B3DHomPoint& operator*=(double t)
+            {
+                if(!::basegfx::numeric::fTools::equalZero(t))
+                {
+                    mfW /= t;
+                }
+
+                return *this;
+            }
+
+            B3DHomPoint& operator/=(double t)
+            {
+                mfW *= t;
+                return *this;
+            }
+
+            B3DHomPoint& operator-(void)
+            {
+                mfW = -mfW;
+                return *this;
+            }
+
+            bool operator==( const B3DHomPoint& rPnt ) const
+            {
+                implTestAndHomogenize();
+                return (maTuple == rPnt.maTuple);
+            }
+
+            bool operator!=( const B3DHomPoint& rPnt ) const
+            {
+                implTestAndHomogenize();
+                return (maTuple != rPnt.maTuple);
+            }
+
+            B3DHomPoint& operator=( const B3DHomPoint& rPnt )
+            {
+                maTuple = rPnt.maTuple;
+                mfW = rPnt.mfW;
+                return *this;
+            }
+        };
+
+        // external operators
+        //////////////////////////////////////////////////////////////////////////
+
+        inline B3DHomPoint min(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+        {
+            B3DHomPoint aMin(
+                (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+                (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
+                (rVecB.getZ() < rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+            return aMin;
+        }
+
+        inline B3DHomPoint max(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+        {
+            B3DHomPoint aMax(
+                (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+                (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
+                (rVecB.getZ() > rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+            return aMax;
+        }
+
+        inline B3DHomPoint abs(const B3DHomPoint& rVec)
+        {
+            B3DHomPoint aAbs(
+                (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),
+                (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY(),
+                (0.0 > rVec.getZ()) ? -rVec.getZ() : rVec.getZ());
+            return aAbs;
+        }
+
+        inline B3DHomPoint interpolate(B3DHomPoint& rOld1, B3DHomPoint& rOld2, double t)
+        {
+            B3DHomPoint aInt(
+                ((rOld2.getX() - rOld1.getX()) + t) + rOld1.getX(),
+                ((rOld2.getY() - rOld1.getY()) + t) + rOld1.getY(),
+                ((rOld2.getZ() - rOld1.getZ()) + t) + rOld1.getZ());
+            return aInt;
+        }
+
+        inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2)
+        {
+            B3DHomPoint aAvg(
+                (rOld1.getX() + rOld2.getX()) * 0.5,
+                (rOld1.getY() + rOld2.getY()) * 0.5,
+                (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            return aAvg;
+        }
+
+        inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2, B3DHomPoint& rOld3)
+        {
+            B3DHomPoint aAvg(
+                (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+                (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
+                (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+            return aAvg;
+        }
+
+        inline B3DHomPoint operator+(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+        {
+            B3DHomPoint aSum(rVecA);
+            aSum += rVecB;
+            return aSum;
+        }
+
+        inline B3DHomPoint operator-(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+        {
+            B3DHomPoint aSub(rVecA);
+            aSub -= rVecB;
+            return aSub;
+        }
+
+        inline B3DHomPoint operator*(const B3DHomPoint& rVec, double t)
+        {
+            B3DHomPoint aNew(rVec);
+            aNew *= t;
+            return aNew;
+        }
+
+        inline B3DHomPoint operator*(double t, const B3DHomPoint& rVec)
+        {
+            B3DHomPoint aNew(rVec);
+            aNew *= t;
+            return aNew;
+        }
+
+        inline B3DHomPoint operator/(const B3DHomPoint& rVec, double t)
+        {
+            B3DHomPoint aNew(rVec);
+            aNew /= t;
+            return aNew;
+        }
+
+        inline B3DHomPoint operator/(double t, const B3DHomPoint& rVec)
+        {
+            B3DHomPoint aNew(rVec);
+            aNew /= t;
+            return aNew;
+        }
+    } // end of namespace point
+} // end of namespace basegfx
+
+#endif // _BGFX_POINT_B3DHOMPOINT_HXX
diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/basegfx/inc/basegfx/point/b3dpoint.hxx
new file mode 100644
index 000000000000..d142b0bfe726
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b3dpoint.hxx
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b3dpoint.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:12:50 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B3DPOINT_HXX
+#define _BGFX_POINT_B3DPOINT_HXX
+
+#ifndef _BGFX_TUPLE_B3DTUPLE_HXX
+#include <basegfx/tuple/b3dtuple.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace point
+    {
+        /** Base Point class with three double values
+
+            This class derives all operators and common handling for
+            a 3D data class from B3DTuple. All necessary extensions
+            which are special for points will be added here.
+
+            @see B3DTuple
+        */
+        class B3DPoint : public tuple::B3DTuple
+        {
+        public:
+            /** Create a 3D Point
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the 3D Point.
+            */
+            B3DPoint(double fVal = 0.0)
+            :   B3DTuple(fVal)
+            {}
+
+            /** Create a 3D Point
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the 3D Point.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the 3D Point.
+
+                @param fZ
+                This parameter is used to initialize the Z-coordinate
+                of the 3D Point.
+            */
+            B3DPoint(double fX, double fY, double fZ)
+            :   B3DTuple(fX, fY, fZ)
+            {}
+
+            /** Create a copy of a 3D Point
+
+                @param rVec
+                The 3D Point which will be copied.
+            */
+            B3DPoint(const B3DPoint& rVec)
+            :   B3DTuple(rVec)
+            {}
+
+            /** constructor with tuple to allow copy-constructing
+                from B3DTuple-based classes
+            */
+            B3DPoint(const B3DTuple& rTuple)
+            :   B3DTuple(rTuple)
+            {}
+
+            ~B3DPoint()
+            {}
+
+            /** assignment operator to allow assigning the results
+                of B3DTuple calculations
+            */
+            B3DPoint& operator=( const B3DTuple& rVec )
+            {
+                mfX = rVec.getX();
+                mfY = rVec.getY();
+                mfZ = rVec.getZ();
+                return *this;
+            }
+
+            static const B3DPoint& getEmptyPoint()
+            {
+                return (const B3DPoint&) tuple::B3DTuple::getEmptyTuple();
+            }
+        };
+    } // end of namespace point
+} // end of namespace basegfx
+
+#endif //  _BGFX_POINT_B3DPOINT_HXX
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
new file mode 100644
index 000000000000..3e9094585a37
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b1drange.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:08 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B1DRANGE_HXX
+#define _BGFX_RANGE_B1DRANGE_HXX
+
+#ifndef _BDRANGE_HXX
+#include <BDRange.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace range
+    {
+        class B1DRange
+        {
+            BDRange                                 maRange;
+
+        public:
+            B1DRange()
+            {
+            }
+
+            B1DRange(double fStartValue)
+            :   maRange(fStartValue)
+            {
+            }
+
+            B1DRange(const B1DRange& rRange)
+            :   maRange(rRange.maRange)
+            {
+            }
+
+            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();
+            }
+
+            bool isInside(double fValue) const
+            {
+                return maRange.isInside(fValue);
+            }
+
+            bool isInside(const B1DRange& rRange) const
+            {
+                return maRange.isInside(rRange.maRange);
+            }
+
+            void expand(double fValue)
+            {
+                maRange.expand(fValue);
+            }
+
+            void expand(const B1DRange& rRange)
+            {
+                maRange.expand(rRange.maRange);
+            }
+        };
+    } // end of namespace range
+} // 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
new file mode 100644
index 000000000000..0a166a3a87ec
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2drange.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:08 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DRANGE_HXX
+#define _BGFX_RANGE_B2DRANGE_HXX
+
+#ifndef _BGFX_TUPLE_B2DTUPLE_HXX
+#include <basegfx/tuple/b2dtuple.hxx>
+#endif
+
+#ifndef _BDRANGE_HXX
+#include <BDRange.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace range
+    {
+        class B2DRange
+        {
+            BDRange                                 maRangeX;
+            BDRange                                 maRangeY;
+
+        public:
+            B2DRange()
+            {
+            }
+
+            B2DRange(const tuple::B2DTuple& rTuple)
+            :   maRangeX(rTuple.getX()),
+                maRangeY(rTuple.getY())
+            {
+            }
+
+            B2DRange(const B2DRange& rRange)
+            :   maRangeX(rRange.maRangeX),
+                maRangeY(rRange.maRangeY)
+            {
+            }
+
+            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()
+                    );
+            }
+
+            bool isInside(const tuple::B2DTuple& rTuple) const
+            {
+                return (
+                    maRangeX.isInside(rTuple.getX())
+                    && maRangeY.isInside(rTuple.getY())
+                    );
+            }
+
+            bool isInside(const B2DRange& rRange) const
+            {
+                return (
+                    maRangeX.isInside(rRange.maRangeX)
+                    && maRangeY.isInside(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
+} // 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
new file mode 100644
index 000000000000..0f9f114e8ec6
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3drange.hxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b3drange.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:09 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3DRANGE_HXX
+#define _BGFX_RANGE_B3DRANGE_HXX
+
+#ifndef _BGFX_TUPLE_B3DTUPLE_HXX
+#include <basegfx/tuple/b3dtuple.hxx>
+#endif
+
+#ifndef _BDRANGE_HXX
+#include <BDRange.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace range
+    {
+        class B3DRange
+        {
+            BDRange                                 maRangeX;
+            BDRange                                 maRangeY;
+            BDRange                                 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)
+            {
+            }
+
+            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()
+                    );
+            }
+
+            bool isInside(const tuple::B3DTuple& rTuple) const
+            {
+                return (
+                    maRangeX.isInside(rTuple.getX())
+                    && maRangeY.isInside(rTuple.getY())
+                    && maRangeZ.isInside(rTuple.getZ())
+                    );
+            }
+
+            bool isInside(const B3DRange& rRange) const
+            {
+                return (
+                    maRangeX.isInside(rRange.maRangeX)
+                    && maRangeY.isInside(rRange.maRangeY)
+                    && maRangeZ.isInside(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
+} // end of namespace basegfx
+
+#endif //  _BGFX_RANGE_B3DRANGE_HXX
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
new file mode 100644
index 000000000000..cd7a2e2f5309
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2dvector.hxx
@@ -0,0 +1,250 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b2dvector.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:25 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2DVECTOR_HXX
+#define _BGFX_VECTOR_B2DVECTOR_HXX
+
+#ifndef _BGFX_TUPLE_B2DTUPLE_HXX
+#include <basegfx/tuple/b2dtuple.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace matrix
+    {
+        // predeclaration
+        class B2DHomMatrix;
+    } // end of namespace matrix;
+
+    namespace vector
+    {
+        /** Base Point class with two double values
+
+            This class derives all operators and common handling for
+            a 2D data class from B2DTuple. All necessary extensions
+            which are special for 2D Vectors are added here.
+
+            @see B2DTuple
+        */
+        class B2DVector : public tuple::B2DTuple
+        {
+        public:
+            /** Descriptor for the mathematical orientations of two 2D Vectors
+            */
+            enum B2DVectorOrientation
+            {
+                /// mathematically positive oriented
+                POSITIVE = 0,
+
+                /// mathematically negative oriented
+                NEGATIVE,
+
+                /// mathematically neutral, thus parallel
+                NEUTRAL
+            };
+
+            /** Create a 2D Vector
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the 2D Vector.
+            */
+            B2DVector(double fVal = 0.0)
+            :   B2DTuple(fVal)
+            {}
+
+            /** Create a 2D Vector
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the 2D Vector.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the 2D Vector.
+            */
+            B2DVector(double fX, double fY)
+            :   B2DTuple(fX, fY)
+            {}
+
+            /** Create a copy of a 2D Vector
+
+                @param rVec
+                The 2D Vector which will be copied.
+            */
+            B2DVector(const B2DVector& rVec)
+            :   B2DTuple(rVec)
+            {}
+
+            /** constructor with tuple to allow copy-constructing
+                from B2DTuple-based classes
+            */
+            B2DVector(const B2DTuple& rTuple)
+            :   B2DTuple(rTuple)
+            {}
+
+            ~B2DVector()
+            {}
+
+            /** assignment operator to allow assigning the results
+                of B2DTuple calculations
+            */
+            B2DVector& operator=( const B2DTuple& rVec );
+
+            /** Calculate the length of this 2D Vector
+
+                @return The Length of the 2D Vector
+            */
+            double getLength() const;
+
+            /** Set the length of this 2D Vector
+
+                @param fLen
+                The to be achieved length of the 2D Vector
+            */
+            B2DVector& setLength(double fLen);
+
+            /** Normalize this 2D Vector
+
+                The length of the 2D Vector is set to 1.0
+            */
+            B2DVector& normalize();
+
+            /** Test if this 2D Vector is normalized
+
+                @return
+                true if lenth of vector is equal to 1.0
+                false else
+            */
+            bool isNormalized() const;
+
+            /** Calculate the Scalar with another 2D Vector
+
+                @param rVec
+                The second 2D Vector
+
+                @return
+                The Scalar value of the two involved 2D Vectors
+            */
+            double scalar( const B2DVector& rVec ) const;
+
+            /** Transform vector by given transformation matrix.
+
+                Since this is a vector, translational components of the
+                matrix are disregarded.
+            */
+            B2DVector& operator*=( const matrix::B2DHomMatrix& rMat );
+
+            static const B2DVector& getEmptyVector();
+        };
+
+        // external operators
+        //////////////////////////////////////////////////////////////////////////
+
+        /** Calculate the orientation to another 2D Vector
+
+            @param rVecA
+            The first 2D Vector
+
+            @param rVecB
+            The second 2D Vector
+
+            @return
+            The mathematical Orientation of the two involved 2D Vectors
+        */
+        B2DVector::B2DVectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB );
+
+        /** Calculate a perpendicular 2D Vector to the given one
+
+            @param rVec
+            The source 2D Vector
+
+            @attention This only works if the given 2D Vector is normalized.
+
+            @return
+            A 2D Vector perpendicular to the one given in parameter rVec
+        */
+        B2DVector getPerpendicular( const B2DVector& rNormalizedVec );
+
+        /** Test two vectors which need not to be normalized for parallelism
+
+            @param rVecA
+            The first 2D Vector
+
+            @param rVecB
+            The second 2D Vector
+
+            @return
+            bool if the two values are parallel. Also true if
+            one of the vectors is empty.
+        */
+        bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB );
+
+        /** Transform vector by given transformation matrix.
+
+            Since this is a vector, translational components of the
+            matrix are disregarded.
+        */
+        B2DVector operator*( const matrix::B2DHomMatrix& rMat, const B2DVector& rVec );
+    } // end of namespace vector
+} // end of namespace basegfx
+
+#endif //  _BGFX_VECTOR_B2DVECTOR_HXX
diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx
new file mode 100644
index 000000000000..9e8629f1bbfc
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b3dvector.hxx
@@ -0,0 +1,326 @@
+/*************************************************************************
+ *
+ *  $RCSfile: b3dvector.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:26 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B3DVECTOR_HXX
+#define _BGFX_VECTOR_B3DVECTOR_HXX
+
+#ifndef _BGFX_TUPLE_B3DTUPLE_HXX
+#include <basegfx/tuple/b3dtuple.hxx>
+#endif
+
+namespace basegfx
+{
+    namespace vector
+    {
+        /** Base Point class with three double values
+
+            This class derives all operators and common handling for
+            a 3D data class from B3DTuple. All necessary extensions
+            which are special for 3D Vectors are added here.
+
+            @see B3DTuple
+        */
+        class B3DVector : public tuple::B3DTuple
+        {
+        public:
+            /** Create a 3D Vector
+
+                @param fVal
+                This parameter is used to initialize the coordinate
+                part of the 3D Vector.
+            */
+            B3DVector(double fVal = 0.0)
+            :   B3DTuple(fVal)
+            {}
+
+            /** Create a 3D Vector
+
+                @param fX
+                This parameter is used to initialize the X-coordinate
+                of the 3D Vector.
+
+                @param fY
+                This parameter is used to initialize the Y-coordinate
+                of the 3D Vector.
+
+                @param fZ
+                This parameter is used to initialize the Z-coordinate
+                of the 3D Vector.
+            */
+            B3DVector(double fX, double fY, double fZ)
+            :   B3DTuple(fX, fY, fZ)
+            {}
+
+            /** Create a copy of a 3D Vector
+
+                @param rVec
+                The 3D Vector which will be copied.
+            */
+            B3DVector(const B3DVector& rVec)
+            :   B3DTuple(rVec)
+            {}
+
+            /** constructor with tuple to allow copy-constructing
+                from B3DTuple-based classes
+            */
+            B3DVector(const B3DTuple& rTuple)
+            :   B3DTuple(rTuple)
+            {}
+
+            ~B3DVector()
+            {}
+
+            /** assignment operator to allow assigning the results
+                of B3DTuple calculations
+            */
+            B3DVector& operator=( const B3DTuple& rVec )
+            {
+                mfX = rVec.getX();
+                mfY = rVec.getY();
+                mfZ = rVec.getZ();
+                return *this;
+            }
+
+            /** Calculate the length of this 3D Vector
+
+                @return The Length of the 3D Vector
+            */
+            double getLength(void) const
+            {
+                double fLen(scalar(*this));
+                if((0.0 == fLen) || (1.0 == fLen))
+                    return fLen;
+                return sqrt(fLen);
+            }
+
+            /** Calculate the length in the XY-Plane for this 3D Vector
+
+                @return The XY-Plane Length of the 3D Vector
+            */
+            double getXYLength(void) const
+            {
+                double fLen((mfX * mfX) + (mfY * mfY));
+                if((0.0 == fLen) || (1.0 == fLen))
+                    return fLen;
+                return sqrt(fLen);
+            }
+
+            /** Calculate the length in the XZ-Plane for this 3D Vector
+
+                @return The XZ-Plane Length of the 3D Vector
+            */
+            double getXZLength(void) const
+            {
+                double fLen((mfX * mfZ) + (mfY * mfZ));
+                if((0.0 == fLen) || (1.0 == fLen))
+                    return fLen;
+                return sqrt(fLen);
+            }
+
+            /** Calculate the length in the YZ-Plane for this 3D Vector
+
+                @return The YZ-Plane Length of the 3D Vector
+            */
+            double getYZLength(void) const
+            {
+                double fLen((mfY * mfY) + (mfZ * mfZ));
+                if((0.0 == fLen) || (1.0 == fLen))
+                    return fLen;
+                return sqrt(fLen);
+            }
+
+            /** Set the length of this 3D Vector
+
+                @param fLen
+                The to be achieved length of the 3D Vector
+            */
+            B3DVector& setLength(double fLen)
+            {
+                double fLenNow(scalar(*this));
+
+                if(!::basegfx::numeric::fTools::equalZero(fLenNow))
+                {
+                    const double fOne(1.0);
+
+                    if(!::basegfx::numeric::fTools::equal(fOne, fLenNow))
+                    {
+                        fLen /= sqrt(fLenNow);
+                    }
+
+                    mfX *= fLen;
+                    mfY *= fLen;
+                    mfZ *= fLen;
+                }
+
+                return *this;
+            }
+
+            /** Normalize this 3D Vector
+
+                The length of the 3D Vector is set to 1.0
+            */
+            B3DVector& normalize();
+
+            /** Test if this 3D Vector is normalized
+
+                @return
+                true if lenth of vector is equal to 1.0
+                false else
+            */
+            bool isNormalized() const
+            {
+                const double fOne(1.0);
+                const double fScalar(scalar(*this));
+
+                return (::basegfx::numeric::fTools::equal(fOne, fScalar));
+            }
+
+            /** get a 3D Vector which is perpendicular to this and a given 3D Vector
+
+                @attention This only works if this and the given 3D Vector are
+                both normalized.
+
+                @param rNormalizedVec
+                A normalized 3D Vector.
+
+                @return
+                A 3D Vector perpendicular to this and the given one
+            */
+            B3DVector getPerpendicular(const B3DVector& rNormalizedVec) const;
+
+            /** get the projection of this Vector on the given Plane
+
+                @attention This only works if the given 3D Vector defining
+                the Plane is normalized.
+
+                @param rNormalizedPlane
+                A normalized 3D Vector defining a Plane.
+
+                @return
+                The projected 3D Vector
+            */
+            B3DVector getProjectionOnPlane(const B3DVector& rNormalizedPlane) const;
+
+            /** Calculate the Scalar product
+
+                This method calculates the Scalar product between this
+                and the given 3D Vector.
+
+                @param rVec
+                A second 3D Vector.
+
+                @return
+                The Scalar Product of two 3D Vectors
+            */
+            double scalar(const B3DVector& rVec) const
+            {
+                return ((mfX * rVec.mfX) + (mfY * rVec.mfY) + (mfZ * rVec.mfZ));
+            }
+
+            static const B3DVector& getEmptyVector()
+            {
+                return (const B3DVector&) B3DTuple::getEmptyTuple();
+            }
+        };
+
+        // external operators
+        //////////////////////////////////////////////////////////////////////////
+
+        /** get a 3D Vector which is in 2D (ignoring
+            the Z-Coordinate) perpendicular to a given 3D Vector
+
+            @attention This only works if the given 3D Vector is normalized.
+
+            @param rNormalizedVec
+            A normalized 3D Vector.
+
+            @return
+            A 3D Vector perpendicular to the given one in X,Y (2D).
+        */
+        inline B3DVector getPerpendicular2D( const B3DVector& rNormalizedVec )
+        {
+            B3DVector aPerpendicular(-rNormalizedVec.getY(), rNormalizedVec.getX(), rNormalizedVec.getZ());
+            return aPerpendicular;
+        }
+
+        /** Calculate the Cross Product of two 3D Vectors
+
+            @param rVecA
+            A first 3D Vector.
+
+            @param rVecB
+            A second 3D Vector.
+
+            @return
+            The Cross Product of both 3D Vectors
+        */
+        inline B3DVector cross(const B3DVector& rVecA, const B3DVector& rVecB)
+        {
+            B3DVector aVec(
+                rVecA.getY() * rVecB.getZ() - rVecA.getZ() * rVecB.getY(),
+                rVecA.getZ() * rVecB.getX() - rVecA.getX() * rVecB.getZ(),
+                rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+            return aVec;
+        }
+    } // end of namespace vector
+} // end of namespace basegfx
+
+#endif // _BGFX_VECTOR_B3DVECTOR_HXX
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index b63e277dcd04..8573e5e06934 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dcubicbezier.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:24:52 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_CURVE_B2DCUBICBEZIER_HXX
-#include <basegfx/inc/curve/b2dcubicbezier.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
diff --git a/basegfx/source/curve/b2dquadraticbezier.cxx b/basegfx/source/curve/b2dquadraticbezier.cxx
index 63e360ca3f90..71f5d55a28f0 100644
--- a/basegfx/source/curve/b2dquadraticbezier.cxx
+++ b/basegfx/source/curve/b2dquadraticbezier.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dquadraticbezier.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:24:53 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
-#include <basegfx/inc/curve/b2dquadraticbezier.hxx>
+#include <basegfx/curve/b2dquadraticbezier.hxx>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
@@ -68,7 +68,7 @@
 #endif
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index c20a18a9336f..4b4f4416cab1 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hommatrixtemplate.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:23:00 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 #include <math.h>
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
index 95500889bc48..005dac082664 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dhommatrix.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:25:15 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #endif
 
 #ifndef _HOMMATRIX_TEMPLATE_HXX
@@ -68,15 +68,15 @@
 #endif
 
 #ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b3dhommatrix.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
 #endif
 
 #ifndef _BGFX_TUPLE_B3DTUPLE_HXX
-#include <basegfx/inc/tuple/b3dtuple.hxx>
+#include <basegfx/tuple/b3dtuple.hxx>
 #endif
 
 #ifndef _BGFX_TUPLE_B2DTUPLE_HXX
-#include <basegfx/inc/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
 #endif
 
 class Impl2DHomMatrix : public ImplHomMatrixTemplate< 3 >
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index 283c59af703f..939e952f796a 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dhommatrix.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:25:15 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b3dhommatrix.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
 #endif
 
 #ifndef _HOMMATRIX_TEMPLATE_HXX
@@ -68,7 +68,7 @@
 #endif
 
 #ifndef _BGFX_VECTOR_B3DVECTOR_HXX
-#include <basegfx/inc/vector/b3dvector.hxx>
+#include <basegfx/vector/b3dvector.hxx>
 #endif
 
 class Impl3DHomMatrix : public ImplHomMatrixTemplate< 4 >
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index 4c49d98d56f7..9470c249a756 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftools.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:23:35 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/point/b2dhompoint.cxx b/basegfx/source/point/b2dhompoint.cxx
index b67cb73efde3..573fcc38cd6c 100644
--- a/basegfx/source/point/b2dhompoint.cxx
+++ b/basegfx/source/point/b2dhompoint.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dhompoint.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:13 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,15 +60,15 @@
  ************************************************************************/
 
 #ifndef _BGFX_POINT_B2DHOMPOINT_HXX
-#include <basegfx/inc/point/b2dhompoint.hxx>
+#include <basegfx/point/b2dhompoint.hxx>
 #endif
 
 #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #endif
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx
index ddedfc1f2dfd..82e4b30c689c 100644
--- a/basegfx/source/point/b2dpoint.cxx
+++ b/basegfx/source/point/b2dpoint.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dpoint.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:13 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,11 +60,11 @@
  ************************************************************************/
 
 #ifndef _BGFX_POINT_B2DPOINT_HXX
-#include <basegfx/inc/point/b2dpoint.hxx>
+#include <basegfx/point/b2dpoint.hxx>
 #endif
 
 #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/point/b3dhompoint.cxx b/basegfx/source/point/b3dhompoint.cxx
index 6981a4a0e1eb..07570ebd8208 100644
--- a/basegfx/source/point/b3dhompoint.cxx
+++ b/basegfx/source/point/b3dhompoint.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dhompoint.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:14 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_POINT_B3DHOMPOINT_HXX
-#include <basegfx/inc/point/b3dhompoint.hxx>
+#include <basegfx/point/b3dhompoint.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/point/b3dpoint.cxx b/basegfx/source/point/b3dpoint.cxx
index 0d3b755982f6..357b2ae0f33c 100644
--- a/basegfx/source/point/b3dpoint.cxx
+++ b/basegfx/source/point/b3dpoint.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dpoint.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:14 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_POINT_B3DPOINT_HXX
-#include <basegfx/inc/point/b3dpoint.hxx>
+#include <basegfx/point/b3dpoint.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 37d795359e0f..a9ddb6e90534 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dpolygon.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:23:54 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
-#include <basegfx/inc/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
@@ -68,11 +68,11 @@
 #endif
 
 #ifndef _BGFX_POINT_B2DPOINT_HXX
-#include <basegfx/inc/point/b2dpoint.hxx>
+#include <basegfx/point/b2dpoint.hxx>
 #endif
 
 #ifndef _BGFX_VECTOR_B2DVECTOR_HXX
-#include <basegfx/inc/vector/b2dvector.hxx>
+#include <basegfx/vector/b2dvector.hxx>
 #endif
 
 #include <vector>
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 0df233f19bc2..0c1136ca5553 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dpolygontools.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:23:54 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,15 +60,15 @@
  ************************************************************************/
 
 #ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
-#include <basegfx/inc/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
 #endif
 
 #ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
-#include <basegfx/inc/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
 #endif
 
 #ifndef _BGFX_CURVE_B2DCUBICBEZIER_HXX
-#include <basegfx/inc/curve/b2dcubicbezier.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 556a5006948c..642f25b469e6 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dpolypolygon.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:23:55 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,11 +60,11 @@
  ************************************************************************/
 
 #ifndef _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
-#include <basegfx/inc/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #endif
 
 #ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
-#include <basegfx/inc/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx
index ee8b93d0af89..48271c90e1ac 100644
--- a/basegfx/source/range/b1drange.cxx
+++ b/basegfx/source/range/b1drange.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b1drange.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:36 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_RANGE_B1DRANGE_HXX
-#include <basegfx/inc/range/b1drange.hxx>
+#include <basegfx/range/b1drange.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index 60bd6813fabe..f4e7ec28973e 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2drange.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:37 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_RANGE_B2DRANGE_HXX
-#include <basegfx/inc/range/b2drange.hxx>
+#include <basegfx/range/b2drange.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
index 6418697e588e..c67b87994fcb 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3drange.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:37 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:13:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_RANGE_B3DRANGE_HXX
-#include <basegfx/inc/range/b3drange.hxx>
+#include <basegfx/range/b3drange.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/tuple/b2dtuple.cxx b/basegfx/source/tuple/b2dtuple.cxx
index 70227e5f1b9e..ded4d23a05cd 100644
--- a/basegfx/source/tuple/b2dtuple.cxx
+++ b/basegfx/source/tuple/b2dtuple.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dtuple.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:24:15 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:14:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,11 +60,11 @@
  ************************************************************************/
 
 #ifndef _BGFX_TUPLE_B2DTUPLE_HXX
-#include <basegfx/inc/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
 #endif
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/tuple/b3dtuple.cxx b/basegfx/source/tuple/b3dtuple.cxx
index fcd5b2316358..3022d1fba2ac 100644
--- a/basegfx/source/tuple/b3dtuple.cxx
+++ b/basegfx/source/tuple/b3dtuple.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dtuple.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:24:16 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:14:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_TUPLE_B3DTUPLE_HXX
-#include <basegfx/inc/tuple/b3dtuple.hxx>
+#include <basegfx/tuple/b3dtuple.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx
index f80ae063d985..6890333cdc2e 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b2dvector.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:56 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:14:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,15 +60,15 @@
  ************************************************************************/
 
 #ifndef _BGFX_VECTOR_B2DVECTOR_HXX
-#include <basegfx/inc/vector/b2dvector.hxx>
+#include <basegfx/vector/b2dvector.hxx>
 #endif
 
 #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
-#include <basegfx/inc/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #endif
 
 #ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#include <basegfx/inc/numeric/ftools.hxx>
+#include <basegfx/numeric/ftools.hxx>
 #endif
 
 namespace basegfx
diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx
index 8fab9f687c99..96c1ee387ae5 100644
--- a/basegfx/source/vector/b3dvector.cxx
+++ b/basegfx/source/vector/b3dvector.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dvector.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: aw $ $Date: 2003-10-28 11:26:57 $
+ *  last change: $Author: aw $ $Date: 2003-10-31 10:14:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 #ifndef _BGFX_VECTOR_B3DVECTOR_HXX
-#include <basegfx/inc/vector/b3dvector.hxx>
+#include <basegfx/vector/b3dvector.hxx>
 #endif
 
 namespace basegfx