Changeset 966

Timestamp:

10/30/09 13:40:15 (3 years ago)

Author:

jharrop

Message:

Register other sections in DocumentModel?.

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• model/structure/DocumentModel.java (modified) (3 diffs)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (1 diff)
• samples/OpenMainDocumentAndTraverse.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/model/structure/DocumentModel.java

@@ -24 +24 @@
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
@@ -51 +52 @@
 public class DocumentModel {
         
+        protected static Logger log = Logger.getLogger(DocumentModel.class);            
+        
         private List<SectionWrapper> sections = new ArrayList<SectionWrapper>(); 
         
@@ -66 +69 @@
                 
                 RelationshipsPart rels = wordMLPackage.getMainDocumentPart().getRelationshipsPart();
+                                
+                Document doc = (Document)wordMLPackage.getMainDocumentPart().getJaxbElement();
                 
-                // For now, we only capture the document level one
+                for (Object o : doc.getBody().getEGBlockLevelElts() ) {
+                        if (o instanceof org.docx4j.wml.P) {
+                                if (((org.docx4j.wml.P)o).getPPr() != null ) {
+                                        org.docx4j.wml.PPr ppr = ((org.docx4j.wml.P)o).getPPr();
+                                        if (ppr.getSectPr()!=null) {
+                                                sections.add(
+                                                                new SectionWrapper(
+                                                                                ppr.getSectPr(), rels) );
+                                                log.debug( "registered sectpr");                                                
+                                        }
+                                }
+                        }
+                }
                 
-                Document doc = (Document)wordMLPackage.getMainDocumentPart().getJaxbElement();
+                
                 SectPr sectPr = doc.getBody().getSectPr();      
                 // There might not be a sectPr, but we still add a SectionWrapper to

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -119 +119 @@
         @Deprecated     
         public HeaderFooterPolicy getHeaderFooterPolicy() {
-                
-                return getDocumentModel().getSections().get(0).getHeaderFooterPolicy();
+                int last = getDocumentModel().getSections().size();
+                if (last>0) {
+                        return getDocumentModel().getSections().get(last).getHeaderFooterPolicy();
+                } else {
+                        return null;
+                }
         }
         

trunk/docx4j/src/main/java/org/docx4j/samples/OpenMainDocumentAndTraverse.java

@@ -123 +123 @@
 //              DocumentSettingsPart dsp = (DocumentSettingsPart)documentPart.getRelationshipsPart().getPart(r);
 //              System.out.println(dsp.getJaxbElement().getClass().getName() );
+                
+                // Look at our document model
+                System.out.println("Registered " + wordMLPackage.getDocumentModel().getSections().size() + " sections");