support mc:AlternateContent in slide shape tree

jluyten · May 4, 2019 · d1bc3a4 · d1bc3a4
1 parent 955feb4
commit d1bc3a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/docx4j-openxml-objects-pml/src/main/java/org/pptx4j/pml/GroupShape.java b/docx4j-openxml-objects-pml/src/main/java/org/pptx4j/pml/GroupShape.java
@@ -31,6 +31,7 @@
 import org.docx4j.dml.CTGroupShapeProperties;
 import org.docx4j.dml.CTNonVisualDrawingProps;
 import org.docx4j.dml.CTNonVisualGroupDrawingShapeProps;
+import org.docx4j.mce.AlternateContent;
 
 import org.jvnet.jaxb2_commons.ppp.Child;
 
@@ -96,7 +97,8 @@ public class GroupShape implements Child
         @XmlElement(name = "graphicFrame", type = CTGraphicalObjectFrame.class),
         @XmlElement(name = "cxnSp", type = CxnSp.class),
         @XmlElement(name = "pic", type = Pic.class),
-        @XmlElement(name = "contentPart", type = CTRel.class)
+        @XmlElement(name = "contentPart", type = CTRel.class),
+        @XmlElement(name = "AlternateContent", namespace = "http://schemas.openxmlformats.org/markup-compatibility/2006", type = AlternateContent.class)
     })
     protected List<Object> spOrGrpSpOrGraphicFrame;
     protected CTExtensionListModify extLst;
@@ -175,6 +177,7 @@ public void setGrpSpPr(CTGroupShapeProperties value) {
      * {@link CxnSp }
      * {@link Pic }
      * {@link CTRel }
+     * {@link AlternateContent }
      * 
      * 
      */

diff --git a/xsd/pml/pml-2ed.xsd b/xsd/pml/pml-2ed.xsd
@@ -29,6 +29,10 @@ WHICH VERSION?
 USAGE INSTRUCTIONS
 	  
   To generate java classes, you need xjc.
+  
+	20190429: 		 
+	sh /bvols/\@Overflow/No_COW//java/jaxb-ri-2.2.11/bin/xjc.sh -classpath  /bvols/\@Overflow/No_COW/java/parent-pointer-plugin-1.2.jar -Xparent-pointer pml-2ed.xsd -d tmp  -no-header -target 2.0
+  
 			
  	 sh ~/jaxb-ri-20071219/bin/xjc.sh pml-2ed.xsd -d ~/workspace/docx4j/src/pptx4j/java -no-header -target 2.0
 	 	   
@@ -3942,6 +3946,9 @@ PRINCIPLES:
 						<xsd:documentation>Content Part</xsd:documentation>
 					</xsd:annotation>
 				</xsd:element>
+				<!--  added docx4j 8.1.0 -->
+				<xsd:element ref="mc:AlternateContent" />
+
 			</xsd:choice>
 			<xsd:element name="extLst" type="CT_ExtensionListModify" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>