Changeset 995

Timestamp:

01/02/10 22:05:25 (2 years ago)

Author:

jharrop

Message:

misc

Location:

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

Files:

• XmlUtils.java (modified) (1 diff)
• convert/out/html/HtmlExporterNG.java (modified) (1 diff)
• fonts/IdentityPlusMapper.java (modified) (1 diff)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (2 diffs)
• openpackaging/parts/Part.java (modified) (1 diff)
• openpackaging/parts/WordprocessingML/MainDocumentPart.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/XmlUtils.java

@@ -771 +771 @@
                 case Node.DOCUMENT_NODE: // type 9
         
+//                      log.debug("DOCUMENT:" + w3CDomNodeToString(sourceNode) );
+//                      if (sourceNode.getChildNodes().getLength()==0) {
+//                              log.debug("..no children!");
+//                      }
+                        
                 // recurse on each child
                 NodeList nodes = sourceNode.getChildNodes();

trunk/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG.java

@@ -191 +191 @@
                         //     possibly via an extension function in the XSLT
                 }
-
-                
-
-                if (htmlSettings.getFontMapper()==null) {
-                        
-                        if (wmlPackage.getFontMapper()==null) {
-                                log.debug("Creating new Substituter.");
-//                              wmlPackage.setFontSubstituter(new SubstituterImplPanose());
-                                wmlPackage.setFontMapper(new IdentityPlusMapper());
-                        } else {
-                                log.debug("Using existing Substituter.");
-                        }
+                
+                if (htmlSettings.getFontMapper()==null) {                       
                         htmlSettings.setFontMapper(wmlPackage.getFontMapper());
                         log.debug("FontMapper set.. ");

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

@@ -114 +114 @@
                 if(pairs.getKey()==null) {
                         log.info("Skipped null key");
-                        pairs = (Map.Entry)documentFontMapIterator.next();
+                        continue;
+//                      pairs = (Map.Entry)documentFontMapIterator.next();
                 }
                 

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

@@ -312 +312 @@
 
     public void setFontMapper(Mapper fm) throws Exception {
+        log.debug("setFontMapper invoked");
         if (fm == null) {
                 throw new IllegalArgumentException("Font Substituter cannot be null.");
@@ -346 +347 @@
         if (fontMapper==null) {
                 fontMapper = new IdentityPlusMapper();
+                // This invokes populateFontMappings
+                try {
+                                setFontMapper(fontMapper);
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
         }
                 return fontMapper;

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/Part.java

@@ -101 +101 @@
          */
         private RelationshipsPart owningRelationshipPart;
+        
+        // TODO, instead of Part.getOwningRelationshipPart(),
+        // it would be better to have getOwningRelationship(),
+        // and if required, to get OwningRelationshipPart from that
+
                 
         public RelationshipsPart getOwningRelationshipPart() {

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

@@ -370 +370 @@
                                         traverseMainDocumentRecursive(hyperlink.getParagraphContent(),
                                                         fontsDiscovered, stylesInUse);
-                                } else if ( ((JAXBElement)o).getDeclaredType().getName().equals("org.docx4j.wml.R$Sym") ) {
-
-                                        org.docx4j.wml.R.Sym sym = (org.docx4j.wml.R.Sym)((JAXBElement)o).getValue(); 
+                                } else if ( fontsDiscovered !=null && ((JAXBElement)o).getDeclaredType().getName().equals("org.docx4j.wml.R$Sym") ) {
+
+                                        org.docx4j.wml.R.Sym sym = (org.docx4j.wml.R.Sym)((JAXBElement)o).getValue();
                                         fontsDiscovered.put(sym.getFont(), sym.getFont());