Changeset 1602 for trunk/docx4j/src/main/java/org

Timestamp:

07/09/11 04:23:16 (11 months ago)

Author:

jharrop

Message:

Handle case where pgMar header|footer null

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java (modified) (5 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java

@@ -1 +1 @@
 package org.docx4j.convert.out.pdf.viaXSLFO;
 
+import java.math.BigInteger;
 import java.util.List;
 
@@ -122 +123 @@
         }
         
-        private static PageSequenceMaster createPageSequenceMaster(HeaderFooterPolicy hf, String sectionName ) {
+        private static PageSequenceMaster createPageSequenceMaster(HeaderFooterPolicy hf, 
+                        String sectionName ) {
                 
                 PageSequenceMaster psm = factory.createPageSequenceMaster();
@@ -178 +180 @@
         
         private static SimplePageMaster createSimplePageMaster( 
-                        String masterName, PageDimensions page, String appendRegionName, boolean needBefore, boolean needAfter) {
+                        String masterName, PageDimensions page, String appendRegionName, 
+                        boolean needBefore, boolean needAfter) {
                 
                 SimplePageMaster spm = factory.createSimplePageMaster();
@@ -225 +228 @@
                         spm.setRegionBefore(rBefore);
 
-                        // Make margin smaller, because header takes up space it would otherwise occupy  
+                        // Make margin smaller, because header takes up space it would otherwise occupy                 
                         int marginTopTwips 
                                 = page.getPgMar().getTop().intValue() 
-                                        - (HEADER_PADDING_TWIP + page.getHeaderExtent() + page.getPgMar().getHeader().intValue());
+                                        - (HEADER_PADDING_TWIP + page.getHeaderExtent() + page.getHeaderMargin() );
                         if (marginTopTwips<MIN_PAGE_MARGIN) marginTopTwips=MIN_PAGE_MARGIN;                             
                         spm.setMarginTop( UnitsOfMeasurement.twipToBest(marginTopTwips ) );
@@ -252 +255 @@
                         int marginBottomTwips
                                         = page.getPgMar().getBottom().intValue()
-                                                - (FOOTER_PADDING_TWIP + page.getFooterExtent() + page.getPgMar().getFooter().intValue() );
+                                                - (FOOTER_PADDING_TWIP + page.getFooterExtent() + page.getFooterMargin() );
                         if (marginBottomTwips<MIN_PAGE_MARGIN) marginBottomTwips=MIN_PAGE_MARGIN;                       
                         log.debug("marginBottomTwips: " + marginBottomTwips );