Changeset 1601 for trunk/docx4j/src/main

Timestamp:

07/09/11 04:22:08 (11 months ago)

Author:

jharrop

Message:

Handle case where pgMar header|footer null

Location:

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

Files:

• HeaderFooterPolicy.java (modified) (1 diff)
• PageDimensions.java (modified) (7 diffs)
• SectionWrapper.java (modified) (2 diffs)

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

@@ -99 +99 @@
                 // Grab what headers and footers have been defined              
                 if (sectPr == null) {
+                        log.debug("No headers/footers in this sectPr");
                         return;
                 }

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

@@ -23 +23 @@
 import java.math.BigInteger;
 
+import org.apache.log4j.Logger;
 import org.docx4j.jaxb.Context;
 import org.docx4j.wml.STPageOrientation;
@@ -44 +45 @@
 public class PageDimensions {
         
+        protected static Logger log = Logger.getLogger(PageDimensions.class);
+        
         // TODO - defaults page size and margins in a .properties file? 
         
@@ -75 +78 @@
                 
                 if (pgSz == null) {
+                        log.warn("No pgSz in this section; defaulting.");
                         pgSz = Context.getWmlObjectFactory().createSectPrPgSz();                        
+                        setPgSize(PageSizePaper.A4, false );
                 } else {
                         this.pgSz = pgSz;                       
@@ -81 +86 @@
                 
                 if (pgMar ==null) {
+                        log.warn("No pgMar in this section; defaulting.");
                         pgMar = Context.getWmlObjectFactory().createSectPrPgMar();                      
+                        setMargins(MarginsWellKnown.NORMAL);
                 } else {
                         this.pgMar = pgMar;                             
@@ -261 +268 @@
          * space occupied), it may be possible to do this automatically.   
          * 
-         */
-        
-        public int getHeaderExtent() {
+         * ------------------
+         * 
+         * pgMar.header  is the distance from the top edge of the paper to the top edge of the header
+         * 
+         * in XSL FO, extent is  the inline-progression-dimension of the region-start or region-end 
+         * or the block-progression-dimension of the region-before or region-after.
+         */
+        
+        /**
+         * Get the distance from the top edge of the paper to the top edge of the header
+         */
+        public int getHeaderMargin() {
                 if (pgMar.getHeader()==null 
                                 || pgMar.getHeader().intValue() ==0 ) {
@@ -272 +288 @@
         }
 
-        public int getFooterExtent() {
+        /**
+         * Get the distance from the bottom edge of the paper to the bottom edge of the footer
+         */
+        public int getFooterMargin() {
                 if (pgMar.getFooter()==null 
                                 || pgMar.getFooter().intValue() ==0 ) {
@@ -281 +300 @@
         }
         
+        int headerExtent = 708;
+        /**
+         * Get the height of the header. In Word, the size of header and footer areas can change dynamically;
+         * for PDF output, you need to set this appropriately.  It defaults to 708 TWIPs 
+         */
+        public int getHeaderExtent() {
+                return headerExtent;
+        }
+        public void setHeaderExtent(int headerExtent) {
+                this.headerExtent = headerExtent;
+        }
+
+        int footerExtent = 708;
+        /**
+         * Get the height of the footer. In Word, the size of header and footer areas can change dynamically;
+         * for PDF output, you need to set this appropriately.  It defaults to 708 TWIPs 
+         */
+        public int getFooterExtent() {
+                return footerExtent;
+        }
+        public void setFooterExtent(int footerExtent) {
+                this.footerExtent = footerExtent;
+        }
+        
 }

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

@@ -21 +21 @@
 
 
+import org.apache.log4j.Logger;
 import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
 import org.docx4j.wml.SectPr;
@@ -26 +27 @@
 public class SectionWrapper {
         
+        protected static Logger log = Logger.getLogger(SectionWrapper.class);           
+        
         protected SectionWrapper(SectPr sectPr, HeaderFooterPolicy previousHF, RelationshipsPart rels) {
                 // This should work even if sectPr is null
                 this.sectPr = sectPr;
+                if (sectPr==null) {
+                        log.warn("No (document level?) sectPr!");
+                }
                 this.headerFooterPolicy = new HeaderFooterPolicy(sectPr, previousHF, rels);