Changeset 985

Timestamp:

01/02/10 14:47:04 (2 years ago)

Author:

jharrop

Message:

new WML package method getDefaultFont()

Location:

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

Files:

• model/properties/run/Font.java (modified) (1 diff)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (1 diff)
• openpackaging/parts/WordprocessingML/MainDocumentPart.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/model/properties/run/Font.java

@@ -67 +67 @@
                 
                 String font = rFonts.getAscii();                
-                if (font==null) {
-                        // TODO - actually what Word does in this case
-                        // is inherit the default document font eg Calibri
-                        // (which is what it shows in its user interface)
-                        font = rFonts.getCs();
-                }
                 
                 if (font==null) {
-                        log.error("Font was null in: " + XmlUtils.marshaltoString(object, true, true));
-                        
-                        /* TODO - handle
-                         *  <w:rFonts w:cstheme="minorBidi"     w:eastAsiaTheme="minorHAnsi" 
-                         *            w:hAnsiTheme="minorHAnsi" w:asciiTheme="minorHAnsi" />
-                         */
-                        
-                        log.error("Font was null in RFonts; falling back to " + Mapper.FONT_FALLBACK );
-                        font=Mapper.FONT_FALLBACK;
+                        font=wmlPackage.getDefaultFont();
                 }
                 

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

@@ -351 +351 @@
 
         private Mapper fontMapper;
+        
+        
+        private String defaultFont;
+        public String getDefaultFont() {
+                
+                if (defaultFont!=null) {
+                        defaultFont = mainDoc.getPropertyResolver().getDefaultFont();                   
+                }
+                return defaultFont;             
+        }
         
 

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

@@ -211 +211 @@
         // Add default font
                 //String defaultFont = PropertyResolver.getDefaultFont(this.getStyleDefinitionsPart(), this.getThemePart());
-                String defaultFont = getPropertyResolver().getDefaultFont();
-                log.debug("fontsDiscovered.put:" + defaultFont);
-                fontsDiscovered.put( defaultFont, defaultFont  );
+//              String defaultFont = getPropertyResolver().getDefaultFont();
+//              log.debug("fontsDiscovered.put:" + defaultFont);
+//              fontsDiscovered.put( defaultFont, defaultFont  );
+                fontsDiscovered.put( ((WordprocessingMLPackage)pack).getDefaultFont(), ((WordprocessingMLPackage)pack).getDefaultFont() );
                 
         // Add fonts used in the styles we discovered