Changeset 715 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

03/23/09 03:20:06 (3 years ago)

Author:

jharrop

Message:

Mainly, createPdf demo which creates a document containing all fonts discovered on the system.

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (2 diffs)

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

@@ -36 +36 @@
 import org.apache.log4j.Logger;
 import org.docx4j.convert.out.xmlPackage.XmlPackage;
+import org.docx4j.fonts.BestMatchingMapper;
 import org.docx4j.fonts.Mapper;
 import org.docx4j.fonts.FontUtils;
@@ -257 +258 @@
                 throw new IllegalArgumentException("Font Substituter cannot be null.");
         }
+                fontMapper = fm;
+                org.docx4j.wml.Fonts fonts = null;
+
                 // 1.  Get a list of all the fonts in the document
                 java.util.Map fontsInUse = this.getMainDocumentPart().fontsInUse();
                 
-                // 2.  For each font, find the closest match on the system (use OO's VCL.xcu to do this)
-                //     - do this in a general way, since docx4all needs this as well to display fonts           
-                fontMapper = fm;
-                org.docx4j.wml.Fonts fonts = null;
-                FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();     
-                
-                if (fontTablePart==null) {
-                        log.warn("FontTable missing; creating default part.");
-                        fontTablePart= new org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart();
-                        fontTablePart.unmarshalDefaultFonts();
-                        fontTablePart.processEmbeddings();
-                }
-                
-                fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
+                if ( fm instanceof BestMatchingMapper ) {
+                        
+                        
+                        // 2.  For each font, find the closest match on the system (use OO's VCL.xcu to do this)
+                        //     - do this in a general way, since docx4all needs this as well to display fonts           
+                        FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();     
+                        
+                        if (fontTablePart==null) {
+                                log.warn("FontTable missing; creating default part.");
+                                fontTablePart= new org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart();
+                                fontTablePart.unmarshalDefaultFonts();
+                                fontTablePart.processEmbeddings();
+                        }
+                        
+                        fonts = (org.docx4j.wml.Fonts)fontTablePart.getJaxbElement();
+                }
+                
                 fontMapper.populateFontMappings(fontsInUse, fonts);