Fix for plutext#146

(Word 2013 PDF output VML miterlimit attribute value such as "83231f" cannot be parsed as BigDecimal)
jluyten · May 25, 2015 · 1a5e25a · 1a5e25a
1 parent 97b6515
commit 1a5e25a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -450,7 +450,7 @@ xmlns:x="urn:schemas-microsoft-com:office:excel"
         <xsd:documentation>Stroke Line Style</xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
-    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional">
+    <xsd:attribute name="miterlimit" type="xsd:string" use="optional">
       <xsd:annotation>
         <xsd:documentation>Miter Joint Limit</xsd:documentation>
       </xsd:annotation>

diff --git a/xsd/vml/vml-officedrawing.xsd b/xsd/vml/vml-officedrawing.xsd
@@ -943,7 +943,7 @@
         <xsd:documentation>Stroke Line Style</xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
-    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional">
+    <xsd:attribute name="miterlimit" type="xsd:string" use="optional">
       <xsd:annotation>
         <xsd:documentation>Miter Joint Limit</xsd:documentation>
       </xsd:annotation>