Changeset 1722 for trunk/docx4j/src

Timestamp:

11/29/11 13:21:39 (6 months ago)

Author:

jharrop

Message:

Word might put w:proofErr in a run-level content control. So our XHTML paragraph to run level conversion now handles that case.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java

@@ -269 +269 @@
 
                         log.info("convertXHTML extension function");
+                        log.info("contentChild: " + contentChild);
                         
                         String r = xpathGetString(pkg, customXmlDataStorageParts, storeItemId, xpath, prefixMappings);
@@ -290 +291 @@
                                 
                                 if (results.size()>0 && 
-                                                contentChild.equals("r") ) {
+                                                (contentChild.equals("r")
+                                                                || contentChild.equals("proofErr")
+                                                                // TODO: is there other inline content Word might put into a content control?
+                                                                ) ) {
                                         // Only accept the first result object
                                         
@@ -662 +666 @@
                         Xpath xpath = xPathsPart.getXPathById(xPathsPart.getJaxbElement(), xpathId);
                         
+                        if (xpath==null) {
+                                log.warn("Couldn't find xpath with id: " + xpathId);
+                                return null;
+                        }
+                        
                         String storeItemId = xpath.getDataBinding().getStoreItemID();
                         String xpathExp = xpath.getDataBinding().getXpath();