Changeset 1567 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

06/25/11 11:45:55 (11 months ago)

Author:

jharrop

Message:

Rework/cleanup PageDimensions?

Location:

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

Files:

• packages/WordprocessingMLPackage.java (modified) (1 diff)
• parts/DrawingML/CreateDocxWithSmartArt.java (modified) (2 diffs)

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

@@ -408 +408 @@
                 // Create a basic sectPr using our Page model
                 PageDimensions page = new PageDimensions();
+                page.setPgSize(sz, landscape);
+                
                 SectPr sectPr = factory.createSectPr();
                 body.setSectPr(sectPr);
-                sectPr.setPgSz(PageDimensions.createPgSize(sz, landscape) );
-                sectPr.setPgMar(page.createPgMar());
+                sectPr.setPgSz(  page.getPgSz() );
+                sectPr.setPgMar( page.getPgMar() );
                                 
                 // Put the content in the part

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateDocxWithSmartArt.java

@@ -67 +67 @@
                         MarginsWellKnown margins, 
                         Document xml) throws Exception {
-                
-                // TODO: pass in page size and orientation,
-                // and scale the SmartArt to fill the page.
-                                
+                                                
                 // Make a basic docx
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage(sz, landscape);           
@@ -97 +94 @@
 
                 // Occupy entire page, less margins
-                PgSz pgSz = PageDimensions.createPgSize(sz, landscape );
                 PageDimensions pd = new PageDimensions();
+                pd.setPgSize(sz, landscape );
+                PgSz pgSz = pd.getPgSz(); 
                 pd.setMargins(margins);
-                String cx =  ""+UnitsOfMeasurement.twipToEMU(pgSz.getW().intValue() - (pd.getMarginLeft()+pd.getMarginRight() ) );  //"5486400";
-                String cy = ""+UnitsOfMeasurement.twipToEMU(pgSz.getH().intValue() - (pd.getMarginTop()+pd.getMarginBottom() ));   //"3200400";
+                String cx =  ""+UnitsOfMeasurement.twipToEMU(pgSz.getW().intValue() 
+                                - (pd.getPgMar().getLeft().intValue()+pd.getPgMar().getRight().intValue() ) );  //"5486400";
+                String cy = ""+UnitsOfMeasurement.twipToEMU(pgSz.getH().intValue() 
+                                - (pd.getPgMar().getTop().intValue()+pd.getPgMar().getBottom().intValue() ));   //"3200400";
                 
                 // Now use it in the docx