resyncing to master

3 files changed, 55 insertions, 422 deletions

diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
index ccd4cfe707a8..a3eb8d311ec4 100644
--- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
@@ -53,9 +53,6 @@ namespace basegfx
         B3DHomMatrix(const B3DHomMatrix& rMat);
         ~B3DHomMatrix();
 
-        /// unshare this matrix with all internally shared instances
-        void makeUnique();
-
         double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
         void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
 
@@ -67,20 +64,12 @@ namespace basegfx
         /// 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();
 
@@ -95,8 +84,6 @@ namespace basegfx
 
         // 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
diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
deleted file mode 100644
index 1b43afc03b38..000000000000
--- a/basegfx/inc/basegfx/point/b3dhompoint.hxx
+++ /dev/null
@@ -1,409 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _BGFX_POINT_B3DHOMPOINT_HXX
-#define _BGFX_POINT_B3DHOMPOINT_HXX
-
-#include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-namespace basegfx
-{
-    /** 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 BASEGFX_DLLPUBLIC B3DHomPoint
-    {
-    protected:
-        /// This member contains the coordinate part of the point
-        ::basegfx::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::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
-
-            The point is initialized to (0.0, 0.0, 0.0)
-        */
-        B3DHomPoint()
-        :   maTuple(),
-            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::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 minimum(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 maximum(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 absolute(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 basegfx
-
-#endif /* _BGFX_POINT_B3DHOMPOINT_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/inc/basegfx/tools/unotools.hxx b/basegfx/inc/basegfx/tools/unotools.hxx
new file mode 100644
index 000000000000..e7bcc27fb561
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/unotools.hxx
@@ -0,0 +1,55 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Thorsten Behrens <tbehrens@novell.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_BASEGFX_UNOTOOLS_HXX
+#define INCLUDED_BASEGFX_UNOTOOLS_HXX
+
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase3.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/rendering/FillRule.hpp>
+#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
+#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
+
+namespace basegfx
+{
+class B2DPolyPolygon;
+
+namespace unotools
+{
+
+    B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
+        throw( ::com::sun::star::lang::IllegalArgumentException );
+
+    void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
+                                            ::com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
+}
+}
+
+#endif /* INCLUDED_BASEGFX_UNOTOOLS_HXX */