[Libreoffice-commits] core.git: basegfx/source

Noel Grandin noel at peralex.com
Sun Jul 19 23:35:50 PDT 2015


 basegfx/source/polygon/b2dlinegeometry.cxx     |   12 +--
 basegfx/source/polygon/b2dpolygontools.cxx     |   80 ++++++++++++-------------
 basegfx/source/polygon/b2dpolypolygontools.cxx |   26 ++++----
 basegfx/source/polygon/b3dpolypolygontools.cxx |   18 ++---
 basegfx/source/tools/canvastools.cxx           |    2 
 basegfx/source/tools/keystoplerp.cxx           |    2 
 6 files changed, 70 insertions(+), 70 deletions(-)

New commits:
commit 852ae6dea4156955444dc469943dd1bbd446d452
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jul 17 16:15:23 2015 +0200

    com::sun::star->css in basegfx
    
    Change-Id: I27f28e6a09e8bc9e90f0b60a7ac8519b2ab41860
    Reviewed-on: https://gerrit.libreoffice.org/17166
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 4cccf1d..c259fef 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -783,7 +783,7 @@ namespace basegfx
             const B2DPolygon& rCandidate,
             double fHalfLineWidth,
             B2DLineJoin eJoin,
-            com::sun::star::drawing::LineCap eCap,
+            css::drawing::LineCap eCap,
             double fMaxAllowedAngle,
             double fMaxPartOfEdge,
             double fMiterMinimumAngle)
@@ -828,7 +828,7 @@ namespace basegfx
                 B2DPolyPolygon aRetval;
                 const bool bIsClosed(aCandidate.isClosed());
                 const sal_uInt32 nEdgeCount(bIsClosed ? nPointCount : nPointCount - 1);
-                const bool bLineCap(!bIsClosed && com::sun::star::drawing::LineCap_BUTT != eCap);
+                const bool bLineCap(!bIsClosed && css::drawing::LineCap_BUTT != eCap);
 
                 if(nEdgeCount)
                 {
@@ -926,10 +926,10 @@ namespace basegfx
                                 createAreaGeometryForEdge(
                                     aEdge,
                                     fHalfLineWidth,
-                                    bFirst && com::sun::star::drawing::LineCap_ROUND == eCap,
-                                    bLast && com::sun::star::drawing::LineCap_ROUND == eCap,
-                                    bFirst && com::sun::star::drawing::LineCap_SQUARE == eCap,
-                                    bLast && com::sun::star::drawing::LineCap_SQUARE == eCap));
+                                    bFirst && css::drawing::LineCap_ROUND == eCap,
+                                    bLast && css::drawing::LineCap_ROUND == eCap,
+                                    bFirst && css::drawing::LineCap_SQUARE == eCap,
+                                    bLast && css::drawing::LineCap_SQUARE == eCap));
                         }
                         else
                         {
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 8b31f7a..3c63441 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3306,10 +3306,10 @@ namespace basegfx
             return aRetval;
         }
 
-        // converters for com::sun::star::drawing::PointSequence
+        // converters for css::drawing::PointSequence
 
         B2DPolygon UnoPointSequenceToB2DPolygon(
-            const com::sun::star::drawing::PointSequence& rPointSequenceSource,
+            const css::drawing::PointSequence& rPointSequenceSource,
             bool bCheckClosed)
         {
             B2DPolygon aRetval;
@@ -3318,8 +3318,8 @@ namespace basegfx
             if(nLength)
             {
                 aRetval.reserve(nLength);
-                const com::sun::star::awt::Point* pArray = rPointSequenceSource.getConstArray();
-                const com::sun::star::awt::Point* pArrayEnd = pArray + rPointSequenceSource.getLength();
+                const css::awt::Point* pArray = rPointSequenceSource.getConstArray();
+                const css::awt::Point* pArrayEnd = pArray + rPointSequenceSource.getLength();
 
                 for(;pArray != pArrayEnd; pArray++)
                 {
@@ -3338,7 +3338,7 @@ namespace basegfx
 
         void B2DPolygonToUnoPointSequence(
             const B2DPolygon& rPolygon,
-            com::sun::star::drawing::PointSequence& rPointSequenceRetval)
+            css::drawing::PointSequence& rPointSequenceRetval)
         {
             B2DPolygon aPolygon(rPolygon);
 
@@ -3358,12 +3358,12 @@ namespace basegfx
                 const bool bIsClosed(aPolygon.isClosed());
 
                 rPointSequenceRetval.realloc(bIsClosed ? nPointCount + 1 : nPointCount);
-                com::sun::star::awt::Point* pSequence = rPointSequenceRetval.getArray();
+                css::awt::Point* pSequence = rPointSequenceRetval.getArray();
 
                 for(sal_uInt32 b(0); b < nPointCount; b++)
                 {
                     const B2DPoint aPoint(aPolygon.getB2DPoint(b));
-                    const com::sun::star::awt::Point aAPIPoint(fround(aPoint.getX()), fround(aPoint.getY()));
+                    const css::awt::Point aAPIPoint(fround(aPoint.getX()), fround(aPoint.getY()));
 
                     *pSequence = aAPIPoint;
                     pSequence++;
@@ -3381,12 +3381,12 @@ namespace basegfx
             }
         }
 
-        // converters for com::sun::star::drawing::PointSequence and
-        // com::sun::star::drawing::FlagSequence to B2DPolygon (curved polygons)
+        // converters for css::drawing::PointSequence and
+        // css::drawing::FlagSequence to B2DPolygon (curved polygons)
 
         B2DPolygon UnoPolygonBezierCoordsToB2DPolygon(
-            const com::sun::star::drawing::PointSequence& rPointSequenceSource,
-            const com::sun::star::drawing::FlagSequence& rFlagSequenceSource,
+            const css::drawing::PointSequence& rPointSequenceSource,
+            const css::drawing::FlagSequence& rFlagSequenceSource,
             bool bCheckClosed)
         {
             const sal_uInt32 nCount((sal_uInt32)rPointSequenceSource.getLength());
@@ -3395,17 +3395,17 @@ namespace basegfx
 
             // prepare new polygon
             B2DPolygon aRetval;
-            const com::sun::star::awt::Point* pPointSequence = rPointSequenceSource.getConstArray();
-            const com::sun::star::drawing::PolygonFlags* pFlagSequence = rFlagSequenceSource.getConstArray();
+            const css::awt::Point* pPointSequence = rPointSequenceSource.getConstArray();
+            const css::drawing::PolygonFlags* pFlagSequence = rFlagSequenceSource.getConstArray();
 
             // get first point and flag
             B2DPoint aNewCoordinatePair(pPointSequence->X, pPointSequence->Y); pPointSequence++;
-            com::sun::star::drawing::PolygonFlags ePolygonFlag(*pFlagSequence); pFlagSequence++;
+            css::drawing::PolygonFlags ePolygonFlag(*pFlagSequence); pFlagSequence++;
             B2DPoint aControlA;
             B2DPoint aControlB;
 
             // first point is not allowed to be a control point
-            OSL_ENSURE(com::sun::star::drawing::PolygonFlags_CONTROL != ePolygonFlag,
+            OSL_ENSURE(css::drawing::PolygonFlags_CONTROL != ePolygonFlag,
                 "UnoPolygonBezierCoordsToB2DPolygon: Start point is a control point, illegal input polygon (!)");
 
             // add first point as start point
@@ -3422,7 +3422,7 @@ namespace basegfx
                 ePolygonFlag = *pFlagSequence;
                 pPointSequence++; pFlagSequence++; b++;
 
-                if(b < nCount && com::sun::star::drawing::PolygonFlags_CONTROL == ePolygonFlag)
+                if(b < nCount && css::drawing::PolygonFlags_CONTROL == ePolygonFlag)
                 {
                     aControlA = aNewCoordinatePair;
                     bControlA = true;
@@ -3433,7 +3433,7 @@ namespace basegfx
                     pPointSequence++; pFlagSequence++; b++;
                 }
 
-                if(b < nCount && com::sun::star::drawing::PolygonFlags_CONTROL == ePolygonFlag)
+                if(b < nCount && css::drawing::PolygonFlags_CONTROL == ePolygonFlag)
                 {
                     aControlB = aNewCoordinatePair;
                     bControlB = true;
@@ -3446,7 +3446,7 @@ namespace basegfx
 
                 // 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
-                SAL_WARN_IF(com::sun::star::drawing::PolygonFlags_CONTROL == ePolygonFlag || bControlA != bControlB,
+                SAL_WARN_IF(css::drawing::PolygonFlags_CONTROL == ePolygonFlag || bControlA != bControlB,
                     "basegfx", "UnoPolygonBezierCoordsToB2DPolygon: Illegal source polygon (!)");
 
                 // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter
@@ -3489,8 +3489,8 @@ namespace basegfx
 
         void B2DPolygonToUnoPolygonBezierCoords(
             const B2DPolygon& rPolygon,
-            com::sun::star::drawing::PointSequence& rPointSequenceRetval,
-            com::sun::star::drawing::FlagSequence& rFlagSequenceRetval)
+            css::drawing::PointSequence& rPointSequenceRetval,
+            css::drawing::FlagSequence& rFlagSequenceRetval)
         {
             const sal_uInt32 nPointCount(rPolygon.count());
 
@@ -3508,8 +3508,8 @@ namespace basegfx
                     {
                         // prepare target data. The real needed number of target points (and flags)
                         // could only be calculated by using two loops, so use dynamic memory
-                        std::vector< com::sun::star::awt::Point > aCollectPoints;
-                        std::vector< com::sun::star::drawing::PolygonFlags > aCollectFlags;
+                        std::vector< css::awt::Point > aCollectPoints;
+                        std::vector< css::drawing::PolygonFlags > aCollectFlags;
 
                         // reserve maximum creatable points
                         const sal_uInt32 nMaxTargetCount((nLoopCount * 3) + 1);
@@ -3525,10 +3525,10 @@ namespace basegfx
                             // add current point (always) and remember StartPointIndex for evtl. later corrections
                             const sal_uInt32 nStartPointIndex(aCollectPoints.size());
                             aCollectPoints.push_back(
-                                com::sun::star::awt::Point(
+                                css::awt::Point(
                                     fround(aBezierSegment.getStartPoint().getX()),
                                     fround(aBezierSegment.getStartPoint().getY())));
-                            aCollectFlags.push_back(com::sun::star::drawing::PolygonFlags_NORMAL);
+                            aCollectFlags.push_back(css::drawing::PolygonFlags_NORMAL);
 
                             // prepare next segment
                             const sal_uInt32 nNextIndex((a + 1) % nPointCount);
@@ -3540,16 +3540,16 @@ namespace basegfx
                             {
                                 // if bezier is used, add always two control points due to the old schema
                                 aCollectPoints.push_back(
-                                    com::sun::star::awt::Point(
+                                    css::awt::Point(
                                         fround(aBezierSegment.getControlPointA().getX()),
                                         fround(aBezierSegment.getControlPointA().getY())));
-                                aCollectFlags.push_back(com::sun::star::drawing::PolygonFlags_CONTROL);
+                                aCollectFlags.push_back(css::drawing::PolygonFlags_CONTROL);
 
                                 aCollectPoints.push_back(
-                                    com::sun::star::awt::Point(
+                                    css::awt::Point(
                                         fround(aBezierSegment.getControlPointB().getX()),
                                         fround(aBezierSegment.getControlPointB().getY())));
-                                aCollectFlags.push_back(com::sun::star::drawing::PolygonFlags_CONTROL);
+                                aCollectFlags.push_back(css::drawing::PolygonFlags_CONTROL);
                             }
 
                             // test continuity with previous control point to set flag value
@@ -3559,11 +3559,11 @@ namespace basegfx
 
                                 if(B2VectorContinuity::C1 == eCont)
                                 {
-                                    aCollectFlags[nStartPointIndex] = com::sun::star::drawing::PolygonFlags_SMOOTH;
+                                    aCollectFlags[nStartPointIndex] = css::drawing::PolygonFlags_SMOOTH;
                                 }
                                 else if(B2VectorContinuity::C2 == eCont)
                                 {
-                                    aCollectFlags[nStartPointIndex] = com::sun::star::drawing::PolygonFlags_SYMMETRIC;
+                                    aCollectFlags[nStartPointIndex] = css::drawing::PolygonFlags_SYMMETRIC;
                                 }
                             }
 
@@ -3575,17 +3575,17 @@ namespace basegfx
                         {
                             // add first point again as closing point due to old definition
                             aCollectPoints.push_back(aCollectPoints[0]);
-                            aCollectFlags.push_back(com::sun::star::drawing::PolygonFlags_NORMAL);
+                            aCollectFlags.push_back(css::drawing::PolygonFlags_NORMAL);
                         }
                         else
                         {
                             // add last point as closing point
                             const B2DPoint aClosingPoint(rPolygon.getB2DPoint(nPointCount - 1L));
                             aCollectPoints.push_back(
-                                com::sun::star::awt::Point(
+                                css::awt::Point(
                                     fround(aClosingPoint.getX()),
                                     fround(aClosingPoint.getY())));
-                            aCollectFlags.push_back(com::sun::star::drawing::PolygonFlags_NORMAL);
+                            aCollectFlags.push_back(css::drawing::PolygonFlags_NORMAL);
                         }
 
                         // copy collected data to target arrays
@@ -3594,8 +3594,8 @@ namespace basegfx
 
                         rPointSequenceRetval.realloc((sal_Int32)nTargetCount);
                         rFlagSequenceRetval.realloc((sal_Int32)nTargetCount);
-                        com::sun::star::awt::Point* pPointSequence = rPointSequenceRetval.getArray();
-                        com::sun::star::drawing::PolygonFlags* pFlagSequence = rFlagSequenceRetval.getArray();
+                        css::awt::Point* pPointSequence = rPointSequenceRetval.getArray();
+                        css::drawing::PolygonFlags* pFlagSequence = rFlagSequenceRetval.getArray();
 
                         for(sal_uInt32 a(0); a < nTargetCount; a++)
                         {
@@ -3614,18 +3614,18 @@ namespace basegfx
                     rPointSequenceRetval.realloc((sal_Int32)nTargetCount);
                     rFlagSequenceRetval.realloc((sal_Int32)nTargetCount);
 
-                    com::sun::star::awt::Point* pPointSequence = rPointSequenceRetval.getArray();
-                    com::sun::star::drawing::PolygonFlags* pFlagSequence = rFlagSequenceRetval.getArray();
+                    css::awt::Point* pPointSequence = rPointSequenceRetval.getArray();
+                    css::drawing::PolygonFlags* pFlagSequence = rFlagSequenceRetval.getArray();
 
                     for(sal_uInt32 a(0); a < nPointCount; a++)
                     {
                         const B2DPoint aB2DPoint(rPolygon.getB2DPoint(a));
-                        const com::sun::star::awt::Point aAPIPoint(
+                        const css::awt::Point aAPIPoint(
                             fround(aB2DPoint.getX()),
                             fround(aB2DPoint.getY()));
 
                         *pPointSequence = aAPIPoint;
-                        *pFlagSequence = com::sun::star::drawing::PolygonFlags_NORMAL;
+                        *pFlagSequence = css::drawing::PolygonFlags_NORMAL;
                         pPointSequence++;
                         pFlagSequence++;
                     }
@@ -3634,7 +3634,7 @@ namespace basegfx
                     {
                         // add first point as closing point
                         *pPointSequence = *rPointSequenceRetval.getConstArray();
-                        *pFlagSequence = com::sun::star::drawing::PolygonFlags_NORMAL;
+                        *pFlagSequence = css::drawing::PolygonFlags_NORMAL;
                     }
                 }
             }
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 5dc1cbc..f290f37 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -645,15 +645,15 @@ namespace basegfx
             return aRes;
         }
 
-        // converters for com::sun::star::drawing::PointSequence
+        // converters for css::drawing::PointSequence
 
         B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon(
-            const com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceSource,
+            const css::drawing::PointSequenceSequence& rPointSequenceSequenceSource,
             bool bCheckClosed)
         {
             B2DPolyPolygon aRetval;
-            const com::sun::star::drawing::PointSequence* pPointSequence = rPointSequenceSequenceSource.getConstArray();
-            const com::sun::star::drawing::PointSequence* pPointSeqEnd = pPointSequence + rPointSequenceSequenceSource.getLength();
+            const css::drawing::PointSequence* pPointSequence = rPointSequenceSequenceSource.getConstArray();
+            const css::drawing::PointSequence* pPointSeqEnd = pPointSequence + rPointSequenceSequenceSource.getLength();
 
             for(;pPointSequence != pPointSeqEnd; pPointSequence++)
             {
@@ -666,14 +666,14 @@ namespace basegfx
 
         void B2DPolyPolygonToUnoPointSequenceSequence(
             const B2DPolyPolygon& rPolyPolygon,
-            com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceRetval)
+            css::drawing::PointSequenceSequence& rPointSequenceSequenceRetval)
         {
             const sal_uInt32 nCount(rPolyPolygon.count());
 
             if(nCount)
             {
                 rPointSequenceSequenceRetval.realloc(nCount);
-                com::sun::star::drawing::PointSequence* pPointSequence = rPointSequenceSequenceRetval.getArray();
+                css::drawing::PointSequence* pPointSequence = rPointSequenceSequenceRetval.getArray();
 
                 for(sal_uInt32 a(0); a < nCount; a++)
                 {
@@ -689,10 +689,10 @@ namespace basegfx
             }
         }
 
-        // converters for com::sun::star::drawing::PolyPolygonBezierCoords (curved polygons)
+        // converters for css::drawing::PolyPolygonBezierCoords (curved polygons)
 
         B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
-            const com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource,
+            const css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource,
             bool bCheckClosed)
         {
             B2DPolyPolygon aRetval;
@@ -702,8 +702,8 @@ namespace basegfx
             {
                 OSL_ENSURE(nSequenceCount == (sal_uInt32)rPolyPolygonBezierCoordsSource.Flags.getLength(),
                     "UnoPolyPolygonBezierCoordsToB2DPolyPolygon: unequal number of Points and Flags (!)");
-                const com::sun::star::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsSource.Coordinates.getConstArray();
-                const com::sun::star::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsSource.Flags.getConstArray();
+                const css::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsSource.Coordinates.getConstArray();
+                const css::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsSource.Flags.getConstArray();
 
                 for(sal_uInt32 a(0); a < nSequenceCount; a++)
                 {
@@ -723,7 +723,7 @@ namespace basegfx
 
         void B2DPolyPolygonToUnoPolyPolygonBezierCoords(
             const B2DPolyPolygon& rPolyPolygon,
-            com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval)
+            css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval)
         {
             const sal_uInt32 nCount(rPolyPolygon.count());
 
@@ -734,8 +734,8 @@ namespace basegfx
                 rPolyPolygonBezierCoordsRetval.Flags.realloc((sal_Int32)nCount);
 
                 // get pointers to arrays
-                com::sun::star::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsRetval.Coordinates.getArray();
-                com::sun::star::drawing::FlagSequence*  pFlagSequence = rPolyPolygonBezierCoordsRetval.Flags.getArray();
+                css::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsRetval.Coordinates.getArray();
+                css::drawing::FlagSequence*  pFlagSequence = rPolyPolygonBezierCoordsRetval.Flags.getArray();
 
                 for(sal_uInt32 a(0); a < nCount; a++)
                 {
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 53498fe..c04239a 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -482,9 +482,9 @@ namespace basegfx
             }
         }
 
-/// converters for com::sun::star::drawing::PolyPolygonShape3D
+/// converters for css::drawing::PolyPolygonShape3D
         B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon(
-            const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource,
+            const css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource,
             bool bCheckClosed)
         {
             B3DPolyPolygon aRetval;
@@ -496,9 +496,9 @@ namespace basegfx
                     && nOuterSequenceCount == rPolyPolygonShape3DSource.SequenceZ.getLength(),
                     "UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have the same length (!)");
 
-                const com::sun::star::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray();
-                const com::sun::star::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray();
-                const com::sun::star::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray();
+                const css::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray();
+                const css::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray();
+                const css::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray();
 
                 for(sal_Int32 a(0); a < nOuterSequenceCount; a++)
                 {
@@ -537,7 +537,7 @@ namespace basegfx
 
         void B3DPolyPolygonToUnoPolyPolygonShape3D(
             const B3DPolyPolygon& rPolyPolygonSource,
-            com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval)
+            css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval)
         {
             const sal_uInt32 nPolygonCount(rPolyPolygonSource.count());
 
@@ -547,9 +547,9 @@ namespace basegfx
                 rPolyPolygonShape3DRetval.SequenceY.realloc(nPolygonCount);
                 rPolyPolygonShape3DRetval.SequenceZ.realloc(nPolygonCount);
 
-                com::sun::star::drawing::DoubleSequence* pOuterSequenceX = rPolyPolygonShape3DRetval.SequenceX.getArray();
-                com::sun::star::drawing::DoubleSequence* pOuterSequenceY = rPolyPolygonShape3DRetval.SequenceY.getArray();
-                com::sun::star::drawing::DoubleSequence* pOuterSequenceZ = rPolyPolygonShape3DRetval.SequenceZ.getArray();
+                css::drawing::DoubleSequence* pOuterSequenceX = rPolyPolygonShape3DRetval.SequenceX.getArray();
+                css::drawing::DoubleSequence* pOuterSequenceY = rPolyPolygonShape3DRetval.SequenceY.getArray();
+                css::drawing::DoubleSequence* pOuterSequenceZ = rPolyPolygonShape3DRetval.SequenceZ.getArray();
 
                 for(sal_uInt32 a(0); a < nPolygonCount; a++)
                 {
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index ec537ba..75534f6 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -334,7 +334,7 @@ namespace basegfx
             return output;
         }
 
-        ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& input )
+        ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::css::geometry::AffineMatrix3D& input )
         {
             ::basegfx::B3DHomMatrix output;
 
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
index 9dfd625..5819663 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -50,7 +50,7 @@ namespace basegfx
             validateInput(maKeyStops);
         }
 
-        KeyStopLerp::KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops ) :
+        KeyStopLerp::KeyStopLerp( const ::css::uno::Sequence<double>& rKeyStops ) :
             maKeyStops(rKeyStops.getLength()),
             mnLastIndex(0)
         {


More information about the Libreoffice-commits mailing list