@XmlRootElement (reinstate in dml cases)

jluyten · May 20, 2019 · 177c165 · 177c165
1 parent 11b4cff
commit 177c165
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 1 deletion.
diff --git a/docx4j-openxml-objects-pml/src/main/java/org/pptx4j/pml/Shape.java b/docx4j-openxml-objects-pml/src/main/java/org/pptx4j/pml/Shape.java
@@ -24,6 +24,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTNonVisualDrawingProps;
@@ -79,6 +80,7 @@
     "txBody",
     "extLst"
 })
+@XmlRootElement(name="sp")
 public class Shape implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/chart/CTChartSpace.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/chart/CTChartSpace.java
@@ -25,6 +25,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTColorMapping;
@@ -82,9 +83,9 @@
     "userShapes",
     "extLst"
 })
+@XmlRootElement(name = "chartSpace")
 public class CTChartSpace implements Child
 {
-
     protected CTBoolean date1904;
     protected CTTextLanguageID lang;
     protected CTBoolean roundedCorners;

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/chart/x2007/CTInvertSolidFillFmt.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/chart/x2007/CTInvertSolidFillFmt.java
@@ -5,6 +5,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTShapeProperties;
@@ -34,6 +35,7 @@
 @XmlType(name = "CT_InvertSolidFillFmt", propOrder = {
     "spPr"
 })
+@XmlRootElement(name = "invertSolidFillFmt")
 public class CTInvertSolidFillFmt implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTColorTransform.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTColorTransform.java
@@ -27,6 +27,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTOfficeArtExtensionList;
@@ -66,6 +67,7 @@
     "styleLbl",
     "extLst"
 })
+@XmlRootElement(name="colorsDef")
 public class CTColorTransform implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDataModel.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDataModel.java
@@ -25,6 +25,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTBackgroundFormatting;
@@ -64,6 +65,7 @@
     "whole",
     "extLst"
 })
+@XmlRootElement(name = "dataModel")
 public class CTDataModel implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java
@@ -28,6 +28,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTOfficeArtExtensionList;
@@ -74,6 +75,7 @@
     "layoutNode",
     "extLst"
 })
+@XmlRootElement(name = "layoutDef")
 public class CTDiagramDefinition implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java
@@ -28,6 +28,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTOfficeArtExtensionList;
@@ -67,6 +68,7 @@
     "catLst",
     "extLst"
 })
+@XmlRootElement(name = "layoutDefHdr")
 public class CTDiagramDefinitionHeader implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java
@@ -28,6 +28,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTOfficeArtExtensionList;
@@ -70,6 +71,7 @@
     "styleLbl",
     "extLst"
 })
+@XmlRootElement(name="styleDef")
 public class CTStyleDefinition implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java
@@ -5,6 +5,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.ppp.Child;
@@ -33,6 +34,7 @@
 @XmlType(name = "CT_Drawing", propOrder = {
     "spTree"
 })
+@XmlRootElement(name = "drawing")
 public class CTDrawing implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/picture/Pic.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/picture/Pic.java
@@ -25,6 +25,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.docx4j.dml.CTBlipFillProperties;
@@ -59,6 +60,7 @@
     "blipFill",
     "spPr"
 })
+@XmlRootElement(name = "pic")
 public class Pic implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java b/docx4j-openxml-objects/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java
@@ -28,6 +28,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.ppp.Child;
@@ -56,6 +57,7 @@
 @XmlType(name = "CT_Drawing", propOrder = {
     "egAnchor"
 })
+@XmlRootElement(name = "wsDr")
 public class CTDrawing implements Child
 {
 

diff --git a/docx4j-openxml-objects/src/main/java/org/docx4j/org/w3/x2003/inkML/InkType.java b/docx4j-openxml-objects/src/main/java/org/docx4j/org/w3/x2003/inkML/InkType.java
@@ -9,6 +9,7 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -47,6 +48,7 @@
 @XmlType(name = "ink.type", propOrder = {
     "definitionsOrContextOrTrace"
 })
+@XmlRootElement(name = "ink")
 public class InkType implements Child
 {