Changeset 1724 for trunk/docx4j

Timestamp:

11/30/11 13:13:03 (6 months ago)

Author:

jharrop

Message:

Setting to determine whether to apply a Word style to the hyperlink.

Location:

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

Files:

• convert/in/xhtml/Importer.java (modified) (7 diffs)
• model/datastorage/BindingHandler.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/convert/in/xhtml/Importer.java

@@ -70 +70 @@
         protected static Logger log = Logger.getLogger(Importer.class);         
             
+        /**
+         * Configure, how the Importer styles hyperlinks
+         * 
+         * If hyperlinkStyleId is set to <code>null</code>, hyperlinks are
+         * styled using just the CSS. This is the default behavior.
+         * 
+         * 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".
+         * 
+         * Due to the architecture of this class, this is a static flag changing the
+         * behavior of all following calls.
+         * 
+         * @param hyperlinkStyleID
+         *            The style to use for hyperlinks (eg Hyperlink)
+         */
+        public static void setHyperlinkStyle (
+                        String hyperlinkStyleID) {
+                hyperlinkStyleId = hyperlinkStyleID;
+        }
+        private static String hyperlinkStyleId = null;  
     private List<Object> imports = new ArrayList<Object>(); 
 //    public List<Object>  getImportedContent() {
@@ -91 +112 @@
         
         listHelper = new ListHelper();
+        
+                if (hyperlinkStyleId !=null && wordMLPackage instanceof WordprocessingMLPackage) {
+                        ((WordprocessingMLPackage)wordMLPackage).getMainDocumentPart().getPropertyResolver().activateStyle(hyperlinkStyleId);
+                }
+        
     }
 
@@ -390 +416 @@
                                 s.getElement().getAttribute("href"), 
                                 addRunProperties( cssMap ),
-                                "Hyperlink", 
                                 s.getElement().getAttribute("href"), rp);                                       
                 currentP.getContent().add(h);
@@ -416 +441 @@
                                 s.getElement().getAttribute("href"),
                                 addRunProperties( cssMap ),
-                                "Hyperlink", theText, rp);                                      
+                                theText, rp);                                           
                 currentP.getContent().add(h);
                 
@@ -499 +524 @@
     }
 
-        private Hyperlink createHyperlink(String url, RPr rPr, String style, String linkText, RelationshipsPart rp) {
+        private Hyperlink createHyperlink(String url, RPr rPr, String linkText, RelationshipsPart rp) {
                 
                 try {
@@ -522 +547 @@
             "xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" >" +
             "<w:r>" +
-            "<w:rPr>" +
-            "<w:rStyle w:val=\"" + style + "\" />" +  
-            "</w:rPr>" +
             "<w:t>" + linkText + "</w:t>" +
             "</w:r>" +
@@ -532 +554 @@
                         R r = (R)hyperlink.getContent().get(0);
                         r.setRPr(rPr);
-                        RStyle rStyle = Context.getWmlObjectFactory().createRStyle();
-                        rStyle.setVal(style);
-                        rPr.setRStyle(rStyle );
-                        
+                        if (hyperlinkStyleId!=null) {
+                                RStyle rStyle = Context.getWmlObjectFactory().createRStyle();
+                                rStyle.setVal(hyperlinkStyleId);
+                                rPr.setRStyle(rStyle );
+                        }
                         return hyperlink;
                         

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

@@ -283 +283 @@
                                 }                               
                                 
+                                Importer.setHyperlinkStyle(hyperlinkStyleId);
                                 String baseUrl = null;
                                 List<Object> results = Importer.convertFromString(unescaped, pkg, baseUrl );