Changeset 1665 for trunk/docx4j/src

Timestamp:

09/20/11 11:53:44 (8 months ago)

Author:

jharrop

Message:

Rudimentary support for

<w:rPr>

<w:highlight w:val="yellow"/>

</w:rPr>

Location:

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

Files:

• PropertyResolver.java (modified) (1 diff)
• properties/PropertyFactory.java (modified) (2 diffs)
• properties/run/HighlightColor.java (added)

trunk/docx4j/src/main/java/org/docx4j/model/PropertyResolver.java

@@ -1002 +1002 @@
                 //HpsMeasure szCs;
                 //Highlight highlight;
-                //if (rPrToApply.getHighlight()!=null ) {
-                //      return true;                    
-                //}
+                if (rPrToApply.getHighlight()!=null ) {
+                        return true;                    
+                }
                 //U u;
                 if (rPrToApply.getU()!=null ) {

trunk/docx4j/src/main/java/org/docx4j/model/properties/PropertyFactory.java

@@ -43 +43 @@
 import org.docx4j.model.properties.run.FontColor;
 import org.docx4j.model.properties.run.FontSize;
+import org.docx4j.model.properties.run.HighlightColor;
 import org.docx4j.model.properties.run.Italics;
 import org.docx4j.model.properties.run.RBorder;
@@ -216 +217 @@
 //              if (rPr.getFitText() != null)
 //                      dest.setFitText(rPr.getFitText());
-//              if (rPr.getHighlight() != null)
-//                      properties.add(new HighlightColor(rPr.getHighlight()));
+                if (rPr.getHighlight() != null)
+                        properties.add(new HighlightColor(rPr.getHighlight()));
                 if (rPr.getI() != null)
                         properties.add(new Italics(rPr.getI()) );