Changeset 1198

Timestamp:

09/02/10 19:35:27 (17 months ago)

Author:

jharrop

Message:

Method for creating a slide; don't do that when creating package.

Location:

trunk/docx4j/src/pptx4j/java/org

Files:

• docx4j/openpackaging/packages/PresentationMLPackage.java (modified) (4 diffs)
• pptx4j/samples/CreateHelloWorld.java (modified) (2 diffs)

trunk/docx4j/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Map;
+
+import javax.xml.bind.JAXBException;
 
 import org.apache.log4j.Logger;
@@ -143 +145 @@
                         pmlPack.addTargetPart(pp);              
                         
-                        // Slide part
-                        SlidePart slidePart = new SlidePart();
-                        pp.addSlideIdListEntry(slidePart);
-
-                        slidePart.setJaxbElement( SlidePart.createSld() );
+//                      // Slide part
+//                      SlidePart slidePart = new SlidePart();
+//                      pp.addSlideIdListEntry(slidePart);
+//
+//                      slidePart.setJaxbElement( SlidePart.createSld() );
                         
                         // Slide layout part
@@ -153 +155 @@
                         layoutPart.setJaxbElement( SlideLayoutPart.createSldLayout() );
                         
-                        slidePart.addTargetPart(layoutPart);
+//                      slidePart.addTargetPart(layoutPart);
                         
                         // Slide Master part
@@ -186 +188 @@
                 
         }
+        
+        /**
+         * Create a slide and add it to the package
+         * 
+         * @param pp
+         * @param layoutPart
+         * @param partName
+         * @return the slide
+         * @throws InvalidFormatException
+         * @throws JAXBException
+         */
+        public static SlidePart createSlidePart(MainPresentationPart pp, SlideLayoutPart layoutPart, PartName partName) 
+                throws InvalidFormatException, JAXBException {
+                
+                // Slide part
+                SlidePart slidePart = new SlidePart(partName);
+                pp.addSlideIdListEntry(slidePart);
+
+                slidePart.setJaxbElement( SlidePart.createSld() );
+                
+                // Slide layout part
+                slidePart.addTargetPart(layoutPart);
+                
+                return slidePart;
+        }
+        
         
         private static String SAMPLE_SHAPE =                    

trunk/docx4j/src/pptx4j/java/org/pptx4j/samples/CreateHelloWorld.java

@@ -27 +27 @@
 import org.docx4j.openpackaging.packages.PresentationMLPackage;
 import org.docx4j.openpackaging.parts.PartName;
+import org.docx4j.openpackaging.parts.PresentationML.MainPresentationPart;
+import org.docx4j.openpackaging.parts.PresentationML.SlideLayoutPart;
 import org.docx4j.openpackaging.parts.PresentationML.SlidePart;
 import org.pptx4j.pml.Shape;
@@ -45 +47 @@
                 String outputfilepath = System.getProperty("user.dir") + "/sample-docs/pptx-test.pptx";
                 
-                // Create skeletal package
+                // Create skeletal package, including a MainPresentationPart and a SlideLayoutPart
                 PresentationMLPackage presentationMLPackage = PresentationMLPackage.createPackage(); 
                 
-                // It contains a first slide; get it ..
-                // TODO - add convenience methods?
-                SlidePart slidePart = (SlidePart)presentationMLPackage.getParts().getParts().get(
+                // Need references to these parts to create a slide
+                MainPresentationPart pp = (MainPresentationPart)presentationMLPackage.getParts().getParts().get(
+                                new PartName("/ppt/presentation.xml"));         
+                SlideLayoutPart layoutPart = (SlideLayoutPart)presentationMLPackage.getParts().getParts().get(
+                                new PartName("/ppt/slideLayouts/slideLayout1.xml"));
+                
+                // OK, now we can create a slide
+                SlidePart slidePart = presentationMLPackage.createSlidePart(pp, layoutPart, 
                                 new PartName("/ppt/slides/slide1.xml"));
-                
+                                
                 // Create and add shape
                 Shape sample = ((Shape)XmlUtils.unmarshalString(SAMPLE_SHAPE, Context.jcPML) );