Changeset 943 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

10/25/09 12:08:24 (2 years ago)

Author:

jharrop

Message:

Added DocumentModel?. DocumentModel? is a list of SectionWrappers?; a SectionWrapper? has a HeaderFooterPolicy?, PageDimensions? and sectPr.
HeaderFooterPolicy? moved to new package, as there will be 1 per SectionWrapper?.

TblFactory? is a way to create simple tables; now used in the Create..Document sample.

Debug of JAXBElement.
NamespacePrefixMapper?: convenient static method.

WordXmlPicture?: add @id,containing relId.

MDP styles in use:recurse into tables

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (4 diffs)

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

@@ -41 +41 @@
 import org.docx4j.fonts.Mapper;
 import org.docx4j.jaxb.Context;
-import org.docx4j.model.HeaderFooterPolicy;
+import org.docx4j.model.structure.DocumentModel;
+import org.docx4j.model.structure.HeaderFooterPolicy;
+import org.docx4j.model.structure.PageDimensions;
 import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
@@ -59 +61 @@
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
 import org.docx4j.wml.Document;
+import org.docx4j.wml.SectPr;
 import org.docx4j.wml.Styles;
 
@@ -104 +107 @@
         protected GlossaryDocumentPart glossaryDoc;
         
-        private HeaderFooterPolicy headerFooterPolicy;
+        private DocumentModel documentModel;
+        public DocumentModel getDocumentModel() {
+                if (documentModel==null) {
+                        documentModel = new DocumentModel(this);
+                }
+                return documentModel;
+        }
+        
+        
+        private HeaderFooterPolicy headerFooterPolicy;  
+        @Deprecated     
         public HeaderFooterPolicy getHeaderFooterPolicy() {
-                if (headerFooterPolicy==null) {
-                        headerFooterPolicy = new HeaderFooterPolicy(this);
-                }
-                return headerFooterPolicy;
-        }
-        public void setHeaderFooterPolicy(HeaderFooterPolicy headerFooterPolicy) {
-                this.headerFooterPolicy = headerFooterPolicy;
-        }
-        
+                
+                return getDocumentModel().getSections().get(0).getHeaderFooterPolicy();
+        }
         
         /**
@@ -355 +362 @@
                 org.docx4j.wml.Document wmlDocumentEl = factory.createDocument();
                 wmlDocumentEl.setBody(body);
+                
+                // Create a basic sectPr using our Page model
+                PageDimensions page = new PageDimensions();
+                SectPr sectPr = factory.createSectPr();
+                body.setSectPr(sectPr);
+                sectPr.setPgSz(page.createPgSize() );
+                sectPr.setPgMar(page.createPgMar());
                                 
                 // Put the content in the part