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

Timestamp:

08/13/10 09:44:39 (22 months ago)

Author:

jharrop

Message:

Support Word 2003 page numbers in PDF output. ie <w:fldChar w:fldCharType="begin"/> <w:instrText xml:space="preserve">PAGE </w:instrText>
<w:fldChar w:fldCharType="end"/>

File:

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

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

@@ -100 +100 @@
         
         public static final String PART_TRACKER = "partTracker";
+        public static final String FIELD_TRACKER = "fieldTracker";  // are we in a field or not?
         
         public Conversion(WordprocessingMLPackage wordMLPackage) {
@@ -313 +314 @@
                         modelStates.put("endnoteNumber", new EndnoteState() );
                         modelStates.put(PART_TRACKER, new PartTracker() );
+                        modelStates.put(FIELD_TRACKER, new InField() );
                         
                 Converter.getInstance().start(wordMLPackage);
@@ -866 +868 @@
                 NodeIterator childResults ) {
         
-        /* Support page numbering
+        /* Support page numbering.
+         * 
+         * Word 2007 emits:
          * 
          *  <w:fldSimple w:instr=" PAGE   \* MERGEFORMAT ">
@@ -889 +893 @@
                       
                     could also include start at value.
+                    
+                 *
+                 * Word 2003 emits:
+                 * 
+                 *       <w:instrText xml:space="preserve">PAGE  </w:instrText>
 
          */
         
-        try {
-
-                CTSimpleField field = null;
+
+        CTSimpleField field = null;
+        
+                try {
+                        field = (CTSimpleField)XmlUtils.unmarshal(
+                                                fldSimpleNodeIt.nextNode(), 
+                                                Context.jc, 
+                                                CTSimpleField.class);
+                } catch (JAXBException e1) {
+                        e1.printStackTrace();
+                }
+                        
+                String instr = field.getInstr();                        
+
+                return handleField(instr, childResults);
                 
-                        try {
-                                field = (CTSimpleField)XmlUtils.unmarshal(
-                                                        fldSimpleNodeIt.nextNode(), 
-                                                        Context.jc, 
-                                                        CTSimpleField.class);
-                        } catch (JAXBException e1) {
-                                e1.printStackTrace();
-                        }                       
-                
+        }
+        
+        private static DocumentFragment handleField(String instr, NodeIterator childResults) {
+                
+                try {
+                        
             // Create a DOM builder and parse the fragment
                 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();        
@@ -912 +930 @@
 
                         
-                        String instr = field.getInstr();                        
                         if ( !instr.toLowerCase().contains( "page") ) {
                                 
@@ -963 +980 @@
         
         return null;
+        
+    }
+
+    public static DocumentFragment createBlockForInstrText( 
+                WordprocessingMLPackage wmlPackage,
+                NodeIterator fldSimpleNodeIt,
+                NodeIterator childResults ) {
+        
+        /* Support page numbering.
+         * 
+                 * Word 2003 emits :
+                 * 
+                 *               <w:fldChar w:fldCharType="begin"/>
+                 * 
+                 *       <w:instrText xml:space="preserve">PAGE  </w:instrText>
+
+                                 <w:fldChar w:fldCharType="end"/>
+         */
+        
+        org.docx4j.wml.Text field = null;
+        
+                try {
+                        field = 
+                                (org.docx4j.wml.Text)XmlUtils.unmarshal(
+                                                fldSimpleNodeIt.nextNode(), 
+                                                Context.jc, 
+                                                org.docx4j.wml.Text.class);
+                } catch (JAXBException e1) {
+                        e1.printStackTrace();
+                }                       
+        
+                return handleField( field.getValue(), childResults);
         
     }