Changeset 168

Timestamp:

03/10/08 12:50:17 (4 years ago)

Author:

jharrop

Message:

Create a font table part, if there isn't one in the document.

Location:

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

Files:

• fonts/Substituter.java (modified) (2 diffs)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (1 diff)
• openpackaging/parts/WordprocessingML/FontTablePart.java (modified) (2 diffs)
• openpackaging/parts/WordprocessingML/fontTable.xml (added)

trunk/docx4j/src/main/java/org/docx4j/fonts/Substituter.java

@@ -317 +317 @@
         }
         
+        
         public void populateFontMappings(Map documentFontNames, org.docx4j.wml.Fonts fonts ) throws Exception {
                 
@@ -326 +327 @@
                  *     org.docx4j.wml.Fonts fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
                  *     
+                 * If the document doesn't have a font table, 
+                 *     
+                 *              org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart fontTable 
+                 *                      = new org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart();
+                 *              fontTable.unmarshalDefaultFonts();
+                 *           
                  * We need to make a map out of it.    
                  */ 

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

@@ -265 +265 @@
                 //     - do this in a general way, since docx4all needs this as well to display fonts           
                 fontSubstituter = new Substituter();
-                FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();             
-                org.docx4j.wml.Fonts fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();              
+                org.docx4j.wml.Fonts fonts = null;
+                FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();     
+                
+                if (fontTablePart!=null) {
+                        fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
+                } else {
+                        log.warn("FontTable missing; creating default part.");
+                        fontTablePart= new org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart();
+                        fontTablePart.unmarshalDefaultFonts();                                  
+                }
                 
                 fontSubstituter.populateFontMappings(fontsInUse, fonts);

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FontTablePart.java

@@ -23 +23 @@
 
 //import javax.xml.bind.JAXBElement;
+import java.io.IOException;
+
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
@@ -100 +102 @@
         
     }
+    
+    /**
+     * Unmarshal a default font table, useful when creating this
+     * part from scratch. 
+     *
+     * @return the newly created root object of the java content tree 
+     *
+     * @throws JAXBException 
+     *     If any unexpected errors occur while unmarshalling
+     */
+    public Object unmarshalDefaultFonts() throws JAXBException {
+          
+                java.io.InputStream is = null;
+                        try {
+                                // Works in Eclipse - not absence of leading '/'
+                                is = org.docx4j.utils.ResourceUtils.getResource("org/docx4j/openpackaging/parts/WordprocessingML/fontTable.xml");
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }               
+        
+        return unmarshal( is );         
+    }
+    
 
 }