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

Timestamp:

03/13/08 04:52:50 (4 years ago)

Author:

jojada

Message:

Added fontSubstituter setter

File:

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

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

@@ -22 +22 @@
 
 import java.io.OutputStream;
-
 import java.util.Iterator;
 import java.util.Map;
@@ -29 +28 @@
 import javax.xml.bind.Marshaller;
 
-import org.apache.fop.fonts.EmbedFontInfo;
 import org.apache.log4j.Logger;
 import org.docx4j.fonts.Substituter;
 import org.docx4j.jaxb.Context;
+import org.docx4j.openpackaging.contenttype.ContentType;
+import org.docx4j.openpackaging.contenttype.ContentTypeManager;
+import org.docx4j.openpackaging.contenttype.ContentTypes;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
+import org.docx4j.openpackaging.exceptions.InvalidFormatException;
+import org.docx4j.openpackaging.io.LoadFromZipFile;
+import org.docx4j.openpackaging.io.SaveToZipFile;
 import org.docx4j.openpackaging.parts.DocPropsCorePart;
 import org.docx4j.openpackaging.parts.DocPropsCustomPart;
@@ -41 +46 @@
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
-
-import org.docx4j.openpackaging.contenttype.ContentType;
-import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypes;
-import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.exceptions.InvalidFormatException;
-import org.docx4j.openpackaging.io.LoadFromZipFile;
-import org.docx4j.openpackaging.io.SaveToZipFile;
-import org.xhtmlrenderer.pdf.ITextRenderer;
-
-import com.lowagie.text.DocumentException;
 
 
@@ -293 +287 @@
                 //     possibly via an extension function in the XSLT
                 if (fontSubstituter==null) {
-                        setFontSubstituter();
+                        setFontSubstituter(new Substituter());
                 }
                 xformer.setParameter("substituterInstance", fontSubstituter);
@@ -309 +303 @@
     }
     
-    public void setFontSubstituter() throws Exception {
-        
+    public void setFontSubstituter(Substituter fs) throws Exception {
+        if (fs == null) {
+                throw new IllegalArgumentException("Font Substituter cannot be null.");
+        }
                 // 1.  Get a list of all the fonts in the document
                 java.util.Map fontsInUse = this.getMainDocumentPart().fontsInUse();
@@ -316 +312 @@
                 // 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           
-                fontSubstituter = new Substituter();
+                fontSubstituter = fs;
                 org.docx4j.wml.Fonts fonts = null;
                 FontTablePart fontTablePart= this.getMainDocumentPart().getFontTablePart();     
@@ -323 +319 @@
                         log.warn("FontTable missing; creating default part.");
                         fontTablePart= new org.docx4j.openpackaging.parts.WordprocessingML.FontTablePart();
-                        fontTablePart.unmarshalDefaultFonts();                                  
+                        fontTablePart.unmarshalDefaultFonts();
+                        fontTablePart.processEmbeddings();
                 }