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

Timestamp:

11/16/11 11:48:24 (6 months ago)

Author:

jharrop

Message:

Where section type is null, insert a new page sequence. It is not clear exactly how Word 2007 chooses whether to treat a section as continuous.

File:

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

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

@@ -296 +296 @@
                                         Context.jcSectionModel);
 
+                        log.debug(XmlUtils.marshaltoString(sections, false, Context.jcSectionModel));
+                        
                         if (settings == null) {
                                 settings = new PdfSettings();
@@ -401 +403 @@
                                         org.docx4j.wml.PPr ppr = ((org.docx4j.wml.P)o).getPPr();
                                         if (ppr.getSectPr()!=null) {
+
+                                                // According to the ECMA-376 2ed, if type is not specified, read it as next page
+                                                // However Word 2007 sometimes treats it as continuous, and sometimes doesn't??                                         
                                                 
-                                                if (ppr.getSectPr().getType()==null
-                                                                || ( ppr.getSectPr().getType()!=null
-                                                                     && ppr.getSectPr().getType().getVal().equals("continuous"))) {
+                                                if ( ppr.getSectPr().getType()!=null
+                                                                     && ppr.getSectPr().getType().getVal().equals("continuous")) {
                                                         // If its continuous, don't add a section
-                                                        // According to the ECMA-376 2ed, if type is not specified, read it as next page
-                                                        // However Word 2007 treats it as continuous, so we do the same here.
                                                 } else {
                                                         section = factory.createSectionsSection();