Changeset 1702

Timestamp:

11/06/11 03:02:43 (7 months ago)

Author:

jharrop

Message:

Bug fix: honour no hyperlink creation.
Extend hyperlink creation to  https:// and mailto:
Add hyperlink style in whether processing pkg or part.

Location:

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

Files:

• model/datastorage/BindingHandler.java (modified) (5 diffs)
• samples/ContentControlBindingExtensions.java (modified) (3 diffs)

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

@@ -70 +70 @@
          * Configure, how the handler handles links found in Custom XML.
          * 
-         * If set to <code>null</code>, strings containing 'http://'
-         * are not converted to w:hyperlink. This is the default behavior.
+         * If hyperlinkStyleId is set to <code>null</code>, strings 
+         * containing 'http://' or 'https://' are not converted to 
+         * w:hyperlink. This is the default behavior.
          * 
-         * If set to <code>true</code>, strings containing 'http://'
-         * are converted to w:hyperlink.  If you do this, you will
-         * need to post-process with RemovalHandler, since a
+         * If hyperlinkStyleId is set to <code>"someWordHyperlinkStyleName"</code>, 
+         * strings containing 'http://' or 'https://' or or 'mailto:' are converted to w:hyperlink.  
+         * The default Word hyperlink style name is "Hyperlink".
+         * If you do this, you will need to post-process with RemovalHandler, since a
          * content control with SdtPr w:dataBinding and w:text
          * which contains a w:hyperlink will prevent Word 2007 from
@@ -83 +85 @@
          * behavior of all following calls to {@link #applyBindings}.
          * 
-         * @param hyperlinkStyle
+         * @param hyperlinkStyleID
          *            The style to use for hyperlinks (eg Hyperlink)
          */
@@ -119 +121 @@
                         // http://forums.opendope.org/Support-components-in-headers-footers-tp2964174p2964174.html
                         
-                        if (hyperlinkStyleId !=null 
-                                        && wordMLPackage.getMainDocumentPart().getPropertyResolver().activateStyle(hyperlinkStyleId)) {
+                        if (hyperlinkStyleId !=null) {
+                                        wordMLPackage.getMainDocumentPart().getPropertyResolver().activateStyle(hyperlinkStyleId);
                         }                       
 
@@ -144 +146 @@
                                 // Binding is a concept which applies more broadly
                                 // than just Word documents.
+                        
+                        if (hyperlinkStyleId !=null && pkg instanceof WordprocessingMLPackage) {
+                                ((WordprocessingMLPackage)pkg).getMainDocumentPart().getPropertyResolver().activateStyle(hyperlinkStyleId);
+                        }
                         
                         org.w3c.dom.Document doc = XmlUtils.marshaltoW3CDomDocument(
@@ -327 +333 @@
                 private static void processString(JaxbXmlPart sourcePart, DocumentFragment docfrag, String text, RPr rPr) throws JAXBException {
                         
-                        int pos = text.indexOf("http://");
-
-                        if (pos==-1) {                          
+                        // Since we'll calculate min, we don't want -1 for no match
+                        int NOT_FOUND = 99999;
+                        int pos1 = text.indexOf("http://")==-1 ? NOT_FOUND : text.indexOf("http://");
+                        int pos2 = text.indexOf("https://")==-1 ? NOT_FOUND : text.indexOf("https://");
+                        int pos3 = text.indexOf("mailto:")==-1 ? NOT_FOUND : text.indexOf("mailto:");
+                        
+                        int pos = Math.min(pos1,  Math.min(pos2, pos3));
+                        
+                        if (pos==NOT_FOUND || hyperlinkStyleId == null) {                               
                                 addRunToDocFrag(sourcePart, docfrag,  text,  rPr);
                                 return;

trunk/docx4j/src/main/java/org/docx4j/samples/ContentControlBindingExtensions.java

@@ -77 +77 @@
                 
                 String inputfilepath = System.getProperty("user.dir") + "/sample-docs/word/databinding/invoice.docx";
+                
+//              String inputfilepath = System.getProperty("user.dir") + "/src/test/resources/OpenDoPE/hyperlinks.docx";
 
 //              String inputfilepath = System.getProperty("user.dir") + "/sample-docs/word/databinding/CountryRegions.xml";
@@ -106 +108 @@
                 
                 // Apply the bindings
-                BindingHandler.setHyperlinkStyle("hyperlink");                                          
+                BindingHandler.setHyperlinkStyle("Hyperlink");                                          
                 BindingHandler.applyBindings(wordMLPackage.getMainDocumentPart());
                 System.out.println(
@@ -119 +121 @@
                 rh.removeSDTs(wordMLPackage, Quantifier.ALL);
                 saver.save(filepathprefix + "_stripped.docx");
-                System.out.println("Saved: " + filepathprefix + "_bound.docx");
+                System.out.println("Saved: " + filepathprefix + "_stripped.docx");
         }