From 1a5e25a987e807be536173e891813dc8e3ab2186 Mon Sep 17 00:00:00 2001 From: Jason Harrop Date: Mon, 25 May 2015 21:07:53 +1000 Subject: [PATCH] Fix for https://github.com/plutext/docx4j/issues/146 (Word 2013 PDF output VML miterlimit attribute value such as "83231f" cannot be parsed as BigDecimal) --- src/main/java/org/docx4j/vml/CTStroke.java | 6 +++--- .../java/org/docx4j/vml/officedrawing/CTStrokeChild.java | 6 +++--- xsd/vml/vml-main.xsd | 2 +- xsd/vml/vml-officedrawing.xsd | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/docx4j/vml/CTStroke.java b/src/main/java/org/docx4j/vml/CTStroke.java index 549b68c15f..a4ab3275bc 100644 --- a/src/main/java/org/docx4j/vml/CTStroke.java +++ b/src/main/java/org/docx4j/vml/CTStroke.java @@ -92,7 +92,7 @@ public class CTStroke implements Child @XmlAttribute(name = "linestyle") protected STStrokeLineStyle linestyle; @XmlAttribute(name = "miterlimit") - protected BigDecimal miterlimit; + protected String miterlimit; @XmlAttribute(name = "joinstyle") protected STStrokeJoinStyle joinstyle; @XmlAttribute(name = "endcap") @@ -412,7 +412,7 @@ public void setLinestyle(STStrokeLineStyle value) { * {@link BigDecimal } * */ - public BigDecimal getMiterlimit() { + public String getMiterlimit() { return miterlimit; } @@ -424,7 +424,7 @@ public BigDecimal getMiterlimit() { * {@link BigDecimal } * */ - public void setMiterlimit(BigDecimal value) { + public void setMiterlimit(String value) { this.miterlimit = value; } diff --git a/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java b/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java index 71b3ca7ce9..e8e47c0ebd 100644 --- a/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java +++ b/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java @@ -102,7 +102,7 @@ public class CTStrokeChild @XmlAttribute(name = "linestyle") protected STStrokeLineStyle linestyle; @XmlAttribute(name = "miterlimit") - protected BigDecimal miterlimit; + protected String miterlimit; @XmlAttribute(name = "joinstyle") protected STStrokeJoinStyle joinstyle; @XmlAttribute(name = "endcap") @@ -298,7 +298,7 @@ public void setLinestyle(STStrokeLineStyle value) { * {@link BigDecimal } * */ - public BigDecimal getMiterlimit() { + public String getMiterlimit() { return miterlimit; } @@ -310,7 +310,7 @@ public BigDecimal getMiterlimit() { * {@link BigDecimal } * */ - public void setMiterlimit(BigDecimal value) { + public void setMiterlimit(String value) { this.miterlimit = value; } diff --git a/xsd/vml/vml-main.xsd b/xsd/vml/vml-main.xsd index 234b54c029..9a95721abc 100644 --- a/xsd/vml/vml-main.xsd +++ b/xsd/vml/vml-main.xsd @@ -450,7 +450,7 @@ xmlns:x="urn:schemas-microsoft-com:office:excel" Stroke Line Style - + Miter Joint Limit diff --git a/xsd/vml/vml-officedrawing.xsd b/xsd/vml/vml-officedrawing.xsd index efee39c65e..859da7dcbe 100644 --- a/xsd/vml/vml-officedrawing.xsd +++ b/xsd/vml/vml-officedrawing.xsd @@ -943,7 +943,7 @@ Stroke Line Style - + Miter Joint Limit