Changeset 1514 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

05/29/11 11:33:42 (12 months ago)

Author:

jharrop

Message:

Fix to algorithm for id generation, to better satisfy what appears to be Word's buggy GUID equality test, which becomes evident if there are more than about 100 items. Symptom is that Word won't open the docx.

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java (modified) (13 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java

@@ -24 +24 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -76 +77 @@
          */
         protected static void setFriendlyIds(Object jaxbElement) {
-                
+                                
                 map = new HashMap<String, String>();
                 
@@ -109 +110 @@
                                                         String from = pt.getModelId();
                                                         
-                                                        // Everything goes invisible in Word 2007 if you map these,
+                                                        // Everything goes invisible in Word 2007 if you map these
+                                                        // to an int (rather than a guid),
                                                         // and images disappear (not shown as broken)
                                                         if (pt.getType()!=null
@@ -118 +120 @@
                                                         }
                                                         
+//                                                      String to = generateNiceGuid(index);
                                                         String to = "" + index;
                                                         index++;                                                                
@@ -127 +130 @@
                                                         CTCxn cxn = (CTCxn)o;
                                                         String from = cxn.getModelId();
+//                                                      String to = generateNiceGuid(index);
                                                         String to = "" + index;
                                                         index++;                                                                
@@ -179 +183 @@
         private static String generateNiceGuid(int index) {
                 
+                /* It seems that if there are more than about 100
+                 * items, Word won't open a docx with friendly ids
+                 * of the following form:
+                 * 
+                        if (index<10) {
+                                return "{00000000-0000-0000-0000-00000000000" + index + "}";
+                        } else if (index<100) {
+                                return "{00000000-0000-0000-0000-0000000000" + index + "}";                     
+                        } else {
+                                return "{00000000-0000-0000-0000-000000000" + index + "}";                      
+                        }
+
+                 * Speculate that this is because M$ internally
+                 * uses some broken equality test.
+                 * 
+                 * The following works better ...
+                 */
+                
+
                 if (index<10) {
-                        return "{00000000-0000-0000-0000-00000000000" + index + "}";
+                        return "{0000000" + index + "-0000-0000-0000-000000000000}";
                 } else if (index<100) {
-                        return "{00000000-0000-0000-0000-0000000000" + index + "}";                     
+                        return "{000000" +  index + "-0000-0000-0000-000000000000}";                    
                 } else {
-                        return "{00000000-0000-0000-0000-000000000" + index + "}";                      
+                        return "{00000" +   index + "-0000-0000-0000-000000000000}";                    
                 }
+                
+                // This works as well...
+//              return "{" + UUID.randomUUID().toString().toUpperCase() + "}";
+                 
                 
         }
@@ -213 +240 @@
                                         @Override
                                         public List<Object> apply(Object o) {
-                                                
+                                                                                                
                                                 if (o instanceof CTPt) {
                                                         
@@ -219 +246 @@
                                                                                                                 
                                                         pt.setModelId( 
-                                                                        map.get(pt.getModelId() ));
+                                                                        mapGet(map, pt.getModelId() ));
                                                         
                                                         if (pt.getPrSet()!=null) {
@@ -225 +252 @@
                                                                 if (pr.getPresAssocID()!=null) {
                                                                         pr.setPresAssocID(
-                                                                                        map.get(pr.getPresAssocID() ));
+                                                                                        mapGet(map, pr.getPresAssocID() ));
                                                                 }
                                                         }
@@ -231 +258 @@
                                                         if (!pt.getCxnId().equals("0")) {
                                                                 pt.setCxnId( 
-                                                                                map.get(pt.getCxnId() ));
+                                                                                mapGet(map, pt.getCxnId() ));
                                                         }                                                       
                                                 }
@@ -239 +266 @@
                                                         CTCxn cxn = (CTCxn)o;
                                                         if (cxn.getModelId()!=null) {
-                                                                cxn.setModelId(map.get(cxn.getModelId()));
-                                                        }
-                                                        
-                                                        cxn.setSrcId(map.get(cxn.getSrcId()));
+                                                                cxn.setModelId(mapGet(map,cxn.getModelId()));
+                                                        }
+                                                        
+                                                        cxn.setSrcId(mapGet(map, cxn.getSrcId()));
                                                         cxn.setDestId( mapGet(map,cxn.getDestId() ));
 
                                                         if (!cxn.getSibTransId().equals("0")) {
                                                                 cxn.setSibTransId( 
-                                                                                map.get(cxn.getSibTransId() ));
+                                                                                mapGet(map, cxn.getSibTransId() ));
                                                         }
                                                         if (!cxn.getParTransId().equals("0")) {
                                                                 cxn.setParTransId( 
-                                                                                map.get(cxn.getParTransId() ));
+                                                                                mapGet(map, cxn.getParTransId() ));
                                                         }
 //                                                      if (cxn.getPresId()!=null) {
@@ -309 +336 @@
                                 .load(new java.io.File(
                                                 System.getProperty("user.dir")
-                                                + "/SmartArt/root-only.docx"));
+                                                + "/SmartArt/complex-nopic.docx"));
                 
                 Relationship r = wordMLPackage.getMainDocumentPart().getRelationshipsPart().getRelationshipByType(Namespaces.DRAWINGML_DIAGRAM_DATA);
@@ -337 +364 @@
                 SaveToZipFile saver = new SaveToZipFile(wordMLPackage);
                 saver.save(System.getProperty("user.dir")
-                                + "/SmartArt/root-only-OUT.docx");
+                                + "/SmartArt/complex-nopic-OUT.docx");
                 
         }