Changeset 1087 for trunk/docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java

Timestamp:

02/26/10 03:41:23 (2 years ago)

Author:

jharrop

Message:

Basic character formatting in SVG output

File:

• trunk/docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java (modified) (6 diffs)

trunk/docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java

@@ -33 +33 @@
 import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.XmlUtils;
+import org.docx4j.dml.CTTextCharacterProperties;
 import org.docx4j.dml.CTTextListStyle;
 import org.docx4j.dml.CTTextParagraphProperties;
@@ -45 +46 @@
 import org.docx4j.openpackaging.parts.PresentationML.MainPresentationPart;
 import org.docx4j.openpackaging.parts.PresentationML.SlideMasterPart;
+import org.docx4j.wml.BooleanDefaultTrue;
 import org.docx4j.wml.HpsMeasure;
 import org.docx4j.wml.Jc;
@@ -54 +56 @@
 import org.docx4j.wml.Style;
 import org.docx4j.wml.Styles;
+import org.docx4j.wml.U;
+import org.docx4j.wml.UnderlineEnumeration;
 import org.docx4j.wml.Style.Name;
 import org.pptx4j.pml.CTSlideMasterTextStyles;
@@ -209 +213 @@
 //              <w:sz w:val="28" />
                         if (lvlPPr.getDefRPr().getSz()!=null) {                         
-                                HpsMeasure sz = factory.createHpsMeasure();
-                                int halfPts = Math.round(lvlPPr.getDefRPr().getSz()/50); 
-                                sz.setVal( BigInteger.valueOf(halfPts) );
-                                rPr.setSz(sz);
+                                rPr.setSz( convertFontSize(lvlPPr.getDefRPr().getSz()) );
                         }
                         
@@ -233 +234 @@
                 return rPr;
         }       
+        
+        private static HpsMeasure convertFontSize(Integer in) {
+                ObjectFactory factory = Context.getWmlObjectFactory();
+                HpsMeasure sz = factory.createHpsMeasure();
+                int halfPts = Math.round(in/50); 
+                sz.setVal( BigInteger.valueOf(halfPts) );
+                return sz;
+        }
+        
         // From Main Presentation Part
         public static List<Style> generateWordStylesFromPresentationPart(CTTextListStyle textStyles, String suffix,  
@@ -346 +356 @@
         }       
     
-        
+        public static RPr getWmlRPr(CTTextCharacterProperties in) {
+                
+                ObjectFactory factory = Context.getWmlObjectFactory();
+                RPr rPr = factory.createRPr();
+
+                if (in==null) {
+                        System.out.println("Was passed null");
+                        return rPr;
+                }
+                
+//        <a:rPr  i="true" />           
+                if (in.isI()!=null && in.isI()) {
+                        rPr.setI( new BooleanDefaultTrue() );
+                }
+                
+//        <a:rPr  b="true"
+                if (in.isB()!=null && in.isB()) {
+                        rPr.setB( new BooleanDefaultTrue() );
+                }
+                
+//        <a:rPr  u="sng" 
+                if (in.getU()!=null) {
+                        U u = factory.createU(); 
+                        u.setVal(UnderlineEnumeration.SINGLE);
+                        rPr.setU(u);
+                }
+//        <a:rPr  sz="4000" 
+                if (in.getSz()!=null) {
+                        rPr.setSz(
+                                        convertFontSize(in.getSz() ) );
+                }
+                
+                return rPr;
+
+        }
 }