Changeset 1096 for trunk/docx4j/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java

Timestamp:

02/27/10 06:52:46 (2 years ago)

Author:

jharrop

Message:

Moved jcPML to org.pptx4j.jaxb.Context

Don't assume default paragraph,character styles are Normal,Default.. respectively.

File:

• trunk/docx4j/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java (modified) (3 diffs)

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

@@ -30 +30 @@
 import org.apache.log4j.Logger;
 import org.docx4j.XmlUtils;
-import org.docx4j.dml.CTTextListStyle;
-import org.docx4j.dml.BaseStyles.FontScheme;
-import org.docx4j.jaxb.Context;
 import org.docx4j.model.styles.StyleTree;
 import org.docx4j.openpackaging.contenttype.ContentType;
@@ -52 +49 @@
 import org.docx4j.wml.Style;
 import org.pptx4j.convert.out.svginhtml.SvgExporter;
+import org.pptx4j.jaxb.Context;
 import org.pptx4j.model.ResolvedLayout;
 import org.pptx4j.model.ShapeWrapper;
 import org.pptx4j.model.TextStyles;
-import org.pptx4j.pml.CommonSlideData;
 import org.pptx4j.pml.GroupShape;
 import org.pptx4j.pml.SldLayout;
@@ -253 +250 @@
                                 list.add(s.getStyleId());
                         }
-                        styleTree = new StyleTree(list, map);
+                        styleTree = new StyleTree(list, map, "DocDefaults", "DocDefaults");
+                                // We don't have defaultParagraphStyleId, defaultCharacterStyleId
+                                // so use DocDefaults for now.
                 }
                 return styleTree;