#57786 - XSLFFreeformShape ignores quadratic bezier curves

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1694373 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 2 deletions

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
index 07a84caa52..8acc12b442 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
@@ -37,6 +37,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DClose;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DCubicBezierTo;

 import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DLineTo;

 import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DMoveTo;

+import org.openxmlformats.schemas.drawingml.x2006.main.CTPath2DQuadBezierTo;

 import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;

 import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;

 import org.openxmlformats.schemas.presentationml.x2006.main.CTShapeNonVisual;

@@ -81,6 +82,16 @@ public class XSLFFreeformShape extends XSLFAutoShape implements FreeformShape<XS
                     ln.setY(Units.toEMU(vals[1]) - y0);

                     numPoints++;

                     break;

+                case PathIterator.SEG_QUADTO:

+                    CTPath2DQuadBezierTo qbez = ctPath.addNewQuadBezTo();

+                    CTAdjPoint2D qp1 = qbez.addNewPt();

+                    qp1.setX(Units.toEMU(vals[0]) - x0);

+                    qp1.setY(Units.toEMU(vals[1]) - y0);

+                    CTAdjPoint2D qp2 = qbez.addNewPt();

+                    qp2.setX(Units.toEMU(vals[2]) - x0);

+                    qp2.setY(Units.toEMU(vals[3]) - y0);

+                    numPoints += 2;

+                    break;

                 case PathIterator.SEG_CUBICTO:

                     CTPath2DCubicBezierTo bez = ctPath.addNewCubicBezTo();

                     CTAdjPoint2D p1 = bez.addNewPt();

@@ -126,6 +137,15 @@ public class XSLFFreeformShape extends XSLFAutoShape implements FreeformShape<XS
                     CTAdjPoint2D pt = ((CTPath2DLineTo)ch).getPt();

                     path.lineTo((float)Units.toPoints((Long)pt.getX()),

                                 (float)Units.toPoints((Long)pt.getY()));

+                } else if (ch instanceof CTPath2DQuadBezierTo){

+                    CTPath2DQuadBezierTo bez = ((CTPath2DQuadBezierTo)ch);

+                    CTAdjPoint2D pt1 = bez.getPtArray(0);

+                    CTAdjPoint2D pt2 = bez.getPtArray(1);

+                    path.quadTo(

+                            (float) (Units.toPoints((Long) pt1.getX()) * scaleW),

+                            (float) (Units.toPoints((Long) pt1.getY()) * scaleH),

+                            (float) (Units.toPoints((Long) pt2.getX()) * scaleW),

+                            (float) (Units.toPoints((Long) pt2.getY()) * scaleH));

                 } else if (ch instanceof CTPath2DCubicBezierTo){

                     CTPath2DCubicBezierTo bez = ((CTPath2DCubicBezierTo)ch);

                     CTAdjPoint2D pt1 = bez.getPtArray(0);

@@ -137,8 +157,7 @@ public class XSLFFreeformShape extends XSLFAutoShape implements FreeformShape<XS
                             (float) (Units.toPoints((Long) pt2.getX()) * scaleW),

                             (float) (Units.toPoints((Long) pt2.getY()) * scaleH),

                             (float) (Units.toPoints((Long) pt3.getX()) * scaleW),

-                            (float) (Units.toPoints((Long) pt3.getY()) * scaleH)                    );

-

+                            (float) (Units.toPoints((Long) pt3.getY()) * scaleH));

                 } else if (ch instanceof CTPath2DClose){

                     path.closePath();

                 }