Changeset 1723

Timestamp:

11/30/11 12:45:16 (6 months ago)

Author:

jharrop

Message:

Hyperlink: set run properties.

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/in/xhtml/Importer.java (modified) (5 diffs)

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

@@ -46 +46 @@
 import org.docx4j.wml.R;
 import org.docx4j.wml.RPr;
+import org.docx4j.wml.RStyle;
 import org.docx4j.wml.Text;
 import org.w3c.dom.Element;
@@ -388 +389 @@
                 Hyperlink h = createHyperlink(
                                 s.getElement().getAttribute("href"), 
+                                addRunProperties( cssMap ),
                                 "Hyperlink", 
                                 s.getElement().getAttribute("href"), rp);                                       
@@ -412 +414 @@
                 
                 Hyperlink h = createHyperlink(
-                                s.getElement().getAttribute("href"), 
+                                s.getElement().getAttribute("href"),
+                                addRunProperties( cssMap ),
                                 "Hyperlink", theText, rp);                                      
                 currentP.getContent().add(h);
@@ -496 +499 @@
     }
 
-        private Hyperlink createHyperlink(String url, String style, String linkText, RelationshipsPart rp) {
+        private Hyperlink createHyperlink(String url, RPr rPr, String style, String linkText, RelationshipsPart rp) {
                 
                 try {
@@ -526 +529 @@
             "</w:hyperlink>";
 
-                        return (Hyperlink)XmlUtils.unmarshalString(hpl);
+                        Hyperlink hyperlink = (Hyperlink)XmlUtils.unmarshalString(hpl);
+                        R r = (R)hyperlink.getContent().get(0);
+                        r.setRPr(rPr);
+                        RStyle rStyle = Context.getWmlObjectFactory().createRStyle();
+                        rStyle.setVal(style);
+                        rPr.setRStyle(rStyle );
+                        
+                        return hyperlink;
                         
                 } catch (Exception e) {