resyncing to master

5 files changed, 270 insertions, 121 deletions

diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index e665b47d58a6..80a5024893b4 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -63,11 +63,6 @@ namespace basegfx
         return *this;
     }
 
-    void B3DHomMatrix::makeUnique()
-    {
-        mpImpl.make_unique();
-    }
-
     double B3DHomMatrix::get(sal_uInt16 nRow, sal_uInt16 nColumn) const
     {
         return mpImpl->get(nRow, nColumn);
@@ -96,11 +91,6 @@ namespace basegfx
         mpImpl = IdentityMatrix::get();
     }
 
-    bool B3DHomMatrix::isInvertible() const
-    {
-        return mpImpl->isInvertible();
-    }
-
     bool B3DHomMatrix::invert()
     {
         Impl3DHomMatrix aWork(*mpImpl);
@@ -119,27 +109,11 @@ namespace basegfx
         return false;
     }
 
-    bool B3DHomMatrix::isNormalized() const
-    {
-        return mpImpl->isNormalized();
-    }
-
-    void B3DHomMatrix::normalize()
-    {
-        if(!const_cast<const B3DHomMatrix*>(this)->mpImpl->isNormalized())
-            mpImpl->doNormalize();
-    }
-
     double B3DHomMatrix::determinant() const
     {
         return mpImpl->doDeterminant();
     }
 
-    double B3DHomMatrix::trace() const
-    {
-        return mpImpl->doTrace();
-    }
-
     void B3DHomMatrix::transpose()
     {
         mpImpl->doTranspose();
@@ -290,34 +264,6 @@ namespace basegfx
         }
     }
 
-    void B3DHomMatrix::shearYZ(double fSy, double fSz)
-    {
-        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
-        if(!fTools::equalZero(fSy) || !fTools::equalZero(fSz))
-        {
-            Impl3DHomMatrix aShearYZMat;
-
-            aShearYZMat.set(1, 0, fSy);
-            aShearYZMat.set(2, 0, fSz);
-
-            mpImpl->doMulMatrix(aShearYZMat);
-        }
-    }
-
-    void B3DHomMatrix::shearXZ(double fSx, double fSz)
-    {
-        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
-        if(!fTools::equalZero(fSx) || !fTools::equalZero(fSz))
-        {
-            Impl3DHomMatrix aShearXZMat;
-
-            aShearXZMat.set(0, 1, fSx);
-            aShearXZMat.set(2, 1, fSz);
-
-            mpImpl->doMulMatrix(aShearXZMat);
-        }
-    }
-
     void B3DHomMatrix::frustum(double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar)
     {
         const double fZero(0.0);
diff --git a/basegfx/source/point/b3dhompoint.cxx b/basegfx/source/point/b3dhompoint.cxx
deleted file mode 100644
index 3a6c33a50262..000000000000
--- a/basegfx/source/point/b3dhompoint.cxx
+++ /dev/null
@@ -1,47 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_basegfx.hxx"
-#include <basegfx/point/b3dhompoint.hxx>
-
-namespace basegfx
-{
-    void B3DHomPoint::implHomogenize()
-    {
-        const double fFactor(1.0 / mfW);
-        maTuple.setX(maTuple.getX() * fFactor);
-        maTuple.setY(maTuple.getY() * fFactor);
-        maTuple.setZ(maTuple.getZ() * fFactor);
-        mfW = 1.0;
-    }
-} // end of namespace basegfx
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 4c8ab7b44a45..b55af03e9575 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -93,21 +93,10 @@ public:
 
     void insert(sal_uInt32 nIndex, const basegfx::B2DPolyPolygon& rPolyPolygon)
     {
-        const sal_uInt32 nCount = rPolyPolygon.count();
-
-        if(nCount)
-        {
-            // add nCount polygons from rPolyPolygon
-            maPolygons.reserve(maPolygons.size() + nCount);
-            PolygonVector::iterator aIndex(maPolygons.begin());
-            aIndex += nIndex;
-
-            for(sal_uInt32 a(0L); a < nCount; a++)
-            {
-                aIndex = maPolygons.insert(aIndex, rPolyPolygon.getB2DPolygon(a));
-                ++aIndex;
-            }
-        }
+        // add all polygons from rPolyPolygon
+        PolygonVector::iterator aIndex(maPolygons.begin());
+        aIndex += nIndex;
+        maPolygons.insert(aIndex, rPolyPolygon.begin(), rPolyPolygon.end());
     }
 
     void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 50a04dbaa075..074cfd9e25d5 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -787,10 +787,7 @@ namespace basegfx
                                 // (since
                                 // createPolygonFromEllipseSegment()
                                 // normalizes to e.g. cw arc)
-                                const bool bLessThanPi(fmod(fTheta2+2*M_PI-fTheta1,
-                                          2*M_PI)<M_PI);
-                                const bool bFlipSegment( (bLargeArcFlag!=0) == bLessThanPi );
-                                if( bFlipSegment )
+                                if( !bSweepFlag )
                                     std::swap(fTheta1,fTheta2);
 
                                 // finally, create bezier polygon from this
@@ -812,7 +809,7 @@ namespace basegfx
                                 // always creates arcs that are
                                 // positively oriented - flip polygon
                                 // if we swapped angles above
-                                if( bFlipSegment )
+                                if( !bSweepFlag )
                                     aSegment.flip();
                                 aCurrPoly.append(aSegment);
                             }
diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx
new file mode 100644
index 000000000000..710568b8d737
--- /dev/null
+++ b/basegfx/source/tools/unotools.cxx
@@ -0,0 +1,264 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * Portions Copright 2011 Thorsten Behrens <tbehrens@novell.com>
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
+#include <com/sun/star/drawing/PointSequence.hpp>
+#include <com/sun/star/drawing/FlagSequence.hpp>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+
+#include <basegfx/tools/unotools.hxx>
+#include <comphelper/sequence.hxx>
+
+
+using namespace ::com::sun::star;
+
+namespace basegfx
+{
+namespace unotools
+{
+
+    B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
+        throw( lang::IllegalArgumentException )
+    {
+        const sal_Int32 nOuterSequenceCount(rSourcePolyPolygon.Coordinates.getLength());
+        B2DPolyPolygon aNewPolyPolygon;
+
+        if(rSourcePolyPolygon.Flags.getLength() != nOuterSequenceCount)
+            throw lang::IllegalArgumentException();
+
+        // get pointers to inner sequence
+        const drawing::PointSequence* pInnerSequence = rSourcePolyPolygon.Coordinates.getConstArray();
+        const drawing::FlagSequence* pInnerSequenceFlags = rSourcePolyPolygon.Flags.getConstArray();
+
+        for(sal_Int32 a(0); a < nOuterSequenceCount; a++)
+        {
+            const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
+
+            if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
+                throw lang::IllegalArgumentException();
+
+            // prepare new polygon
+            basegfx::B2DPolygon aNewPolygon;
+            const awt::Point* pArray = pInnerSequence->getConstArray();
+            const drawing::PolygonFlags* pArrayFlags = pInnerSequenceFlags->getConstArray();
+
+            // get first point and flag
+            basegfx::B2DPoint aNewCoordinatePair(pArray->X, pArray->Y); pArray++;
+            drawing::PolygonFlags ePolyFlag(*pArrayFlags); pArrayFlags++;
+            basegfx::B2DPoint aControlA;
+            basegfx::B2DPoint aControlB;
+
+            // first point is not allowed to be a control point
+            if(drawing::PolygonFlags_CONTROL == ePolyFlag)
+                throw lang::IllegalArgumentException();
+
+            // add first point as start point
+            aNewPolygon.append(aNewCoordinatePair);
+            for(sal_Int32 b(1); b < nInnerSequenceCount;)
+            {
+                // prepare loop
+                bool bControlA(false);
+                bool bControlB(false);
+
+                // get next point and flag
+                aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
+                ePolyFlag = *pArrayFlags;
+                pArray++; pArrayFlags++; b++;
+
+                if(b < nInnerSequenceCount && drawing::PolygonFlags_CONTROL == ePolyFlag)
+                {
+                    aControlA = aNewCoordinatePair;
+                    bControlA = true;
+
+                    // get next point and flag
+                    aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
+                    ePolyFlag = *pArrayFlags;
+                    pArray++; pArrayFlags++; b++;
+                }
+
+                if(b < nInnerSequenceCount && drawing::PolygonFlags_CONTROL == ePolyFlag)
+                {
+                    aControlB = aNewCoordinatePair;
+                    bControlB = true;
+
+                    // get next point and flag
+                    aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
+                    ePolyFlag = *pArrayFlags;
+                    pArray++; pArrayFlags++; b++;
+                }
+
+                // two or no control points are consumed, another one would be an error.
+                // It's also an error if only one control point was read
+                if(drawing::PolygonFlags_CONTROL == ePolyFlag || bControlA != bControlB)
+                    throw lang::IllegalArgumentException();
+
+                // the previous writes used the B2DPolyPoygon -> PolyPolygon converter
+                // which did not create minimal PolyPolygons, but created all control points
+                // as null vectors (identical points). Because of the former P(CA)(CB)-norm of
+                // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being
+                // relative to P, an empty edge was exported as P == CA == CB. Luckily, the new
+                // export format can be read without errors by the old OOo-versions, so we need only
+                // to correct here at read and do not need to export a wrong but compatible version
+                // for the future.
+                if(bControlA
+                   && aControlA.equal(aControlB)
+                   && aControlA.equal(aNewPolygon.getB2DPoint(aNewPolygon.count() - 1)))
+                {
+                    bControlA = bControlB = false;
+                }
+
+                if(bControlA)
+                {
+                    // add bezier edge
+                    aNewPolygon.appendBezierSegment(aControlA, aControlB, aNewCoordinatePair);
+                }
+                else
+                {
+                    // add edge
+                    aNewPolygon.append(aNewCoordinatePair);
+                }
+            }
+
+            // next sequence
+            pInnerSequence++;
+            pInnerSequenceFlags++;
+
+            // #i72807# API import uses old line start/end-equal definition for closed,
+            // so we need to correct this to closed state here
+            basegfx::tools::checkClosed(aNewPolygon);
+
+            // add new subpolygon
+            aNewPolyPolygon.append(aNewPolygon);
+        }
+
+        return aNewPolyPolygon;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////
+
+    void b2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly,
+                                            drawing::PolyPolygonBezierCoords& rRetval )
+    {
+        rRetval.Coordinates.realloc(rPolyPoly.count());
+        rRetval.Flags.realloc(rPolyPoly.count());
+
+        drawing::PointSequence* pOuterSequence = rRetval.Coordinates.getArray();
+        drawing::FlagSequence*  pOuterFlags = rRetval.Flags.getArray();
+
+        for(sal_uInt32 a=0;a<rPolyPoly.count();a++)
+        {
+            const B2DPolygon& rPoly = rPolyPoly.getB2DPolygon(a);
+            sal_uInt32 nCount(rPoly.count());
+            const bool bClosed(rPoly.isClosed());
+
+            // calculate input vertex count
+            const sal_uInt32 nLoopCount(bClosed ? nCount : (nCount ? nCount - 1L : 0L ));
+
+            std::vector<awt::Point> aPoints; aPoints.reserve(nLoopCount);
+            std::vector<drawing::PolygonFlags> aFlags; aFlags.reserve(nLoopCount);
+
+            // prepare insert index and current point
+            basegfx::B2DCubicBezier aBezier;
+            aBezier.setStartPoint(rPoly.getB2DPoint(0));
+
+            for(sal_uInt32 b(0L); b<nLoopCount; b++)
+            {
+                // add current point (always) and remember StartPointIndex for evtl. later corrections
+                const awt::Point aStartPoint(fround(aBezier.getStartPoint().getX()),
+                                             fround(aBezier.getStartPoint().getY()));
+                const sal_uInt32 nStartPointIndex(aPoints.size());
+                aPoints.push_back(aStartPoint);
+                aFlags.push_back(drawing::PolygonFlags_NORMAL);
+
+                // prepare next segment
+                const sal_uInt32 nNextIndex((b + 1) % nCount);
+                aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
+                aBezier.setControlPointA(rPoly.getNextControlPoint(b));
+                aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
+
+                if(aBezier.isBezier())
+                {
+                    // if one is used, add always two control points due to the old schema
+                    aPoints.push_back( awt::Point(fround(aBezier.getControlPointA().getX()),
+                                                  fround(aBezier.getControlPointA().getY())) );
+                    aFlags.push_back(drawing::PolygonFlags_CONTROL);
+
+                    aPoints.push_back( awt::Point(fround(aBezier.getControlPointB().getX()),
+                                                  fround(aBezier.getControlPointB().getY())) );
+                    aFlags.push_back(drawing::PolygonFlags_CONTROL);
+                }
+
+                // test continuity with previous control point to set flag value
+                if(aBezier.getControlPointA() != aBezier.getStartPoint() && (bClosed || b))
+                {
+                    const basegfx::B2VectorContinuity eCont(rPoly.getContinuityInPoint(b));
+
+                    if(basegfx::CONTINUITY_C1 == eCont)
+                    {
+                        aFlags[nStartPointIndex] = drawing::PolygonFlags_SMOOTH;
+                    }
+                    else if(basegfx::CONTINUITY_C2 == eCont)
+                    {
+                        aFlags[nStartPointIndex] = drawing::PolygonFlags_SYMMETRIC;
+                    }
+                }
+
+                // prepare next polygon step
+                aBezier.setStartPoint(aBezier.getEndPoint());
+            }
+
+            if(bClosed)
+            {
+                // add first point again as closing point due to old definition
+                aPoints.push_back( aPoints[0] );
+                aFlags.push_back(drawing::PolygonFlags_NORMAL);
+            }
+            else
+            {
+                // add last point as closing point
+                const basegfx::B2DPoint aClosingPoint(rPoly.getB2DPoint(nCount - 1L));
+                const awt::Point aEnd(fround(aClosingPoint.getX()),
+                                      fround(aClosingPoint.getY()));
+                aPoints.push_back(aEnd);
+                aFlags.push_back(drawing::PolygonFlags_NORMAL);
+            }
+
+            *pOuterSequence++ = comphelper::containerToSequence(aPoints);
+            *pOuterFlags++ = comphelper::containerToSequence(aFlags);
+        }
+    }
+
+}
+}