Changeset 1096 for trunk/docx4j/src/main/java/org/docx4j/model/styles/StyleTree.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/main/java/org/docx4j/model/styles/StyleTree.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/styles/StyleTree.java

@@ -60 +60 @@
          * @param allStyles styles defined in the style definitions part
          */
-        public StyleTree(List<String> stylesInUse, Map<String, Style> allStyles) {
+        public StyleTree(List<String> stylesInUse, Map<String, Style> allStyles,
+                        String defaultParagraphStyleId, String defaultCharacterStyleId) {
+                
                 
                 // Set up Table style tree 
@@ -82 +84 @@
                 // Set up Paragraph style tree 
         // but first, add Normal.  (Doesn't matter if its already there)
-                stylesInUse.add("Normal");
+                stylesInUse.add(defaultParagraphStyleId);
         for (String styleId : stylesInUse ) {
                 if (pTree.get(styleId)==null) {
@@ -102 +104 @@
                 // Set up Character style tree 
         // but first, add DefaultParagraphFont.  (Doesn't matter if its already there)
-                stylesInUse.add("DefaultParagraphFont");
+                stylesInUse.add(defaultCharacterStyleId);
         for (String styleId : stylesInUse ) {
                 if (cTree.get(styleId)==null) {
@@ -196 +198 @@
                 }
         
-                StyleTree st = new StyleTree(stylesInUse, allStyles);
+                StyleTree st = new StyleTree(stylesInUse, allStyles,
+                                wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultParagraphStyle().getStyleId(),
+                                wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultCharacterStyle().getStyleId());
                 
                 System.out.println("\nParagraph styles\n");