67 files changed, 2211 insertions, 979 deletions

diff --git a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
index 1a0147f3d0..c21c227968 100644
--- a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
@@ -17,7 +17,9 @@
 
 package org.apache.poi.ddf;
 
-import org.apache.poi.util.*;
+import org.apache.poi.util.HexDump;
+import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.RecordFormatException;
 
 /**
  * Holds data from the parent application. Most commonly used to store
@@ -30,7 +32,7 @@ import org.apache.poi.util.*;
  */
 public class EscherTextboxRecord extends EscherRecord
 {
-    public static final short RECORD_ID = (short)0xf00d;
+    public static final short RECORD_ID = (short)0xF00D;
     public static final String RECORD_DESCRIPTION = "msofbtClientTextbox";
 
     private static final byte[] NO_BYTES = new byte[0];
diff --git a/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
index e7974a0922..0f29305c5c 100644
--- a/src/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
@@ -20,13 +20,19 @@ package org.apache.poi.hssf.record;
 import java.util.Arrays;
 
 import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
+import org.apache.poi.hssf.record.cf.ColorGradientThreshold;
+import org.apache.poi.hssf.record.cf.DataBarFormatting;
+import org.apache.poi.hssf.record.cf.DataBarThreshold;
 import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
+import org.apache.poi.hssf.record.cf.IconMultiStateThreshold;
 import org.apache.poi.hssf.record.cf.Threshold;
+import org.apache.poi.hssf.record.common.ExtendedColor;
 import org.apache.poi.hssf.record.common.FtrHeader;
 import org.apache.poi.hssf.record.common.FutureRecord;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.ss.formula.Formula;
 import org.apache.poi.ss.formula.ptg.Ptg;
+import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
 import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.HexDump;
@@ -56,11 +62,10 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
     private byte template_param_length;
     private byte[] template_params;
     
+    private DataBarFormatting data_bar;
     private IconMultiStateFormatting multistate;
     private ColorGradientFormatting color_gradient;
-    
-    // TODO Parse these
-    private byte[] databar_data;
+    // TODO Parse this, see #58150
     private byte[] filter_data;
 
     /** Creates new CFRuleRecord */
@@ -120,22 +125,62 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
                 formula1, formula2, formula3);
     }
     /**
+     * Creates a new Data Bar formatting
+     */
+    public static CFRule12Record create(HSSFSheet sheet, ExtendedColor color) {
+        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_DATA_BAR, 
+                                              ComparisonOperator.NO_COMPARISON);
+        DataBarFormatting dbf = r.createDataBarFormatting();
+        dbf.setColor(color);
+        dbf.setPercentMin((byte)0);
+        dbf.setPercentMax((byte)100);
+        
+        DataBarThreshold min = new DataBarThreshold();
+        min.setType(RangeType.MIN.id);
+        dbf.setThresholdMin(min);
+        
+        DataBarThreshold max = new DataBarThreshold();
+        max.setType(RangeType.MAX.id);
+        dbf.setThresholdMax(max);
+        
+        return r;
+    }
+    /**
      * Creates a new Icon Set / Multi-State formatting
      */
     public static CFRule12Record create(HSSFSheet sheet, IconSet iconSet) {
         Threshold[] ts = new Threshold[iconSet.num];
         for (int i=0; i<ts.length; i++) {
-            ts[i] = new Threshold();
+            ts[i] = new IconMultiStateThreshold();
         }
         
-        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_COLOR_SCALE, 
+        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_ICON_SET, 
                                               ComparisonOperator.NO_COMPARISON);
         IconMultiStateFormatting imf = r.createMultiStateFormatting();
         imf.setIconSet(iconSet);
         imf.setThresholds(ts);
         return r;
     }
-    // TODO Static creators for the other record types
+    /**
+     * Creates a new Color Scale / Color Gradient formatting
+     */
+    public static CFRule12Record createColorScale(HSSFSheet sheet) {
+        int numPoints = 3;
+        ExtendedColor[] colors = new ExtendedColor[numPoints];
+        ColorGradientThreshold[] ts = new ColorGradientThreshold[numPoints];
+        for (int i=0; i<ts.length; i++) {
+            ts[i] = new ColorGradientThreshold();
+            colors[i] = new ExtendedColor();
+        }
+        
+        CFRule12Record r = new CFRule12Record(CONDITION_TYPE_COLOR_SCALE, 
+                                              ComparisonOperator.NO_COMPARISON);
+        ColorGradientFormatting cgf = r.createColorGradientFormatting();
+        cgf.setNumControlPoints(numPoints);
+        cgf.setThresholds(ts);
+        cgf.setColors(colors);
+        return r;
+    }
 
     public CFRule12Record(RecordInputStream in) {
         futureHeader = new FtrHeader(in);
@@ -179,7 +224,7 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         if (type == CONDITION_TYPE_COLOR_SCALE) {
             color_gradient = new ColorGradientFormatting(in);
         } else if (type == CONDITION_TYPE_DATA_BAR) {
-            databar_data = in.readRemainder();
+            data_bar = new DataBarFormatting(in);
         } else if (type == CONDITION_TYPE_FILTER) {
             filter_data = in.readRemainder();
         } else if (type == CONDITION_TYPE_ICON_SET) {
@@ -187,6 +232,21 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         }
     }
     
+    public boolean containsDataBarBlock() {
+        return (data_bar != null);
+    }
+    public DataBarFormatting getDataBarFormatting() {
+        return data_bar;
+    }
+    public DataBarFormatting createDataBarFormatting() {
+        if (data_bar != null) return data_bar;
+        
+        // Convert, setup and return
+        setConditionType(CONDITION_TYPE_DATA_BAR);
+        data_bar = new DataBarFormatting();
+        return data_bar;
+    }
+
     public boolean containsMultiStateBlock() {
         return (multistate != null);
     }
@@ -279,7 +339,7 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         if (type == CONDITION_TYPE_COLOR_SCALE) {
             color_gradient.serialize(out);
         } else if (type == CONDITION_TYPE_DATA_BAR) {
-            out.write(databar_data);
+            data_bar.serialize(out);
         } else if (type == CONDITION_TYPE_FILTER) {
             out.write(filter_data);
         } else if (type == CONDITION_TYPE_ICON_SET) {
@@ -303,7 +363,7 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         if (type == CONDITION_TYPE_COLOR_SCALE) {
             len += color_gradient.getDataLength();
         } else if (type == CONDITION_TYPE_DATA_BAR) {
-            len += databar_data.length;
+            len += data_bar.getDataLength();
         } else if (type == CONDITION_TYPE_FILTER) {
             len += filter_data.length;
         } else if (type == CONDITION_TYPE_ICON_SET) {
@@ -335,7 +395,6 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         buffer.append("    .priority  =").append(priority).append("\n");
         buffer.append("    .template_type  =").append(template_type).append("\n");
         buffer.append("    .template_params=").append(HexDump.toHex(template_params)).append("\n");
-        buffer.append("    .databar_data   =").append(HexDump.toHex(databar_data)).append("\n");
         buffer.append("    .filter_data    =").append(HexDump.toHex(filter_data)).append("\n");
         if (color_gradient != null) {
             buffer.append(color_gradient);
@@ -343,6 +402,9 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         if (multistate != null) {
             buffer.append(multistate);
         }
+        if (data_bar != null) {
+            buffer.append(data_bar);
+        }
         buffer.append("[/CFRULE12]\n");
         return buffer.toString();
     }
@@ -366,7 +428,19 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         rec.template_params = new byte[template_param_length];
         System.arraycopy(template_params, 0, rec.template_params, 0, template_param_length);
 
-        // TODO Clone the rgbCT data like Gradients, Databars etc
+        if (color_gradient != null) {
+            rec.color_gradient = (ColorGradientFormatting)color_gradient.clone();
+        }
+        if (multistate != null) {
+            rec.multistate = (IconMultiStateFormatting)multistate.clone();
+        }
+        if (data_bar != null) {
+            rec.data_bar = (DataBarFormatting)data_bar.clone();
+        }
+        if (filter_data != null) {
+            rec.filter_data = new byte[filter_data.length];
+            System.arraycopy(filter_data, 0, rec.filter_data, 0, filter_data.length);
+        }
         
         return rec;
     }
diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
index 3b58af74e2..b78a81f851 100644
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
@@ -17,6 +17,7 @@
 
 package org.apache.poi.hssf.record.cf;
 
+import org.apache.poi.hssf.record.common.ExtendedColor;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianInput;
@@ -33,15 +34,16 @@ public final class ColorGradientFormatting implements Cloneable {
     private static POILogger log = POILogFactory.getLogger(ColorGradientFormatting.class);
 
     private byte options = 0;
-    private Threshold[] thresholds;
-    private byte[] colors; // TODO Decode
+    private ColorGradientThreshold[] thresholds;
+    private ExtendedColor[] colors;
     
     private static BitField clamp = BitFieldFactory.getInstance(0x01);
     private static BitField background = BitFieldFactory.getInstance(0x02);
     
     public ColorGradientFormatting() {
         options = 3;
-        thresholds = new Threshold[3];
+        thresholds = new ColorGradientThreshold[3];
+        colors = new ExtendedColor[3];  
     }
     public ColorGradientFormatting(LittleEndianInput in) {
         in.readShort(); // Ignored
@@ -53,15 +55,15 @@ public final class ColorGradientFormatting implements Cloneable {
         }
         options = in.readByte();
         
-        // TODO Are these correct?
-        thresholds = new Threshold[numI];
+        thresholds = new ColorGradientThreshold[numI];
         for (int i=0; i<thresholds.length; i++) {
-            thresholds[i] = new Threshold(in);
-            in.readDouble(); // Rather pointless value...
+            thresholds[i] = new ColorGradientThreshold(in);
+        }
+        colors = new ExtendedColor[numG];
+        for (int i=0; i<colors.length; i++) {
+            in.readDouble(); // Slightly pointless step counter
+            colors[i] = new ExtendedColor(in);
         }
-        // TODO Decode colors
-        colors = new byte[in.available()];
-        in.readFully(colors);
     }
     
     public int getNumControlPoints() {
@@ -69,19 +71,34 @@ public final class ColorGradientFormatting implements Cloneable {
     }
     public void setNumControlPoints(int num) {
         if (num != thresholds.length) {
-            thresholds = new Threshold[num];
-            // TODO Colors
+            ColorGradientThreshold[] nt = new ColorGradientThreshold[num];
+            ExtendedColor[] nc = new ExtendedColor[num];
+            
+            int copy = Math.min(thresholds.length, num);
+            System.arraycopy(thresholds, 0, nt, 0, copy);
+            System.arraycopy(colors, 0, nc, 0, copy);
+            
+            this.thresholds = nt;
+            this.colors = nc;
+            
+            updateThresholdPositions();
         }
     }
     
-    public Threshold[] getThresholds() {
+    public ColorGradientThreshold[] getThresholds() {
         return thresholds;
     }
-    public void setThresholds(Threshold[] thresholds) {
+    public void setThresholds(ColorGradientThreshold[] thresholds) {
         this.thresholds = thresholds;
+        updateThresholdPositions();
     }
 
-    // TODO Colors
+    public ExtendedColor[] getColors() {
+        return colors;
+    }
+    public void setColors(ExtendedColor[] colors) {
+        this.colors = colors;
+    }
     
     public boolean isClampToCurve() {
         return getOptionFlag(clamp);
@@ -93,6 +110,13 @@ public final class ColorGradientFormatting implements Cloneable {
         int value = field.getValue(options);
         return value==0 ? false : true;
     }
+
+    private void updateThresholdPositions() {
+        double step = 1d / (thresholds.length-1);
+        for (int i=0; i<thresholds.length; i++) {
+            thresholds[i].setPosition(step*i);
+        }
+    }    
     
     public String toString() {
         StringBuffer buffer = new StringBuffer();
@@ -102,6 +126,9 @@ public final class ColorGradientFormatting implements Cloneable {
         for (Threshold t : thresholds) {
             buffer.append(t.toString());
         }
+        for (ExtendedColor c : colors) {
+            buffer.append(c.toString());
+        }
         buffer.append("    [/Color Gradient Formatting]\n");
         return buffer.toString();
     }
@@ -109,9 +136,10 @@ public final class ColorGradientFormatting implements Cloneable {
     public Object clone()  {
       ColorGradientFormatting rec = new ColorGradientFormatting();
       rec.options = options;
-      rec.thresholds = new Threshold[thresholds.length];
+      rec.thresholds = new ColorGradientThreshold[thresholds.length];
+      rec.colors = new ExtendedColor[colors.length];
       System.arraycopy(thresholds, 0, rec.thresholds, 0, thresholds.length);
-      // TODO Colors
+      System.arraycopy(colors, 0, rec.colors, 0, colors.length);
       return rec;
     }
     
@@ -119,9 +147,11 @@ public final class ColorGradientFormatting implements Cloneable {
         int len = 6;
         for (Threshold t : thresholds) {
             len += t.getDataLength();
+        }
+        for (ExtendedColor c : colors) {
+            len += c.getDataLength();
             len += 8;
         }
-        len += colors.length;
         return len;
     }
 
@@ -132,13 +162,16 @@ public final class ColorGradientFormatting implements Cloneable {
         out.writeByte(thresholds.length);
         out.writeByte(options);
         
-        double step = 1d / (thresholds.length-1);
-        for (int i=0; i<thresholds.length; i++) {
-            Threshold t = thresholds[i];
+        for (ColorGradientThreshold t : thresholds) {
             t.serialize(out);
-            out.writeDouble(step*i);
         }
         
-        out.write(colors);
+        double step = 1d / (colors.length-1);
+        for (int i=0; i<colors.length; i++) {
+            out.writeDouble(i*step);
+            
+            ExtendedColor c = colors[i];
+            c.serialize(out);
+        }
     }
 }
diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
new file mode 100644
index 0000000000..32eba56e4c
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
@@ -0,0 +1,63 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.cf;
+
+import org.apache.poi.util.LittleEndianInput;
+import org.apache.poi.util.LittleEndianOutput;
+
+/**
+ * Color Gradient / Color Scale specific Threshold / value (CFVO),
+ *  for changes in Conditional Formatting
+ */
+public final class ColorGradientThreshold extends Threshold {
+    private double position;
+
+    public ColorGradientThreshold() {
+        super();
+        position = 0d;
+    }
+
+    /** Creates new Color Gradient Threshold */
+    public ColorGradientThreshold(LittleEndianInput in) {
+        super(in);
+        position = in.readDouble();
+    }
+
+    public double getPosition() {
+        return position;
+    }
+    public void setPosition(double position) {
+        this.position = position;
+    }
+
+    public int getDataLength() {
+        return super.getDataLength() + 8;
+    }
+
+    public Object clone() {
+      ColorGradientThreshold rec = new ColorGradientThreshold();
+      super.copyTo(rec);
+      rec.position = position;
+      return rec;
+    }
+
+    public void serialize(LittleEndianOutput out) {
+        super.serialize(out);
+        out.writeDouble(position);
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
new file mode 100644
index 0000000000..3ca419553e
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
@@ -0,0 +1,160 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.cf;
+
+import org.apache.poi.hssf.record.common.ExtendedColor;
+import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.LittleEndianInput;
+import org.apache.poi.util.LittleEndianOutput;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
+
+/**
+ * Data Bar Conditional Formatting Rule Record.
+ */
+public final class DataBarFormatting implements Cloneable {
+    private static POILogger log = POILogFactory.getLogger(DataBarFormatting.class);
+
+    private byte options = 0;
+    private byte percentMin = 0;
+    private byte percentMax = 0;
+    private ExtendedColor color;
+    private DataBarThreshold thresholdMin;
+    private DataBarThreshold thresholdMax;
+    
+    private static BitField iconOnly = BitFieldFactory.getInstance(0x01);
+    private static BitField reversed = BitFieldFactory.getInstance(0x04);
+    
+    public DataBarFormatting() {
+        options = 2;
+    }
+    public DataBarFormatting(LittleEndianInput in) {
+        in.readShort(); // Ignored
+        in.readByte();  // Reserved
+        options = in.readByte();
+        
+        percentMin = in.readByte();
+        percentMax = in.readByte();
+        if (percentMin < 0 || percentMin > 100)
+            log.log(POILogger.WARN, "Inconsistent Minimum Percentage found " + percentMin);
+        if (percentMax < 0 || percentMax > 100)
+            log.log(POILogger.WARN, "Inconsistent Minimum Percentage found " + percentMin);
+        
+        color = new ExtendedColor(in);
+        thresholdMin = new DataBarThreshold(in);
+        thresholdMax = new DataBarThreshold(in);
+    }
+    
+    public boolean isIconOnly() {
+        return getOptionFlag(iconOnly);
+    }
+    public void setIconOnly(boolean only) {
+        setOptionFlag(only, iconOnly);
+    }
+    
+    public boolean isReversed() {
+        return getOptionFlag(reversed);
+    }
+    public void setReversed(boolean rev) {
+        setOptionFlag(rev, reversed);
+    }
+    
+    private boolean getOptionFlag(BitField field) {
+        int value = field.getValue(options);
+        return value==0 ? false : true;
+    }
+    private void setOptionFlag(boolean option, BitField field) {
+        options = field.setByteBoolean(options, option);
+    }
+
+    public byte getPercentMin() {
+        return percentMin;
+    }
+    public void setPercentMin(byte percentMin) {
+        this.percentMin = percentMin;
+    }
+    
+    public byte getPercentMax() {
+        return percentMax;
+    }
+    public void setPercentMax(byte percentMax) {
+        this.percentMax = percentMax;
+    }
+    
+    public ExtendedColor getColor() {
+        return color;
+    }
+    public void setColor(ExtendedColor color) {
+        this.color = color;
+    }
+    
+    public DataBarThreshold getThresholdMin() {
+        return thresholdMin;
+    }
+    public void setThresholdMin(DataBarThreshold thresholdMin) {
+        this.thresholdMin = thresholdMin;
+    }
+    
+    public DataBarThreshold getThresholdMax() {
+        return thresholdMax;
+    }
+    public void setThresholdMax(DataBarThreshold thresholdMax) {
+        this.thresholdMax = thresholdMax;
+    }
+    
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("    [Data Bar Formatting]\n");
+        buffer.append("          .icon_only= ").append(isIconOnly()).append("\n");
+        buffer.append("          .reversed = ").append(isReversed()).append("\n");
+        buffer.append(color);
+        buffer.append(thresholdMin);
+        buffer.append(thresholdMax);
+        buffer.append("    [/Data Bar Formatting]\n");
+        return buffer.toString();
+    }
+    
+    public Object clone()  {
+      DataBarFormatting rec = new DataBarFormatting();
+      rec.options = options;
+      rec.percentMin = percentMin;
+      rec.percentMax = percentMax;
+      rec.color = (ExtendedColor)color.clone();
+      rec.thresholdMin = (DataBarThreshold)thresholdMin.clone();
+      rec.thresholdMax = (DataBarThreshold)thresholdMax.clone();
+      return rec;
+    }
+    
+    public int getDataLength() {
+        return 6 + color.getDataLength() +
+               thresholdMin.getDataLength() + 
+               thresholdMax.getDataLength();
+    }
+
+    public void serialize(LittleEndianOutput out) {
+        out.writeShort(0);
+        out.writeByte(0);
+        out.writeByte(options);
+        out.writeByte(percentMin);
+        out.writeByte(percentMax);
+        color.serialize(out);
+        thresholdMin.serialize(out);
+        thresholdMax.serialize(out);
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
new file mode 100644
index 0000000000..9164aaddef
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
@@ -0,0 +1,41 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.cf;
+
+import org.apache.poi.util.LittleEndianInput;
+
+/**
+ * Data Bar specific Threshold / value (CFVO),
+ *  for changes in Conditional Formatting
+ */
+public final class DataBarThreshold extends Threshold {
+    public DataBarThreshold() {
+        super();
+    }
+
+    /** Creates new Data Bar Threshold */
+    public DataBarThreshold(LittleEndianInput in) {
+        super(in);
+    }
+
+    public Object clone() {
+      DataBarThreshold rec = new DataBarThreshold();
+      super.copyTo(rec);
+      return rec;
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
index f405c031e0..4a8f885b20 100644
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
@@ -56,7 +56,7 @@ public final class IconMultiStateFormatting implements Cloneable {
         
         thresholds = new Threshold[iconSet.num];
         for (int i=0; i<thresholds.length; i++) {
-            thresholds[i] = new Threshold(in);
+            thresholds[i] = new IconMultiStateThreshold(in);
         }
     }
     
diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
new file mode 100644
index 0000000000..72f6ea370d
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
@@ -0,0 +1,75 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.cf;
+
+import org.apache.poi.util.LittleEndianInput;
+import org.apache.poi.util.LittleEndianOutput;
+
+/**
+ * Icon / Multi-State specific Threshold / value (CFVO),
+ *  for changes in Conditional Formatting
+ */
+public final class IconMultiStateThreshold extends Threshold {
+    /**
+     * Cell values that are equal to the threshold value do not pass the threshold
+     */
+    public static final byte EQUALS_EXCLUDE = 0;
+    /**
+     * Cell values that are equal to the threshold value pass the threshold.
+     */
+    public static final byte EQUALS_INCLUDE = 1;
+    
+    private byte equals;
+
+    public IconMultiStateThreshold() {
+        super();
+        equals = EQUALS_INCLUDE;
+    }
+
+    /** Creates new Ico Multi-State Threshold */
+    public IconMultiStateThreshold(LittleEndianInput in) {
+        super(in);
+        equals = in.readByte();
+        // Reserved, 4 bytes, all 0
+        in.readInt();
+    }
+
+    public byte getEquals() {
+        return equals;
+    }
+    public void setEquals(byte equals) {
+        this.equals = equals;
+    }
+
+    public int getDataLength() {
+        return super.getDataLength() + 5;
+    }
+
+    public Object clone() {
+      IconMultiStateThreshold rec = new IconMultiStateThreshold();
+      super.copyTo(rec);
+      rec.equals = equals;
+      return rec;
+    }
+
+    public void serialize(LittleEndianOutput out) {
+        super.serialize(out);
+        out.writeByte(equals);
+        out.writeInt(0); // Reserved
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/record/cf/Threshold.java b/src/java/org/apache/poi/hssf/record/cf/Threshold.java
index 414bf0f4ca..946c181660 100644
--- a/src/java/org/apache/poi/hssf/record/cf/Threshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/Threshold.java
@@ -26,31 +26,21 @@ import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
- * Threshold / value for changes in Conditional Formatting
+ * Threshold / value (CFVO) for changes in Conditional Formatting
  */
-public final class Threshold {
-    /**
-     * Cell values that are equal to the threshold value do not pass the threshold
-     */
-    public static final byte EQUALS_EXCLUDE = 0;
-    /**
-     * Cell values that are equal to the threshold value pass the threshold.
-     */
-    public static final byte EQUALS_INCLUDE = 1;
-    
+public abstract class Threshold {
     private byte type;
     private Formula formula;
     private Double value;
-    private byte equals;
 
-    public Threshold() {
+    protected Threshold() {
         type = (byte)RangeType.NUMBER.id;
         formula = Formula.create(null);
         value = 0d;
     }
 
     /** Creates new Threshold */
-    public Threshold(LittleEndianInput in) {
+    protected Threshold(LittleEndianInput in) {
         type = in.readByte();
         short formulaLen = in.readShort();
         if (formulaLen > 0) {
@@ -63,9 +53,6 @@ public final class Threshold {
                 type != RangeType.MAX.id) {
             value = in.readDouble();
         }
-        equals = in.readByte();
-        // Reserved, 4 bytes, all 0
-        in.readInt();
     }
 
     public byte getType() {
@@ -74,7 +61,7 @@ public final class Threshold {
     public void setType(byte type) {
         this.type = type;
 
-        // Ensure the value presense / absense is consistent for the new type
+        // Ensure the value presence / absence is consistent for the new type
         if (type == RangeType.MIN.id || type == RangeType.MAX.id ||
                type == RangeType.FORMULA.id) {
             this.value = null;
@@ -106,19 +93,11 @@ public final class Threshold {
         this.value = value;
     }
     
-    public byte getEquals() {
-        return equals;
-    }
-    public void setEquals(byte equals) {
-        this.equals = equals;
-    }
-
     public int getDataLength() {
         int len = 1 + formula.getEncodedSize();
         if (value != null) {
             len += 8;
         }
-        len += 5;
         return len;
     }
 
@@ -132,13 +111,10 @@ public final class Threshold {
         return buffer.toString();
     }
 
-    public Object clone() {
-      Threshold rec = new Threshold();
+    public void copyTo(Threshold rec) {
       rec.type = type;
       rec.formula = formula;
       rec.value = value;
-      rec.equals = equals;
-      return rec;
     }
 
     public void serialize(LittleEndianOutput out) {
@@ -151,7 +127,5 @@ public final class Threshold {
         if (value != null) {
             out.writeDouble(value);
         }
-        out.writeByte(equals);
-        out.writeInt(0); // Reserved
     }
 }
diff --git a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
new file mode 100644
index 0000000000..b0719e19a8
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
@@ -0,0 +1,182 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.common;
+
+import org.apache.poi.util.HexDump;
+import org.apache.poi.util.LittleEndianInput;
+import org.apache.poi.util.LittleEndianOutput;
+
+
+/**
+ * Title: CTColor (Extended Color) record part
+ * <P>
+ * The HSSF file format normally stores Color information in the
+ *  Palette (see PaletteRecord), but for a few cases (eg Conditional
+ *  Formatting, Sheet Extensions), this XSSF-style color record 
+ *  can be used.
+ */
+public final class ExtendedColor {
+    public static final int TYPE_AUTO = 0;
+    public static final int TYPE_INDEXED = 1;
+    public static final int TYPE_RGB = 2;
+    public static final int TYPE_THEMED = 3;
+    public static final int TYPE_UNSET = 4;
+    
+    public static final int THEME_DARK_1  = 0;
+    public static final int THEME_LIGHT_1 = 1;
+    public static final int THEME_DARK_2  = 2;
+    public static final int THEME_LIGHT_2 = 3;
+    public static final int THEME_ACCENT_1 = 4;
+    public static final int THEME_ACCENT_2 = 5;
+    public static final int THEME_ACCENT_3 = 6;
+    public static final int THEME_ACCENT_4 = 7;
+    public static final int THEME_ACCENT_5 = 8;
+    public static final int THEME_ACCENT_6 = 9;
+    public static final int THEME_HYPERLINK = 10;
+    // This one is SheetEx only, not allowed in CFs
+    public static final int THEME_FOLLOWED_HYPERLINK = 11;
+    
+    private int type;
+    
+    // Type = Indexed
+    private int colorIndex;
+    // Type = RGB
+    private byte[] rgba;
+    // Type = Theme
+    private int themeIndex;
+    
+    private double tint;
+    
+    public ExtendedColor() {
+        this.type = TYPE_INDEXED;
+        this.colorIndex = 0;
+        this.tint = 0d;
+    }
+    public ExtendedColor(LittleEndianInput in) {
+        type = in.readInt();
+        if (type == TYPE_INDEXED) {
+            colorIndex = in.readInt();
+        } else if (type == TYPE_RGB) {
+            rgba = new byte[4];
+            in.readFully(rgba);
+        } else if (type == TYPE_THEMED) {
+            themeIndex = in.readInt();
+        } else {
+            // Ignored
+            in.readInt();
+        }
+        tint = in.readDouble();
+    }
+
+    public int getType() {
+        return type;
+    }
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    /**
+     * @return Palette color index, if type is {@link #TYPE_INDEXED}
+     */
+    public int getColorIndex() {
+        return colorIndex;
+    }
+    public void setColorIndex(int colorIndex) {
+        this.colorIndex = colorIndex;
+    }
+    
+    /**
+     * @return Red Green Blue Alpha, if type is {@link #TYPE_RGB}
+     */
+    public byte[] getRGBA() {
+        return rgba;
+    }
+    public void setRGBA(byte[] rgba) {
+        this.rgba = rgba;
+    }
+    
+    /**
+     * @return Theme color type index, eg {@link #THEME_DARK_1}, if type is {@link #TYPE_THEMED}
+     */
+    public int getThemeIndex() {
+        return themeIndex;
+    }
+    public void setThemeIndex(int themeIndex) {
+        this.themeIndex = themeIndex;
+    }
+    /**
+     * @return Tint and Shade value, between -1 and +1
+     */
+    public double getTint() {
+        return tint;
+    }
+    /**
+     * @param tint Tint and Shade value, between -1 and +1
+     */
+    public void setTint(double tint) {
+        if (tint < -1 || tint > 1) {
+            throw new IllegalArgumentException("Tint/Shade must be between -1 and +1");
+        }
+        this.tint = tint;
+    }
+    
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("    [Extended Color]\n");
+        buffer.append("          .type  = ").append(type).append("\n");
+        buffer.append("          .tint  = ").append(tint).append("\n");
+        buffer.append("          .c_idx = ").append(colorIndex).append("\n");
+        buffer.append("          .rgba  = ").append(HexDump.toHex(rgba)).append("\n");
+        buffer.append("          .t_idx = ").append(themeIndex).append("\n");
+        buffer.append("    [/Extended Color]\n");
+        return buffer.toString();
+    }
+    
+    public Object clone()  {
+        ExtendedColor exc = new ExtendedColor();
+        exc.type = type;
+        exc.tint = tint;
+        if (type == TYPE_INDEXED) {
+            exc.colorIndex = colorIndex;
+        } else if (type == TYPE_RGB) {
+            exc.rgba = new byte[4];
+            System.arraycopy(rgba, 0, exc.rgba, 0, 4);
+        } else if (type == TYPE_THEMED) {
+            exc.themeIndex = themeIndex;
+        }
+        return exc;
+    }
+    
+    public int getDataLength() {
+        return 4+4+8;
+    }
+
+    public void serialize(LittleEndianOutput out) {
+        out.writeInt(type);
+        if (type == TYPE_INDEXED) {
+            out.writeInt(colorIndex);
+        } else if (type == TYPE_RGB) {
+            out.write(rgba);
+        } else if (type == TYPE_THEMED) {
+            out.writeInt(themeIndex);
+        } else {
+            out.writeInt(0);
+        }
+        out.writeDouble(tint);
+    }
+}
\ No newline at end of file
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
index 6e82072d44..36c5a53e0c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
@@ -19,7 +19,9 @@ package org.apache.poi.hssf.usermodel;
 
 import org.apache.poi.hssf.record.CFRule12Record;
 import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
+import org.apache.poi.hssf.record.cf.ColorGradientThreshold;
 import org.apache.poi.hssf.record.cf.Threshold;
+import org.apache.poi.hssf.record.common.ExtendedColor;
 import org.apache.poi.ss.usermodel.Color;
 import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
 
@@ -45,11 +47,20 @@ public final class HSSFColorScaleFormatting implements org.apache.poi.ss.usermod
         colorFormatting.setNumControlPoints(num);
     }
 
-    public Color[] getColors() {
-        return null; // TODO
+    public HSSFExtendedColor[] getColors() {
+        ExtendedColor[] colors = colorFormatting.getColors();
+        HSSFExtendedColor[] hcolors = new HSSFExtendedColor[colors.length];
+        for (int i=0; i<colors.length; i++) {
+            hcolors[i] = new HSSFExtendedColor(colors[i]);
+        }
+        return hcolors;
     }
     public void setColors(Color[] colors) {
-        // TODO
+        ExtendedColor[] cr = new ExtendedColor[colors.length];
+        for (int i=0; i<colors.length; i++) {
+            cr[i] = ((HSSFExtendedColor)colors[i]).getExtendedColor();
+        }
+        colorFormatting.setColors(cr);
     }
 
     public HSSFConditionalFormattingThreshold[] getThresholds() {
@@ -62,14 +73,15 @@ public final class HSSFColorScaleFormatting implements org.apache.poi.ss.usermod
     }
 
     public void setThresholds(ConditionalFormattingThreshold[] thresholds) {
-        Threshold[] t = new Threshold[thresholds.length];
+        ColorGradientThreshold[] t = new ColorGradientThreshold[thresholds.length];
         for (int i=0; i<t.length; i++) {
-            t[i] = ((HSSFConditionalFormattingThreshold)thresholds[i]).getThreshold();
+            HSSFConditionalFormattingThreshold hssfT = (HSSFConditionalFormattingThreshold)thresholds[i];
+            t[i] = (ColorGradientThreshold)hssfT.getThreshold();
         }
         colorFormatting.setThresholds(t);
     }
 
     public HSSFConditionalFormattingThreshold createThreshold() {
-        return new HSSFConditionalFormattingThreshold(new Threshold(), sheet);
+        return new HSSFConditionalFormattingThreshold(new ColorGradientThreshold(), sheet);
     }
 }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
index a6cdbcfd03..79545327ba 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
@@ -24,6 +24,7 @@ import org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator;
 import org.apache.poi.hssf.record.CFRuleRecord;
 import org.apache.poi.hssf.record.cf.BorderFormatting;
 import org.apache.poi.hssf.record.cf.ColorGradientFormatting;
+import org.apache.poi.hssf.record.cf.DataBarFormatting;
 import org.apache.poi.hssf.record.cf.FontFormatting;
 import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
 import org.apache.poi.hssf.record.cf.PatternFormatting;
@@ -69,8 +70,7 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
         return (CFRule12Record)cfRuleRecord;
     }
 
-    private HSSFFontFormatting getFontFormatting(boolean create)
-    {
+    private HSSFFontFormatting getFontFormatting(boolean create) {
         FontFormatting fontFormatting = cfRuleRecord.getFontFormatting();
         if ( fontFormatting != null)
         {
@@ -92,8 +92,7 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
     /**
      * @return - font formatting object  if defined,  <code>null</code> otherwise
      */
-    public HSSFFontFormatting getFontFormatting()
-    {
+    public HSSFFontFormatting getFontFormatting() {
         return getFontFormatting(false);
     }
     /**
@@ -101,13 +100,11 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
      * otherwise just return existing object.
      * @return - font formatting object, never returns <code>null</code>.
      */
-    public HSSFFontFormatting createFontFormatting()
-    {
+    public HSSFFontFormatting createFontFormatting() {
         return getFontFormatting(true);
     }
 
-    private HSSFBorderFormatting getBorderFormatting(boolean create)
-    {
+    private HSSFBorderFormatting getBorderFormatting(boolean create) {
         BorderFormatting borderFormatting = cfRuleRecord.getBorderFormatting();
         if ( borderFormatting != null)
         {
@@ -128,8 +125,7 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
     /**
      * @return - border formatting object  if defined,  <code>null</code> otherwise
      */
-    public HSSFBorderFormatting getBorderFormatting()
-    {
+    public HSSFBorderFormatting getBorderFormatting() {
         return getBorderFormatting(false);
     }
     /**
@@ -137,8 +133,7 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
      * otherwise just return existing object.
      * @return - border formatting object, never returns <code>null</code>.
      */
-    public HSSFBorderFormatting createBorderFormatting()
-    {
+    public HSSFBorderFormatting createBorderFormatting() {
         return getBorderFormatting(true);
     }
 
@@ -179,6 +174,37 @@ public final class HSSFConditionalFormattingRule implements ConditionalFormattin
         return getPatternFormatting(true);
     }
     
+    private HSSFDataBarFormatting getDataBarFormatting(boolean create) {
+        CFRule12Record cfRule12Record = getCFRule12Record(create);
+        DataBarFormatting databarFormatting = cfRule12Record.getDataBarFormatting();
+        if (databarFormatting != null)
+        {
+            return new HSSFDataBarFormatting(cfRule12Record, sheet);
+        }
+        else if( create )
+        {
+            databarFormatting = cfRule12Record.createDataBarFormatting();
+            return new HSSFDataBarFormatting(cfRule12Record, sheet);
+        }
+        else
+        {
+            return null;
+        }
+    }
+    /**
+     * @return databar / data-bar formatting object if defined, <code>null</code> otherwise
+     */
+    public HSSFDataBarFormatting getDataBarFormatting() {
+        return getDataBarFormatting(false);
+    }
+    /**
+     * create a new databar / data-bar formatting object if it does not exist,
+     * otherwise just return the existing object.
+     */
+    public HSSFDataBarFormatting createDataBarFormatting() {
+        return getDataBarFormatting(true);
+    }
+    
     private HSSFIconMultiStateFormatting getMultiStateFormatting(boolean create) {
         CFRule12Record cfRule12Record = getCFRule12Record(create);
         IconMultiStateFormatting iconFormatting = cfRule12Record.getMultiStateFormatting();
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
index faee42b83f..89f496fcf4 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
@@ -17,47 +17,52 @@
 
 package org.apache.poi.hssf.usermodel;
 
+import org.apache.poi.hssf.record.common.ExtendedColor;
 import org.apache.poi.ss.usermodel.CreationHelper;
 
 public class HSSFCreationHelper implements CreationHelper {
-	private HSSFWorkbook workbook;
-	private HSSFDataFormat dataFormat;
-
-	HSSFCreationHelper(HSSFWorkbook wb) {
-		workbook = wb;
-
-		// Create the things we only ever need one of
-		dataFormat = new HSSFDataFormat(workbook.getWorkbook());
-	}
-
-	public HSSFRichTextString createRichTextString(String text) {
-		return new HSSFRichTextString(text);
-	}
-
-	public HSSFDataFormat createDataFormat() {
-		return dataFormat;
-	}
-
-	public HSSFHyperlink createHyperlink(int type) {
-		return new HSSFHyperlink(type);
-	}
-
-	/**
-	 * Creates a HSSFFormulaEvaluator, the object that evaluates formula cells.
-	 *
-	 * @return a HSSFFormulaEvaluator instance
-	 */
-	public HSSFFormulaEvaluator createFormulaEvaluator(){
-		return new HSSFFormulaEvaluator(workbook);
-	}
-
-	/**
-	 * Creates a HSSFClientAnchor. Use this object to position drawing object in a sheet
-	 *
-	 * @return a HSSFClientAnchor instance
-	 * @see org.apache.poi.ss.usermodel.Drawing
-	 */
-	public HSSFClientAnchor createClientAnchor(){
-		return new HSSFClientAnchor();
-	}
+    private HSSFWorkbook workbook;
+    private HSSFDataFormat dataFormat;
+
+    HSSFCreationHelper(HSSFWorkbook wb) {
+        workbook = wb;
+
+        // Create the things we only ever need one of
+        dataFormat = new HSSFDataFormat(workbook.getWorkbook());
+    }
+
+    public HSSFRichTextString createRichTextString(String text) {
+        return new HSSFRichTextString(text);
+    }
+
+    public HSSFDataFormat createDataFormat() {
+        return dataFormat;
+    }
+
+    public HSSFHyperlink createHyperlink(int type) {
+        return new HSSFHyperlink(type);
+    }
+
+    public HSSFExtendedColor createExtendedColor() {
+        return new HSSFExtendedColor(new ExtendedColor());
+    }
+
+    /**
+     * Creates a HSSFFormulaEvaluator, the object that evaluates formula cells.
+     *
+     * @return a HSSFFormulaEvaluator instance
+     */
+    public HSSFFormulaEvaluator createFormulaEvaluator(){
+        return new HSSFFormulaEvaluator(workbook);
+    }
+
+    /**
+     * Creates a HSSFClientAnchor. Use this object to position drawing object in a sheet
+     *
+     * @return a HSSFClientAnchor instance
+     * @see org.apache.poi.ss.usermodel.Drawing
+     */
+    public HSSFClientAnchor createClientAnchor(){
+        return new HSSFClientAnchor();
+    }
 }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
new file mode 100644
index 0000000000..f796dd80dd
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
@@ -0,0 +1,86 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.usermodel;
+
+import org.apache.poi.hssf.record.CFRule12Record;
+import org.apache.poi.hssf.record.cf.DataBarFormatting;
+import org.apache.poi.hssf.record.cf.DataBarThreshold;
+import org.apache.poi.ss.usermodel.Color;
+
+/**
+ * High level representation for DataBar / Data-Bar Formatting 
+ *  component of Conditional Formatting settings
+ */
+public final class HSSFDataBarFormatting implements org.apache.poi.ss.usermodel.DataBarFormatting {
+    private final HSSFSheet sheet;
+    private final CFRule12Record cfRule12Record;
+    private final DataBarFormatting databarFormatting;
+
+    protected HSSFDataBarFormatting(CFRule12Record cfRule12Record, HSSFSheet sheet) {
+        this.sheet = sheet;
+        this.cfRule12Record = cfRule12Record;
+        this.databarFormatting = this.cfRule12Record.getDataBarFormatting();
+    }
+
+    public boolean isLeftToRight() {
+        return !databarFormatting.isReversed();
+    }
+    public void setLeftToRight(boolean ltr) {
+        databarFormatting.setReversed(!ltr);
+    }
+
+    public int getWidthMin() {
+        return databarFormatting.getPercentMin();
+    }
+    public void setWidthMin(int width) {
+        databarFormatting.setPercentMin((byte)width);
+    }
+
+    public int getWidthMax() {
+        return databarFormatting.getPercentMax();
+    }
+    public void setWidthMax(int width) {
+        databarFormatting.setPercentMax((byte)width);
+    }
+
+    public HSSFExtendedColor getColor() {
+        return new HSSFExtendedColor(databarFormatting.getColor());
+    }
+    public void setColor(Color color) {
+        HSSFExtendedColor hcolor = (HSSFExtendedColor)color;
+        databarFormatting.setColor(hcolor.getExtendedColor());
+    }
+
+    public HSSFConditionalFormattingThreshold getMinThreshold() {
+        return new HSSFConditionalFormattingThreshold(databarFormatting.getThresholdMin(), sheet);
+    }
+    public HSSFConditionalFormattingThreshold getMaxThreshold() {
+        return new HSSFConditionalFormattingThreshold(databarFormatting.getThresholdMax(), sheet);
+    }
+
+    public boolean isIconOnly() {
+        return databarFormatting.isIconOnly();
+    }
+    public void setIconOnly(boolean only) {
+        databarFormatting.setIconOnly(only);
+    }
+
+    public HSSFConditionalFormattingThreshold createThreshold() {
+        return new HSSFConditionalFormattingThreshold(new DataBarThreshold(), sheet);
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java b/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
new file mode 100644
index 0000000000..7806fb5184
--- /dev/null
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
@@ -0,0 +1,108 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.usermodel;
+
+import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_AUTO;
+import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_INDEXED;
+import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_RGB;
+import static org.apache.poi.hssf.record.common.ExtendedColor.TYPE_THEMED;
+
+import org.apache.poi.ss.usermodel.ExtendedColor;
+
+/**
+ * The HSSF file format normally stores Color information in the
+ *  Palette (see PaletteRecord), but for a few cases (eg Conditional
+ *  Formatting, Sheet Extensions), this XSSF-style color record 
+ *  can be used.
+ */
+public class HSSFExtendedColor extends ExtendedColor {
+    private org.apache.poi.hssf.record.common.ExtendedColor color;
+    
+    public HSSFExtendedColor(org.apache.poi.hssf.record.common.ExtendedColor color) {
+        this.color = color;
+    }
+    
+    protected org.apache.poi.hssf.record.common.ExtendedColor getExtendedColor() {
+        return color;
+    }
+
+    public boolean isAuto() {
+        return color.getType() == TYPE_AUTO;
+    }
+    public boolean isIndexed() {
+        return color.getType() == TYPE_INDEXED;
+    }
+    public boolean isRGB() {
+        return color.getType() == TYPE_RGB;
+    }
+    public boolean isThemed() {
+        return color.getType() == TYPE_THEMED;
+    }
+
+    public short getIndex() {
+        return (short)color.getColorIndex();
+    }
+    public int getTheme() {
+        return color.getThemeIndex();
+    }
+
+    public byte[] getRGB() {
+        // Trim trailing A
+        byte[] rgb = new byte[3];
+        byte[] rgba = color.getRGBA();
+        if (rgba == null) return null;
+        System.arraycopy(rgba, 0, rgb, 0, 3);
+        return rgb;
+    }
+    public byte[] getARGB() {
+        // Swap from RGBA to ARGB
+        byte[] argb = new byte[4];
+        byte[] rgba = color.getRGBA();
+        if (rgba == null) return null;
+        System.arraycopy(rgba, 0, argb, 1, 3);
+        argb[0] = rgba[3];
+        return argb;
+    }
+
+    protected byte[] getStoredRBG() {
+        return getARGB();
+    }
+
+    public void setRGB(byte[] rgb) {
+        if (rgb.length == 3) {
+            byte[] rgba = new byte[4];
+            System.arraycopy(rgb, 0, rgba, 0, 3);
+            rgba[3] = -1;
+        } else {
+            // Shuffle from ARGB to RGBA
+            byte a = rgb[0];
+            rgb[0] = rgb[1];
+            rgb[1] = rgb[2];
+            rgb[2] = rgb[3];
+            rgb[3] = a;
+            color.setRGBA(rgb);
+        }
+    }
+
+    public double getTint() {
+        return color.getTint();
+    }
+    public void setTint(double tint) {
+        color.setTint(tint);
+    }
+}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
index e93d5c918f..cabfad2f80 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
@@ -19,6 +19,7 @@ package org.apache.poi.hssf.usermodel;
 
 import org.apache.poi.hssf.record.CFRule12Record;
 import org.apache.poi.hssf.record.cf.IconMultiStateFormatting;
+import org.apache.poi.hssf.record.cf.IconMultiStateThreshold;
 import org.apache.poi.hssf.record.cf.Threshold;
 import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold;
 
@@ -76,6 +77,6 @@ public final class HSSFIconMultiStateFormatting implements org.apache.poi.ss.use
     }
 
     public HSSFConditionalFormattingThreshold createThreshold() {
-        return new HSSFConditionalFormattingThreshold(new Threshold(), sheet);
+        return new HSSFConditionalFormattingThreshold(new IconMultiStateThreshold(), sheet);
     }
 }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
index 667c83cc89..04f57b4931 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
@@ -518,7 +518,7 @@ public final class HSSFPatriarch implements HSSFShapeContainer, Drawing {
     }
 
     public Chart createChart(ClientAnchor anchor) {
-        throw new UnsupportedOperationException("NotImplemented");
+        throw new RuntimeException("NotImplemented");
     }
 
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
index deca836a0c..e5f2ac67ef 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
@@ -25,6 +25,7 @@ import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.ConditionalFormatting;
 import org.apache.poi.ss.usermodel.ConditionalFormattingRule;
+import org.apache.poi.ss.usermodel.ExtendedColor;
 import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
 import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -47,7 +48,7 @@ public final class HSSFSheetConditionalFormatting implements SheetConditionalFor
      * TODO - formulas containing cell references are currently not parsed properly
      *
      * @param comparisonOperation - a constant value from
-     *		 <tt>{@link org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator}</tt>: <p>
+     *		 <tt>{@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator}</tt>: <p>
      * <ul>
      *		 <li>BETWEEN</li>
      *		 <li>NOT_BETWEEN</li>
@@ -61,8 +62,8 @@ public final class HSSFSheetConditionalFormatting implements SheetConditionalFor
      * </p>
      * @param formula1 - formula for the valued, compared with the cell
      * @param formula2 - second formula (only used with
-     * {@link org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator#BETWEEN}) and
-     * {@link org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator#NOT_BETWEEN} operations)
+     * {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator#BETWEEN}) and
+     * {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator#NOT_BETWEEN} operations)
      */
     public HSSFConditionalFormattingRule createConditionalFormattingRule(
             byte comparisonOperation,
@@ -106,9 +107,40 @@ public final class HSSFSheetConditionalFormatting implements SheetConditionalFor
         return new HSSFConditionalFormattingRule(_sheet, rr);
     }
 
-    // TODO Support types beyond CELL_VALUE_IS and FORMULA and ICONs
+    /**
+     * Create a Databar conditional formatting rule.
+     * <p>The thresholds and colour for it will be created, but will be 
+     *  empty and require configuring with 
+     *  {@link HSSFConditionalFormattingRule#getDataBarFormatting()}
+     *  then
+     *  {@link HSSFDataBarFormatting#getMinThreshold()}
+     *  and 
+     *  {@link HSSFDataBarFormatting#getMaxThreshold()}
+     */
+    public HSSFConditionalFormattingRule createConditionalFormattingRule(HSSFExtendedColor color) {
+        CFRule12Record rr = CFRule12Record.create(_sheet, color.getExtendedColor());
+        return new HSSFConditionalFormattingRule(_sheet, rr);
+    }
+    public HSSFConditionalFormattingRule createConditionalFormattingRule(ExtendedColor color) {
+        return createConditionalFormattingRule((HSSFExtendedColor)color);
+    }
 
     /**
+     * Create a Color Scale / Color Gradient conditional formatting rule.
+     * <p>The thresholds and colours for it will be created, but will be 
+     *  empty and require configuring with 
+     *  {@link HSSFConditionalFormattingRule#getColorScaleFormatting()}
+     *  then
+     *  {@link HSSFColorScaleFormatting#getThresholds()}
+     *  and
+     *  {@link HSSFColorScaleFormatting#getColors()}
+     */
+    public HSSFConditionalFormattingRule createConditionalFormattingColorScaleRule() {
+        CFRule12Record rr = CFRule12Record.createColorScale(_sheet);
+        return new HSSFConditionalFormattingRule(_sheet, rr);
+    }
+    
+    /**
      * Adds a copy of HSSFConditionalFormatting object to the sheet
      * <p>This method could be used to copy HSSFConditionalFormatting object
      * from one sheet to another. For example:
diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
index c27ba3cd14..9817c3d818 100644
--- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
+++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
@@ -354,7 +354,11 @@ public class NPOIFSFileSystem extends BlockStore
      *  has a POIFS (OLE2) header at the start of it.
      * If your InputStream does not support mark / reset,
      *  then wrap it in a PushBackInputStream, then be
-     *  sure to always use that, and not the original!
+     *  sure to always use that and not the original!
+     *  
+     *  After the method call, the InputStream is at the
+     *  same position as of the time of entering the method.
+     *  
      * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream
      */
     public static boolean hasPOIFSHeader(InputStream inp) throws IOException {
@@ -362,13 +366,13 @@ public class NPOIFSFileSystem extends BlockStore
         inp.mark(8);
 
         byte[] header = new byte[8];
-        IOUtils.readFully(inp, header);
+        int bytesRead = IOUtils.readFully(inp, header);
         LongField signature = new LongField(HeaderBlockConstants._signature_offset, header);
 
         // Wind back those 8 bytes
         if(inp instanceof PushbackInputStream) {
             PushbackInputStream pin = (PushbackInputStream)inp;
-            pin.unread(header);
+            pin.unread(header, 0, bytesRead);
         } else {
             inp.reset();
         }
diff --git a/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java b/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
index b8dd7c3f20..1c3d6c07b4 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
@@ -17,10 +17,31 @@
 

 package org.apache.poi.sl.draw;

 

-import org.apache.poi.sl.usermodel.*;

+import java.awt.Graphics2D;

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.apache.poi.sl.draw.geom.Outline;

+import org.apache.poi.sl.draw.geom.Path;

+import org.apache.poi.sl.usermodel.FillStyle;

+import org.apache.poi.sl.usermodel.FreeformShape;

+import org.apache.poi.sl.usermodel.StrokeStyle;

+import org.apache.poi.sl.usermodel.TextParagraph;

+import org.apache.poi.sl.usermodel.TextRun;

 

 public class DrawFreeformShape<T extends FreeformShape<? extends TextParagraph<? extends TextRun>>> extends DrawAutoShape<T> {

     public DrawFreeformShape(T shape) {

         super(shape);

     }

+    

+    protected Collection<Outline> computeOutlines(Graphics2D graphics) {

+        List<Outline> lst = new ArrayList<Outline>();

+        java.awt.Shape sh = shape.getPath();

+        FillStyle fs = shape.getFillStyle();

+        StrokeStyle ss = shape.getStrokeStyle();

+        Path path = new Path(fs != null, ss != null);

+        lst.add(new Outline(sh, path));

+        return lst;

+    }

 }

diff --git a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
index e674166090..d62b93006d 100644
--- a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
@@ -122,7 +122,7 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
     

         Rectangle2D anchor = getAnchor(graphics, shape);

         double x2 = anchor.getX() + anchor.getWidth(),

-                y2 = anchor.getY() + anchor.getHeight();

+               y2 = anchor.getY() + anchor.getHeight();

     

         double alpha = Math.atan(anchor.getHeight() / anchor.getWidth());

     

@@ -130,8 +130,8 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
         java.awt.Shape shape = null;

         Path p = null;

         Rectangle2D bounds;

-        double scaleY = Math.pow(2, tailWidth.ordinal());

-        double scaleX = Math.pow(2, tailLength.ordinal());

+        final double scaleY = Math.pow(2, tailWidth.ordinal()+1);

+        final double scaleX = Math.pow(2, tailLength.ordinal()+1);

         switch (deco.getTailShape()) {

             case OVAL:

                 p = new Path();

@@ -140,20 +140,19 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
                 at.translate(x2 - bounds.getWidth() / 2, y2 - bounds.getHeight() / 2);

                 at.rotate(alpha, bounds.getX() + bounds.getWidth() / 2, bounds.getY() + bounds.getHeight() / 2);

                 break;

+            case STEALTH:

             case ARROW:

-                p = new Path();

+                p = new Path(false, true);

                 GeneralPath arrow = new GeneralPath();

-                arrow.moveTo((float) (-lineWidth * 3), (float) (-lineWidth * 2));

+                arrow.moveTo((float) (-lineWidth * scaleX), (float) (-lineWidth * scaleY / 2));

                 arrow.lineTo(0, 0);

-                arrow.lineTo((float) (-lineWidth * 3), (float) (lineWidth * 2));

+                arrow.lineTo((float) (-lineWidth * scaleX), (float) (lineWidth * scaleY / 2));

                 shape = arrow;

                 at.translate(x2, y2);

                 at.rotate(alpha);

                 break;

             case TRIANGLE:

                 p = new Path();

-                scaleY = tailWidth.ordinal() + 1;

-                scaleX = tailLength.ordinal() + 1;

                 GeneralPath triangle = new GeneralPath();

                 triangle.moveTo((float) (-lineWidth * scaleX), (float) (-lineWidth * scaleY / 2));

                 triangle.lineTo(0, 0);

@@ -173,7 +172,7 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
         return shape == null ? null : new Outline(shape, p);

     }

     

-    Outline getHeadDecoration(Graphics2D graphics, LineDecoration deco, BasicStroke stroke) {

+    protected Outline getHeadDecoration(Graphics2D graphics, LineDecoration deco, BasicStroke stroke) {

         DecorationSize headLength = deco.getHeadLength();

         DecorationSize headWidth = deco.getHeadWidth();

     

@@ -189,8 +188,8 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
         java.awt.Shape shape = null;

         Path p = null;

         Rectangle2D bounds;

-        double scaleY = 1;

-        double scaleX = 1;

+        final double scaleY = Math.pow(2, headWidth.ordinal()+1);

+        final double scaleX = Math.pow(2, headLength.ordinal()+1);

         switch (deco.getHeadShape()) {

             case OVAL:

                 p = new Path();

@@ -203,17 +202,15 @@ public class DrawSimpleShape<T extends SimpleShape> extends DrawShape<T> {
             case ARROW:

                 p = new Path(false, true);

                 GeneralPath arrow = new GeneralPath();

-                arrow.moveTo((float) (lineWidth * 3 * scaleX), (float) (-lineWidth * scaleY * 2));

+                arrow.moveTo((float) (lineWidth * scaleX), (float) (-lineWidth * scaleY / 2));

                 arrow.lineTo(0, 0);

-                arrow.lineTo((float) (lineWidth * 3 * scaleX), (float) (lineWidth * scaleY * 2));

+                arrow.lineTo((float) (lineWidth * scaleX), (float) (lineWidth * scaleY / 2));

                 shape = arrow;

                 at.translate(x1, y1);

                 at.rotate(alpha);

                 break;

             case TRIANGLE:

                 p = new Path();

-                scaleY = headWidth.ordinal() + 1;

-                scaleX = headLength.ordinal() + 1;

                 GeneralPath triangle = new GeneralPath();

                 triangle.moveTo((float) (lineWidth * scaleX), (float) (-lineWidth * scaleY / 2));

                 triangle.lineTo(0, 0);

diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
index e2db501e85..e4ce1d760a 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
+++ b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
@@ -189,7 +189,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
             if(wrappingWidth < 0) wrappingWidth = 1;

 

             int nextBreak = text.indexOf("\n", startIndex + 1);

-            if(nextBreak == -1) nextBreak = it.getEndIndex();

+            if (nextBreak == -1) nextBreak = it.getEndIndex();

 

             TextLayout layout = measurer.nextLayout((float)wrappingWidth, nextBreak, true);

             if (layout == null) {

diff --git a/src/java/org/apache/poi/sl/draw/DrawTextShape.java b/src/java/org/apache/poi/sl/draw/DrawTextShape.java
index 5862ac598c..3be880ec02 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawTextShape.java
@@ -35,6 +35,8 @@ public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends
 

     @Override

     public void drawContent(Graphics2D graphics) {

+        fixFonts(graphics);

+        

         Rectangle2D anchor = DrawShape.getAnchor(graphics, shape);

         Insets2D insets = shape.getInsets();

         double x = anchor.getX() + insets.left;

@@ -171,9 +173,12 @@ public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends
     private static void fixFonts(Graphics2D graphics) {

         if (!JvmBugs.hasLineBreakMeasurerBug()) return;

         Map<String,String> fontMap = (Map<String,String>)graphics.getRenderingHint(Drawable.FONT_MAP);

-        if (fontMap == null) fontMap = new HashMap<String,String>();

-        fontMap.put("Calibri", "Lucida Sans");

-        fontMap.put("Cambria", "Lucida Bright");

-        graphics.setRenderingHint(Drawable.FONT_MAP, fontMap);        

+        if (fontMap == null) {

+            fontMap = new HashMap<String,String>();

+            graphics.setRenderingHint(Drawable.FONT_MAP, fontMap);

+        }

+        

+        if (!fontMap.containsKey("Calibri")) fontMap.put("Calibri", "Lucida Sans");

+        if (!fontMap.containsKey("Cambria")) fontMap.put("Cambria", "Lucida Bright");

     }

 }

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java b/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
index d7fc0ae07f..32ee2a03b0 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
@@ -45,9 +45,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_AdjPoint2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTAdjPoint2D {

 

-    @XmlAttribute(name = "x", required = true)

+    @XmlAttribute(required = true)

     protected String x;

-    @XmlAttribute(name = "y", required = true)

+    @XmlAttribute(required = true)

     protected String y;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTAngle.java b/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
index 2da2373e25..2e39602dad 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Angle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTAngle {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java b/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
index 8ec68ba085..973603de45 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
@@ -52,12 +52,12 @@ import javax.xml.bind.annotation.XmlType;
 public class CTColorMRU {

 

     @XmlElements({

-        @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),

-        @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),

-        @XmlElement(name = "hslClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTHslColor.class),

+        @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class),

         @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class),

-        @XmlElement(name = "schemeClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSchemeColor.class),

-        @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class)

+        @XmlElement(name = "hslClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTHslColor.class),

+        @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),

+        @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),

+        @XmlElement(name = "schemeClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSchemeColor.class)

     })

     protected List<Object> egColorChoice;

 

@@ -79,12 +79,12 @@ public class CTColorMRU {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

-     * {@link CTScRgbColor }

-     * {@link CTSRgbColor }

-     * {@link CTHslColor }

+     * {@link CTPresetColor }

      * {@link CTSystemColor }

+     * {@link CTHslColor }

+     * {@link CTSRgbColor }

+     * {@link CTScRgbColor }

      * {@link CTSchemeColor }

-     * {@link CTPresetColor }

      * 

      * 

      */

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTConnection.java b/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
index f5d5e17268..4af3fac719 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
@@ -46,9 +46,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Connection", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTConnection {

 

-    @XmlAttribute(name = "id", required = true)

+    @XmlAttribute(required = true)

     protected long id;

-    @XmlAttribute(name = "idx", required = true)

+    @XmlAttribute(required = true)

     @XmlSchemaType(name = "unsignedInt")

     protected long idx;

 

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java b/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
index eae59a0f0a..7ec62972dd 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
@@ -52,7 +52,7 @@ public class CTConnectionSite {
 

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)

     protected CTAdjPoint2D pos;

-    @XmlAttribute(name = "ang", required = true)

+    @XmlAttribute(required = true)

     protected String ang;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java b/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
index 8787125f47..94d44ece22 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
@@ -46,11 +46,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_EmbeddedWAVAudioFile", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTEmbeddedWAVAudioFile {

 

-    @XmlAttribute(name = "embed", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)

+    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)

     protected String embed;

-    @XmlAttribute(name = "name")

+    @XmlAttribute

     protected String name;

-    @XmlAttribute(name = "builtIn")

+    @XmlAttribute

     protected Boolean builtIn;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
index d1ed283f5d..92f41aee89 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_FixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTFixedPercentage {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java b/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
index 5622e4c28d..3df22093ca 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
@@ -47,10 +47,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 @XmlType(name = "CT_GeomGuide", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTGeomGuide {

 

-    @XmlAttribute(name = "name", required = true)

+    @XmlAttribute(required = true)

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String name;

-    @XmlAttribute(name = "fmla", required = true)

+    @XmlAttribute(required = true)

     protected String fmla;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java b/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
index 3198f0410e..b1368be295 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
@@ -47,13 +47,13 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_GeomRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTGeomRect {

 

-    @XmlAttribute(name = "l", required = true)

+    @XmlAttribute(required = true)

     protected String l;

-    @XmlAttribute(name = "t", required = true)

+    @XmlAttribute(required = true)

     protected String t;

-    @XmlAttribute(name = "r", required = true)

+    @XmlAttribute(required = true)

     protected String r;

-    @XmlAttribute(name = "b", required = true)

+    @XmlAttribute(required = true)

     protected String b;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java b/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
index f06e1d8f99..6508613b16 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
@@ -66,11 +66,11 @@ public class CTGroupTransform2D {
     protected CTPoint2D chOff;

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

     protected CTPositiveSize2D chExt;

-    @XmlAttribute(name = "rot")

+    @XmlAttribute

     protected Integer rot;

-    @XmlAttribute(name = "flipH")

+    @XmlAttribute

     protected Boolean flipH;

-    @XmlAttribute(name = "flipV")

+    @XmlAttribute

     protected Boolean flipV;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java b/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
index 376d423ee3..53ced8d65d 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
@@ -57,41 +57,41 @@ import javax.xml.bind.annotation.XmlType;
 public class CTHslColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "hue", required = true)

+    @XmlAttribute(required = true)

     protected int hue;

-    @XmlAttribute(name = "sat", required = true)

+    @XmlAttribute(required = true)

     protected int sat;

-    @XmlAttribute(name = "lum", required = true)

+    @XmlAttribute(required = true)

     protected int lum;

 

     /**

@@ -112,33 +112,33 @@ public class CTHslColor {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * 

      * 

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java b/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
index 0c89f392ac..03e486af5d 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
@@ -63,21 +63,21 @@ public class CTHyperlink {
     protected CTEmbeddedWAVAudioFile snd;

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

     protected CTOfficeArtExtensionList extLst;

-    @XmlAttribute(name = "id", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")

+    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")

     protected String id;

-    @XmlAttribute(name = "invalidUrl")

+    @XmlAttribute

     protected String invalidUrl;

-    @XmlAttribute(name = "action")

+    @XmlAttribute

     protected String action;

-    @XmlAttribute(name = "tgtFrame")

+    @XmlAttribute

     protected String tgtFrame;

-    @XmlAttribute(name = "tooltip")

+    @XmlAttribute

     protected String tooltip;

-    @XmlAttribute(name = "history")

+    @XmlAttribute

     protected Boolean history;

-    @XmlAttribute(name = "highlightClick")

+    @XmlAttribute

     protected Boolean highlightClick;

-    @XmlAttribute(name = "endSnd")

+    @XmlAttribute

     protected Boolean endSnd;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java b/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
index ec864d3b53..62edc57b93 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
@@ -56,7 +56,7 @@ public class CTOfficeArtExtension {
 

     @XmlAnyElement(lax = true)

     protected Object any;

-    @XmlAttribute(name = "uri")

+    @XmlAttribute

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     @XmlSchemaType(name = "token")

     protected String uri;

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
index 5294812967..25fcd49235 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
@@ -63,23 +63,23 @@ import javax.xml.bind.annotation.XmlType;
 public class CTPath2D {

 

     @XmlElements({

-        @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class),

-        @XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DMoveTo.class),

         @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),

-        @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),

+        @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class),

+        @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class),

         @XmlElement(name = "quadBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DQuadBezierTo.class),

-        @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class)

+        @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),

+        @XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DMoveTo.class)

     })

     protected List<Object> closeOrMoveToOrLnTo;

-    @XmlAttribute(name = "w")

+    @XmlAttribute

     protected Long w;

-    @XmlAttribute(name = "h")

+    @XmlAttribute

     protected Long h;

-    @XmlAttribute(name = "fill")

+    @XmlAttribute

     protected STPathFillMode fill;

-    @XmlAttribute(name = "stroke")

+    @XmlAttribute

     protected Boolean stroke;

-    @XmlAttribute(name = "extrusionOk")

+    @XmlAttribute

     protected Boolean extrusionOk;

 

     /**

@@ -100,12 +100,12 @@ public class CTPath2D {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

-     * {@link CTPath2DClose }

-     * {@link CTPath2DMoveTo }

      * {@link CTPath2DLineTo }

-     * {@link CTPath2DArcTo }

-     * {@link CTPath2DQuadBezierTo }

+     * {@link CTPath2DClose }

      * {@link CTPath2DCubicBezierTo }

+     * {@link CTPath2DQuadBezierTo }

+     * {@link CTPath2DArcTo }

+     * {@link CTPath2DMoveTo }

      * 

      * 

      */

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
index 5464ee4d14..a4c325aa1f 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
@@ -51,9 +51,9 @@ public class CTPath2DArcTo {
     protected String wr;

     @XmlAttribute(name = "hR", required = true)

     protected String hr;

-    @XmlAttribute(name = "stAng", required = true)

+    @XmlAttribute(required = true)

     protected String stAng;

-    @XmlAttribute(name = "swAng", required = true)

+    @XmlAttribute(required = true)

     protected String swAng;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
index e1a74b53e5..7ca8c1fec5 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPercentage {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
index 06cbfbc7aa..ae87986035 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
@@ -45,9 +45,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPoint2D {

 

-    @XmlAttribute(name = "x", required = true)

+    @XmlAttribute(required = true)

     protected long x;

-    @XmlAttribute(name = "y", required = true)

+    @XmlAttribute(required = true)

     protected long y;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java b/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
index 3cbeb670f9..e14c6ba4f2 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
@@ -46,11 +46,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPoint3D {

 

-    @XmlAttribute(name = "x", required = true)

+    @XmlAttribute(required = true)

     protected long x;

-    @XmlAttribute(name = "y", required = true)

+    @XmlAttribute(required = true)

     protected long y;

-    @XmlAttribute(name = "z", required = true)

+    @XmlAttribute(required = true)

     protected long z;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java b/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
index 646dad5b58..9547ca9881 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
@@ -59,19 +59,19 @@ public class CTPolarAdjustHandle {
 

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)

     protected CTAdjPoint2D pos;

-    @XmlAttribute(name = "gdRefR")

+    @XmlAttribute

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String gdRefR;

-    @XmlAttribute(name = "minR")

+    @XmlAttribute

     protected String minR;

-    @XmlAttribute(name = "maxR")

+    @XmlAttribute

     protected String maxR;

-    @XmlAttribute(name = "gdRefAng")

+    @XmlAttribute

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String gdRefAng;

-    @XmlAttribute(name = "minAng")

+    @XmlAttribute

     protected String minAng;

-    @XmlAttribute(name = "maxAng")

+    @XmlAttribute

     protected String maxAng;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
index 962db95137..94348d9bff 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPositiveFixedAngle {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
index 001f01adce..de659159e1 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPositiveFixedPercentage {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
index 8fc61f301f..7b377e1444 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPositivePercentage {

 

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected int val;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
index c8d76e6e56..210fd925a5 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
@@ -45,9 +45,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTPositiveSize2D {

 

-    @XmlAttribute(name = "cx", required = true)

+    @XmlAttribute(required = true)

     protected long cx;

-    @XmlAttribute(name = "cy", required = true)

+    @XmlAttribute(required = true)

     protected long cy;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
index e240a711a0..595d1c5968 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
@@ -55,37 +55,37 @@ import javax.xml.bind.annotation.XmlType;
 public class CTPresetColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "val")

+    @XmlAttribute

     protected STPresetColorVal val;

 

     /**

@@ -106,32 +106,32 @@ public class CTPresetColor {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * 

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
index b55b02ea07..234bbd95f9 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
@@ -52,7 +52,7 @@ public class CTPresetGeometry2D {
 

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

     protected CTGeomGuideList avLst;

-    @XmlAttribute(name = "prst", required = true)

+    @XmlAttribute(required = true)

     protected STShapeType prst;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
index f7082b353b..0a6135fc90 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
@@ -52,7 +52,7 @@ public class CTPresetTextShape {
 

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

     protected CTGeomGuideList avLst;

-    @XmlAttribute(name = "prst", required = true)

+    @XmlAttribute(required = true)

     protected STTextShapeType prst;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTRatio.java b/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
index 3a951c1f1f..4a61b88cb9 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
@@ -45,9 +45,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTRatio {

 

-    @XmlAttribute(name = "n", required = true)

+    @XmlAttribute(required = true)

     protected long n;

-    @XmlAttribute(name = "d", required = true)

+    @XmlAttribute(required = true)

     protected long d;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java b/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
index e332bd83c9..a8b82c4744 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
@@ -47,13 +47,13 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTRelativeRect {

 

-    @XmlAttribute(name = "l")

+    @XmlAttribute

     protected Integer l;

-    @XmlAttribute(name = "t")

+    @XmlAttribute

     protected Integer t;

-    @XmlAttribute(name = "r")

+    @XmlAttribute

     protected Integer r;

-    @XmlAttribute(name = "b")

+    @XmlAttribute

     protected Integer b;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
index ef920d601a..cd2f337fdb 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
@@ -57,37 +57,37 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class CTSRgbColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     @XmlJavaTypeAdapter(HexBinaryAdapter.class)

     protected byte[] val;

 

@@ -109,34 +109,34 @@ public class CTSRgbColor {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

      * 

      * 

      */

@@ -176,7 +176,7 @@ public class CTSRgbColor {
      *     

      */

     public void setVal(byte[] value) {

-        this.val = value;

+        this.val = ((byte[]) value);

     }

 

     public boolean isSetVal() {

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java b/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
index 335e4b2912..2cb3986eb1 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
@@ -57,41 +57,41 @@ import javax.xml.bind.annotation.XmlType;
 public class CTScRgbColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "r", required = true)

+    @XmlAttribute(required = true)

     protected int r;

-    @XmlAttribute(name = "g", required = true)

+    @XmlAttribute(required = true)

     protected int g;

-    @XmlAttribute(name = "b", required = true)

+    @XmlAttribute(required = true)

     protected int b;

 

     /**

@@ -113,33 +113,33 @@ public class CTScRgbColor {
      * <p>

      * Objects of the following type(s) are allowed in the list

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

      * 

      * 

      */

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
index 7febaad838..ac8fb5c27d 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
@@ -55,37 +55,37 @@ import javax.xml.bind.annotation.XmlType;
 public class CTSchemeColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     protected STSchemeColorVal val;

 

     /**

@@ -107,33 +107,33 @@ public class CTSchemeColor {
      * <p>

      * Objects of the following type(s) are allowed in the list

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * 

      * 

      */

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java b/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
index a29d744465..7f03d0dac2 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
@@ -46,11 +46,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTSphereCoords {

 

-    @XmlAttribute(name = "lat", required = true)

+    @XmlAttribute(required = true)

     protected int lat;

-    @XmlAttribute(name = "lon", required = true)

+    @XmlAttribute(required = true)

     protected int lon;

-    @XmlAttribute(name = "rev", required = true)

+    @XmlAttribute(required = true)

     protected int rev;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
index adf0d16b2e..e9c21832da 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
@@ -59,40 +59,40 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class CTSystemColor {

 

     @XmlElementRefs({

-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),

-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)

+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),

+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)

     })

     protected List<JAXBElement<?>> egColorTransform;

-    @XmlAttribute(name = "val", required = true)

+    @XmlAttribute(required = true)

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String val;

-    @XmlAttribute(name = "lastClr")

+    @XmlAttribute

     @XmlJavaTypeAdapter(HexBinaryAdapter.class)

     protected byte[] lastClr;

 

@@ -114,34 +114,34 @@ public class CTSystemColor {
      * 

      * <p>

      * Objects of the following type(s) are allowed in the list

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}

-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}

+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}

      * 

      * 

      */

@@ -209,7 +209,7 @@ public class CTSystemColor {
      *     

      */

     public void setLastClr(byte[] value) {

-        this.lastClr = value;

+        this.lastClr = ((byte[]) value);

     }

 

     public boolean isSetLastClr() {

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java b/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
index 38ec50e654..dd1dcb501e 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
@@ -58,11 +58,11 @@ public class CTTransform2D {
     protected CTPoint2D off;

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

     protected CTPositiveSize2D ext;

-    @XmlAttribute(name = "rot")

+    @XmlAttribute

     protected Integer rot;

-    @XmlAttribute(name = "flipH")

+    @XmlAttribute

     protected Boolean flipH;

-    @XmlAttribute(name = "flipV")

+    @XmlAttribute

     protected Boolean flipV;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java b/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
index 03c5fb8e44..d7f744ba6c 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
@@ -46,11 +46,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")

 public class CTVector3D {

 

-    @XmlAttribute(name = "dx", required = true)

+    @XmlAttribute(required = true)

     protected long dx;

-    @XmlAttribute(name = "dy", required = true)

+    @XmlAttribute(required = true)

     protected long dy;

-    @XmlAttribute(name = "dz", required = true)

+    @XmlAttribute(required = true)

     protected long dz;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java b/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
index 85c30bac54..2b22a58814 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
+++ b/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
@@ -59,19 +59,19 @@ public class CTXYAdjustHandle {
 

     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)

     protected CTAdjPoint2D pos;

-    @XmlAttribute(name = "gdRefX")

+    @XmlAttribute

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String gdRefX;

-    @XmlAttribute(name = "minX")

+    @XmlAttribute

     protected String minX;

-    @XmlAttribute(name = "maxX")

+    @XmlAttribute

     protected String maxX;

-    @XmlAttribute(name = "gdRefY")

+    @XmlAttribute

     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)

     protected String gdRefY;

-    @XmlAttribute(name = "minY")

+    @XmlAttribute

     protected String minY;

-    @XmlAttribute(name = "maxY")

+    @XmlAttribute

     protected String maxY;

 

     /**

diff --git a/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java b/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
index 8c6f9c217c..896fb24761 100644
--- a/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
+++ b/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
@@ -44,20 +44,20 @@ public class ObjectFactory {
     private final static QName _CTSRgbColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");

     private final static QName _CTSRgbColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");

     private final static QName _CTSRgbColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");

-    private final static QName _CTSRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");

     private final static QName _CTSRgbColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");

+    private final static QName _CTSRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");

     private final static QName _CTSRgbColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");

     private final static QName _CTSRgbColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");

-    private final static QName _CTSRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");

     private final static QName _CTSRgbColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");

+    private final static QName _CTSRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");

     private final static QName _CTSRgbColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");

     private final static QName _CTSRgbColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");

     private final static QName _CTSRgbColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");

     private final static QName _CTSRgbColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");

     private final static QName _CTSRgbColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");

     private final static QName _CTSRgbColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");

-    private final static QName _CTSRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");

     private final static QName _CTSRgbColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");

+    private final static QName _CTSRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");

     private final static QName _CTSRgbColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");

     private final static QName _CTSRgbColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");

     private final static QName _CTSRgbColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");

@@ -77,83 +77,83 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link CTPath2DQuadBezierTo }

+     * Create an instance of {@link CTPositiveSize2D }

      * 

      */

-    public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {

-        return new CTPath2DQuadBezierTo();

+    public CTPositiveSize2D createCTPositiveSize2D() {

+        return new CTPositiveSize2D();

     }

 

     /**

-     * Create an instance of {@link CTCustomGeometry2D }

+     * Create an instance of {@link CTSphereCoords }

      * 

      */

-    public CTCustomGeometry2D createCTCustomGeometry2D() {

-        return new CTCustomGeometry2D();

+    public CTSphereCoords createCTSphereCoords() {

+        return new CTSphereCoords();

     }

 

     /**

-     * Create an instance of {@link CTPolarAdjustHandle }

+     * Create an instance of {@link CTPositivePercentage }

      * 

      */

-    public CTPolarAdjustHandle createCTPolarAdjustHandle() {

-        return new CTPolarAdjustHandle();

+    public CTPositivePercentage createCTPositivePercentage() {

+        return new CTPositivePercentage();

     }

 

     /**

-     * Create an instance of {@link CTPath2DClose }

+     * Create an instance of {@link CTAdjPoint2D }

      * 

      */

-    public CTPath2DClose createCTPath2DClose() {

-        return new CTPath2DClose();

+    public CTAdjPoint2D createCTAdjPoint2D() {

+        return new CTAdjPoint2D();

     }

 

     /**

-     * Create an instance of {@link CTPoint2D }

+     * Create an instance of {@link CTPath2DCubicBezierTo }

      * 

      */

-    public CTPoint2D createCTPoint2D() {

-        return new CTPoint2D();

+    public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {

+        return new CTPath2DCubicBezierTo();

     }

 

     /**

-     * Create an instance of {@link CTInverseTransform }

+     * Create an instance of {@link CTEmbeddedWAVAudioFile }

      * 

      */

-    public CTInverseTransform createCTInverseTransform() {

-        return new CTInverseTransform();

+    public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {

+        return new CTEmbeddedWAVAudioFile();

     }

 

     /**

-     * Create an instance of {@link CTPercentage }

+     * Create an instance of {@link CTPresetGeometry2D }

      * 

      */

-    public CTPercentage createCTPercentage() {

-        return new CTPercentage();

+    public CTPresetGeometry2D createCTPresetGeometry2D() {

+        return new CTPresetGeometry2D();

     }

 

     /**

-     * Create an instance of {@link CTSystemColor }

+     * Create an instance of {@link CTSchemeColor }

      * 

      */

-    public CTSystemColor createCTSystemColor() {

-        return new CTSystemColor();

+    public CTSchemeColor createCTSchemeColor() {

+        return new CTSchemeColor();

     }

 

     /**

-     * Create an instance of {@link CTConnectionSite }

+     * Create an instance of {@link CTInverseTransform }

      * 

      */

-    public CTConnectionSite createCTConnectionSite() {

-        return new CTConnectionSite();

+    public CTInverseTransform createCTInverseTransform() {

+        return new CTInverseTransform();

     }

 

     /**

-     * Create an instance of {@link CTColor }

+     * Create an instance of {@link CTScRgbColor }

      * 

      */

-    public CTColor createCTColor() {

-        return new CTColor();

+    public CTScRgbColor createCTScRgbColor() {

+        return new CTScRgbColor();

     }

 

     /**

@@ -165,115 +165,115 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link CTFixedPercentage }

+     * Create an instance of {@link CTInverseGammaTransform }

      * 

      */

-    public CTFixedPercentage createCTFixedPercentage() {

-        return new CTFixedPercentage();

+    public CTInverseGammaTransform createCTInverseGammaTransform() {

+        return new CTInverseGammaTransform();

     }

 

     /**

-     * Create an instance of {@link CTHslColor }

+     * Create an instance of {@link CTColorMRU }

      * 

      */

-    public CTHslColor createCTHslColor() {

-        return new CTHslColor();

+    public CTColorMRU createCTColorMRU() {

+        return new CTColorMRU();

     }

 

     /**

-     * Create an instance of {@link CTConnection }

+     * Create an instance of {@link CTPath2DArcTo }

      * 

      */

-    public CTConnection createCTConnection() {

-        return new CTConnection();

+    public CTPath2DArcTo createCTPath2DArcTo() {

+        return new CTPath2DArcTo();

     }

 

     /**

-     * Create an instance of {@link CTPath2DLineTo }

+     * Create an instance of {@link CTSystemColor }

      * 

      */

-    public CTPath2DLineTo createCTPath2DLineTo() {

-        return new CTPath2DLineTo();

+    public CTSystemColor createCTSystemColor() {

+        return new CTSystemColor();

     }

 

     /**

-     * Create an instance of {@link CTTransform2D }

+     * Create an instance of {@link CTGroupTransform2D }

      * 

      */

-    public CTTransform2D createCTTransform2D() {

-        return new CTTransform2D();

+    public CTGroupTransform2D createCTGroupTransform2D() {

+        return new CTGroupTransform2D();

     }

 

     /**

-     * Create an instance of {@link CTPositivePercentage }

+     * Create an instance of {@link CTPoint2D }

      * 

      */

-    public CTPositivePercentage createCTPositivePercentage() {

-        return new CTPositivePercentage();

+    public CTPoint2D createCTPoint2D() {

+        return new CTPoint2D();

     }

 

     /**

-     * Create an instance of {@link CTVector3D }

+     * Create an instance of {@link CTGeomRect }

      * 

      */

-    public CTVector3D createCTVector3D() {

-        return new CTVector3D();

+    public CTGeomRect createCTGeomRect() {

+        return new CTGeomRect();

     }

 

     /**

-     * Create an instance of {@link CTSphereCoords }

+     * Create an instance of {@link CTScale2D }

      * 

      */

-    public CTSphereCoords createCTSphereCoords() {

-        return new CTSphereCoords();

+    public CTScale2D createCTScale2D() {

+        return new CTScale2D();

     }

 

     /**

-     * Create an instance of {@link CTPath2D }

+     * Create an instance of {@link CTGeomGuide }

      * 

      */

-    public CTPath2D createCTPath2D() {

-        return new CTPath2D();

+    public CTGeomGuide createCTGeomGuide() {

+        return new CTGeomGuide();

     }

 

     /**

-     * Create an instance of {@link CTGroupTransform2D }

+     * Create an instance of {@link CTXYAdjustHandle }

      * 

      */

-    public CTGroupTransform2D createCTGroupTransform2D() {

-        return new CTGroupTransform2D();

+    public CTXYAdjustHandle createCTXYAdjustHandle() {

+        return new CTXYAdjustHandle();

     }

 

     /**

-     * Create an instance of {@link CTGrayscaleTransform }

+     * Create an instance of {@link CTCustomGeometry2D }

      * 

      */

-    public CTGrayscaleTransform createCTGrayscaleTransform() {

-        return new CTGrayscaleTransform();

+    public CTCustomGeometry2D createCTCustomGeometry2D() {

+        return new CTCustomGeometry2D();

     }

 

     /**

-     * Create an instance of {@link CTRatio }

+     * Create an instance of {@link CTOfficeArtExtension }

      * 

      */

-    public CTRatio createCTRatio() {

-        return new CTRatio();

+    public CTOfficeArtExtension createCTOfficeArtExtension() {

+        return new CTOfficeArtExtension();

     }

 

     /**

-     * Create an instance of {@link CTSRgbColor }

+     * Create an instance of {@link CTGrayscaleTransform }

      * 

      */

-    public CTSRgbColor createCTSRgbColor() {

-        return new CTSRgbColor();

+    public CTGrayscaleTransform createCTGrayscaleTransform() {

+        return new CTGrayscaleTransform();

     }

 

     /**

-     * Create an instance of {@link CTGeomGuideList }

+     * Create an instance of {@link CTPath2DClose }

      * 

      */

-    public CTGeomGuideList createCTGeomGuideList() {

-        return new CTGeomGuideList();

+    public CTPath2DClose createCTPath2DClose() {

+        return new CTPath2DClose();

     }

 

     /**

@@ -285,227 +285,227 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link CTPath2DCubicBezierTo }

+     * Create an instance of {@link CTPoint3D }

      * 

      */

-    public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {

-        return new CTPath2DCubicBezierTo();

+    public CTPoint3D createCTPoint3D() {

+        return new CTPoint3D();

     }

 

     /**

-     * Create an instance of {@link CTXYAdjustHandle }

+     * Create an instance of {@link CTPositiveFixedPercentage }

      * 

      */

-    public CTXYAdjustHandle createCTXYAdjustHandle() {

-        return new CTXYAdjustHandle();

+    public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {

+        return new CTPositiveFixedPercentage();

     }

 

     /**

-     * Create an instance of {@link CTPresetColor }

+     * Create an instance of {@link CTPath2D }

      * 

      */

-    public CTPresetColor createCTPresetColor() {

-        return new CTPresetColor();

+    public CTPath2D createCTPath2D() {

+        return new CTPath2D();

     }

 

     /**

-     * Create an instance of {@link CTOfficeArtExtension }

+     * Create an instance of {@link CTAdjustHandleList }

      * 

      */

-    public CTOfficeArtExtension createCTOfficeArtExtension() {

-        return new CTOfficeArtExtension();

+    public CTAdjustHandleList createCTAdjustHandleList() {

+        return new CTAdjustHandleList();

     }

 

     /**

-     * Create an instance of {@link CTSchemeColor }

+     * Create an instance of {@link CTConnectionSiteList }

      * 

      */

-    public CTSchemeColor createCTSchemeColor() {

-        return new CTSchemeColor();

+    public CTConnectionSiteList createCTConnectionSiteList() {

+        return new CTConnectionSiteList();

     }

 

     /**

-     * Create an instance of {@link CTConnectionSiteList }

+     * Create an instance of {@link CTPresetTextShape }

      * 

      */

-    public CTConnectionSiteList createCTConnectionSiteList() {

-        return new CTConnectionSiteList();

+    public CTPresetTextShape createCTPresetTextShape() {

+        return new CTPresetTextShape();

     }

 

     /**

-     * Create an instance of {@link CTPath2DArcTo }

+     * Create an instance of {@link CTSRgbColor }

      * 

      */

-    public CTPath2DArcTo createCTPath2DArcTo() {

-        return new CTPath2DArcTo();

+    public CTSRgbColor createCTSRgbColor() {

+        return new CTSRgbColor();

     }

 

     /**

-     * Create an instance of {@link CTPath2DList }

+     * Create an instance of {@link CTPath2DMoveTo }

      * 

      */

-    public CTPath2DList createCTPath2DList() {

-        return new CTPath2DList();

+    public CTPath2DMoveTo createCTPath2DMoveTo() {

+        return new CTPath2DMoveTo();

     }

 

     /**

-     * Create an instance of {@link CTAngle }

+     * Create an instance of {@link CTRelativeRect }

      * 

      */

-    public CTAngle createCTAngle() {

-        return new CTAngle();

+    public CTRelativeRect createCTRelativeRect() {

+        return new CTRelativeRect();

     }

 

     /**

-     * Create an instance of {@link CTScale2D }

+     * Create an instance of {@link CTPath2DList }

      * 

      */

-    public CTScale2D createCTScale2D() {

-        return new CTScale2D();

+    public CTPath2DList createCTPath2DList() {

+        return new CTPath2DList();

     }

 

     /**

-     * Create an instance of {@link CTPositiveSize2D }

+     * Create an instance of {@link CTPolarAdjustHandle }

      * 

      */

-    public CTPositiveSize2D createCTPositiveSize2D() {

-        return new CTPositiveSize2D();

+    public CTPolarAdjustHandle createCTPolarAdjustHandle() {

+        return new CTPolarAdjustHandle();

     }

 

     /**

-     * Create an instance of {@link CTOfficeArtExtensionList }

+     * Create an instance of {@link CTPercentage }

      * 

      */

-    public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {

-        return new CTOfficeArtExtensionList();

+    public CTPercentage createCTPercentage() {

+        return new CTPercentage();

     }

 

     /**

-     * Create an instance of {@link CTHyperlink }

+     * Create an instance of {@link CTHslColor }

      * 

      */

-    public CTHyperlink createCTHyperlink() {

-        return new CTHyperlink();

+    public CTHslColor createCTHslColor() {

+        return new CTHslColor();

     }

 

     /**

-     * Create an instance of {@link CTPoint3D }

+     * Create an instance of {@link CTRatio }

      * 

      */

-    public CTPoint3D createCTPoint3D() {

-        return new CTPoint3D();

+    public CTRatio createCTRatio() {

+        return new CTRatio();

     }

 

     /**

-     * Create an instance of {@link CTInverseGammaTransform }

+     * Create an instance of {@link CTGeomGuideList }

      * 

      */

-    public CTInverseGammaTransform createCTInverseGammaTransform() {

-        return new CTInverseGammaTransform();

+    public CTGeomGuideList createCTGeomGuideList() {

+        return new CTGeomGuideList();

     }

 

     /**

-     * Create an instance of {@link CTPositiveFixedPercentage }

+     * Create an instance of {@link CTTransform2D }

      * 

      */

-    public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {

-        return new CTPositiveFixedPercentage();

+    public CTTransform2D createCTTransform2D() {

+        return new CTTransform2D();

     }

 

     /**

-     * Create an instance of {@link CTGeomRect }

+     * Create an instance of {@link CTGammaTransform }

      * 

      */

-    public CTGeomRect createCTGeomRect() {

-        return new CTGeomRect();

+    public CTGammaTransform createCTGammaTransform() {

+        return new CTGammaTransform();

     }

 

     /**

-     * Create an instance of {@link CTPresetTextShape }

+     * Create an instance of {@link CTPath2DQuadBezierTo }

      * 

      */

-    public CTPresetTextShape createCTPresetTextShape() {

-        return new CTPresetTextShape();

+    public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {

+        return new CTPath2DQuadBezierTo();

     }

 

     /**

-     * Create an instance of {@link CTColorMRU }

+     * Create an instance of {@link CTAngle }

      * 

      */

-    public CTColorMRU createCTColorMRU() {

-        return new CTColorMRU();

+    public CTAngle createCTAngle() {

+        return new CTAngle();

     }

 

     /**

-     * Create an instance of {@link CTPath2DMoveTo }

+     * Create an instance of {@link CTConnectionSite }

      * 

      */

-    public CTPath2DMoveTo createCTPath2DMoveTo() {

-        return new CTPath2DMoveTo();

+    public CTConnectionSite createCTConnectionSite() {

+        return new CTConnectionSite();

     }

 

     /**

-     * Create an instance of {@link CTEmbeddedWAVAudioFile }

+     * Create an instance of {@link CTHyperlink }

      * 

      */

-    public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {

-        return new CTEmbeddedWAVAudioFile();

+    public CTHyperlink createCTHyperlink() {

+        return new CTHyperlink();

     }

 

     /**

-     * Create an instance of {@link CTScRgbColor }

+     * Create an instance of {@link CTFixedPercentage }

      * 

      */

-    public CTScRgbColor createCTScRgbColor() {

-        return new CTScRgbColor();

+    public CTFixedPercentage createCTFixedPercentage() {

+        return new CTFixedPercentage();

     }

 

     /**

-     * Create an instance of {@link CTPresetGeometry2D }

+     * Create an instance of {@link CTPath2DLineTo }

      * 

      */

-    public CTPresetGeometry2D createCTPresetGeometry2D() {

-        return new CTPresetGeometry2D();

+    public CTPath2DLineTo createCTPath2DLineTo() {

+        return new CTPath2DLineTo();

     }

 

     /**

-     * Create an instance of {@link CTGeomGuide }

+     * Create an instance of {@link CTColor }

      * 

      */

-    public CTGeomGuide createCTGeomGuide() {

-        return new CTGeomGuide();

+    public CTColor createCTColor() {

+        return new CTColor();

     }

 

     /**

-     * Create an instance of {@link CTRelativeRect }

+     * Create an instance of {@link CTPresetColor }

      * 

      */

-    public CTRelativeRect createCTRelativeRect() {

-        return new CTRelativeRect();

+    public CTPresetColor createCTPresetColor() {

+        return new CTPresetColor();

     }

 

     /**

-     * Create an instance of {@link CTAdjustHandleList }

+     * Create an instance of {@link CTVector3D }

      * 

      */

-    public CTAdjustHandleList createCTAdjustHandleList() {

-        return new CTAdjustHandleList();

+    public CTVector3D createCTVector3D() {

+        return new CTVector3D();

     }

 

     /**

-     * Create an instance of {@link CTAdjPoint2D }

+     * Create an instance of {@link CTOfficeArtExtensionList }

      * 

      */

-    public CTAdjPoint2D createCTAdjPoint2D() {

-        return new CTAdjPoint2D();

+    public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {

+        return new CTOfficeArtExtensionList();

     }

 

     /**

-     * Create an instance of {@link CTGammaTransform }

+     * Create an instance of {@link CTConnection }

      * 

      */

-    public CTGammaTransform createCTGammaTransform() {

-        return new CTGammaTransform();

+    public CTConnection createCTConnection() {

+        return new CTConnection();

     }

 

     /**

@@ -545,21 +545,21 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)

-    public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)

+    public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)

-    public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)

+    public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);

     }

 

     /**

@@ -581,21 +581,21 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)

-    public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {

-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)

+    public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)

-    public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)

+    public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {

+        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);

     }

 

     /**

@@ -653,21 +653,21 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)

-    public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)

+    public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {

+        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)

-    public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {

-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)

+    public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);

     }

 

     /**

@@ -761,759 +761,759 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)

-    public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {

-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)

+    public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {

+        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)

-    public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {

-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)

+    public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {

+        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {

-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)

+    public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {

+        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {

-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)

+    public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {

+        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {

-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)

+    public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {

+        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)

-    public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {

-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)

+    public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {

+        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)

-    public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {

-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)

+    public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {

+        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)

-    public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)

+    public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)

-    public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)

+    public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)

-    public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {

-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)

+    public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {

+        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)

-    public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {

-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)

+    public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {

+        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)

-    public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {

-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)

+    public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {

+        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {

-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {

+        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {

-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {

+        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {

+        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {

-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)

-    public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {

-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)

+    public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {

+        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)

-    public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {

-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)

+    public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {

+        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)

-    public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)

+    public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)

-    public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)

+    public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)

-    public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {

-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)

+    public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {

+        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)

-    public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {

-        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)

+    public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {

+        return new JAXBElement<CTGammaTransform>(_CTSRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)

-    public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {

-        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)

+    public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {

+        return new JAXBElement<CTInverseGammaTransform>(_CTSRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)

-    public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {

-        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {

+        return new JAXBElement<CTFixedPercentage>(_CTSRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)

-    public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {

-        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {

+        return new JAXBElement<CTPositiveFixedAngle>(_CTSRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {

+        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)

-    public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {

-        return new JAXBElement<CTAngle>(_CTSRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)

-    public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {

-        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)

+    public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {

+        return new JAXBElement<CTInverseTransform>(_CTSRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)

-    public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {

-        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)

+    public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {

+        return new JAXBElement<CTComplementTransform>(_CTSRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)

-    public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)

+    public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)

-    public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)

+    public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)

-    public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {

-        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)

+    public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {

+        return new JAXBElement<CTGrayscaleTransform>(_CTSRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);

     }

 

     /**

@@ -1628,18 +1628,18 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)

-    public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)

+    public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)

-    public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)

+    public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);

     }

 

     /**

@@ -1769,21 +1769,21 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)

-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {

-        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)

+    public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)

-    public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)

+    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {

+        return new JAXBElement<CTPositiveFixedPercentage>(_CTSRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);

     }

 

     /**

@@ -1805,21 +1805,21 @@ public class ObjectFactory {
     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)

-    public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {

-        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)

+    public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);

     }

 

     /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)

-    public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)

+    public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {

+        return new JAXBElement<CTPositivePercentage>(_CTSRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);

     }

 

     /**

@@ -1880,18 +1880,18 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)

-    public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)

+    public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);

     }

 

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}

      * 

      */

-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)

-    public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {

-        return new JAXBElement<CTPercentage>(_CTSRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);

+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)

+    public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {

+        return new JAXBElement<CTPercentage>(_CTSRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);

     }

 

     /**

diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
index e0843a11a1..ec288854a2 100644
--- a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
@@ -17,6 +17,26 @@
 

 package org.apache.poi.sl.usermodel;

 

+import java.awt.geom.GeneralPath;

+

 public interface FreeformShape<T extends TextParagraph<? extends TextRun>> extends AutoShape<T> {

+    /**

+     * Gets the shape path.

+     * <p>

+     *     The path is translated in the shape's coordinate system, i.e.

+     *     freeform.getPath().getBounds2D() equals to freeform.getAnchor()

+     *     (small discrepancies are possible due to rounding errors)

+     * </p>

+     *

+     * @return the path

+     */

+    GeneralPath getPath();

 

+    /**

+     * Set the shape path

+     *

+     * @param path  shape outline

+     * @return the number of points written

+     */

+    int setPath(GeneralPath path);

 }

diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java b/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
index 5fb315147e..199e45e351 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
+++ b/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
@@ -79,11 +79,21 @@ public interface ConditionalFormattingRule {
     PatternFormatting getPatternFormatting();

 

     /**

+     * @return - databar / data-bar formatting object if defined, <code>null</code> otherwise

+     */

+    DataBarFormatting getDataBarFormatting();

+    

+    /**

      * @return - icon / multi-state formatting object if defined, <code>null</code> otherwise

      */

     IconMultiStateFormatting getMultiStateFormatting();

     

     /**

+     * @return color scale / color grate formatting object if defined, <code>null</code> otherwise

+     */

+    ColorScaleFormatting getColorScaleFormatting();

+    

+    /**

      * Type of conditional formatting rule.

      * <p>

      * MUST be one of the IDs of a {@link ConditionType}

diff --git a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java b/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
index c073237232..893ce41ec2 100644
--- a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
+++ b/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
@@ -51,6 +51,12 @@ public interface CreationHelper {
      * @return a FormulaEvaluator instance
      */
     FormulaEvaluator createFormulaEvaluator();
+    
+    /**
+     * Creates a XSSF-style Color object, used for extended sheet
+     *  formattings and conditional formattings
+     */
+    ExtendedColor createExtendedColor();
 
     ClientAnchor createClientAnchor();
 }
diff --git a/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java b/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java
new file mode 100644
index 0000000000..eaab553ace
--- /dev/null
+++ b/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java
@@ -0,0 +1,254 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.ss.usermodel;
+
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Color;
+
+/**
+ * Represents a XSSF-style color (based on either a
+ *  {@link org.apache.poi.xssf.usermodel.XSSFColor} or a
+ *  {@link org.apache.poi.hssf.record.common.ExtendedColor} 
+ */
+public abstract class ExtendedColor implements Color {
+    protected void setColor(java.awt.Color clr) {
+        setRGB(new byte[]{(byte)clr.getRed(), (byte)clr.getGreen(), (byte)clr.getBlue()});
+    }
+
+    /**
+     * A boolean value indicating the color is automatic
+     */
+    public abstract boolean isAuto();
+
+    /**
+     * A boolean value indicating the color is indexed
+     */
+    public abstract boolean isIndexed();
+
+    /**
+     * A boolean value indicating the color is RGB / ARGB
+     */
+    public abstract boolean isRGB();
+    
+    /**
+     * A boolean value indicating the color is from a Theme
+     */
+    public abstract boolean isThemed();
+    
+    /**
+     * Indexed Color value, if {@link #isIndexed()} is true
+     */
+    public abstract short getIndex();
+    
+    /**
+     * Index of Theme color, if {@link #isThemed()} is true
+     */
+    public abstract int getTheme();
+
+    /**
+     * Standard Red Green Blue ctColor value (RGB).
+     * If there was an A (Alpha) value, it will be stripped.
+     */
+    public abstract byte[] getRGB();
+    /**
+     * Standard Alpha Red Green Blue ctColor value (ARGB).
+     */
+    public abstract byte[] getARGB();
+
+    /**
+     * RGB or ARGB or null
+     */
+    protected abstract byte[] getStoredRBG();
+    
+    /**
+     * Sets the Red Green Blue or Alpha Red Green Blue
+     */
+    public abstract void setRGB(byte[] rgb);
+   
+    protected byte[] getRGBOrARGB() {
+        byte[] rgb = null;
+
+        if (isIndexed() && getIndex() > 0) {
+            int indexNum = getIndex();
+            HSSFColor indexed = HSSFColor.getIndexHash().get(indexNum);
+            if (indexed != null) {
+               rgb = new byte[3];
+               rgb[0] = (byte) indexed.getTriplet()[0];
+               rgb[1] = (byte) indexed.getTriplet()[1];
+               rgb[2] = (byte) indexed.getTriplet()[2];
+               return rgb;
+            }
+         }
+
+         // Grab the colour
+         rgb = getStoredRBG();
+         return rgb;
+     }
+
+    /**
+     * Standard Red Green Blue ctColor value (RGB) with applied tint.
+     * Alpha values are ignored.
+     */
+    public byte[] getRGBWithTint() {
+        byte[] rgb = getStoredRBG();
+        if (rgb != null) {
+            if(rgb.length == 4) {
+               byte[] tmp = new byte[3];
+               System.arraycopy(rgb, 1, tmp, 0, 3);
+               rgb = tmp;
+            }
+            for (int i = 0; i < rgb.length; i++){
+                rgb[i] = applyTint(rgb[i] & 0xFF, getTint());
+            }
+        }
+        return rgb;
+    }
+
+    /**
+     * Return the ARGB value in hex format, eg FF00FF00.
+     * Works for both regular and indexed colours.
+     */
+    public String getARGBHex() {
+       StringBuffer sb = new StringBuffer();
+       byte[] rgb = getARGB();
+       if(rgb == null) {
+          return null;
+       }
+       for(byte c : rgb) {
+          int i = c & 0xff;
+          String cs = Integer.toHexString(i);
+          if(cs.length() == 1) {
+             sb.append('0');
+          }
+          sb.append(cs);
+       }
+       return sb.toString().toUpperCase();
+    }
+    
+    /**
+     * Sets the ARGB value from hex format, eg FF0077FF.
+     * Only works for regular (non-indexed) colours
+     */
+    public void setARGBHex(String argb) {
+        if (argb.length() == 6 || argb.length() == 8) {
+            byte[] rgb = new byte[argb.length()/2];
+            for (int i=0; i<rgb.length; i++) {
+                String part = argb.substring(i*2,(i+1)*2);
+                rgb[i] = (byte)Integer.parseInt(part, 16);
+            }
+            setRGB(rgb);
+        } else {
+            throw new IllegalArgumentException("Must be of the form 112233 or FFEEDDCC");
+        }
+    }
+
+    private static byte applyTint(int lum, double tint){
+        if(tint > 0){
+            return (byte)(lum * (1.0-tint) + (255 - 255 * (1.0-tint)));
+        } else if (tint < 0){
+            return (byte)(lum*(1+tint));
+        } else {
+            return (byte)lum;
+        }
+    }
+
+    /**
+     * Specifies the tint value applied to the ctColor.
+     *
+     * <p>
+     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
+     * ctColor applied.
+     * </p>
+     * <p>
+     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
+     * 1.0 means 100% lighten. Also, 0.0 means no change.
+     * </p>
+     * <p>
+     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
+     * HLSMAX is currently 255.
+     * </p>
+     * Here are some examples of how to apply tint to ctColor:
+     * <blockquote>
+     * <pre>
+     * If (tint &lt; 0)
+     * Lum' = Lum * (1.0 + tint)
+     *
+     * For example: Lum = 200; tint = -0.5; Darken 50%
+     * Lum' = 200 * (0.5) =&gt; 100
+     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
+     * Lum' = 200 * (1.0-1.0) =&gt; 0
+     * If (tint &gt; 0)
+     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
+     * For example: Lum = 100; tint = 0.75; Lighten 75%
+     *
+     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
+     * = 100 * .25 + (255 - 255 * .25)
+     * = 25 + (255 - 63) = 25 + 192 = 217
+     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
+     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
+     * = 100 * 0 + (255 - 255 * 0)
+     * = 0 + (255 - 0) = 255
+     * </pre>
+     * </blockquote>
+     *
+     * @return the tint value
+     */
+    public abstract double getTint();
+
+    /**
+     * Specifies the tint value applied to the ctColor.
+     *
+     * <p>
+     * If tint is supplied, then it is applied to the RGB value of the ctColor to determine the final
+     * ctColor applied.
+     * </p>
+     * <p>
+     * The tint value is stored as a double from -1.0 .. 1.0, where -1.0 means 100% darken and
+     * 1.0 means 100% lighten. Also, 0.0 means no change.
+     * </p>
+     * <p>
+     * In loading the RGB value, it is converted to HLS where HLS values are (0..HLSMAX), where
+     * HLSMAX is currently 255.
+     * </p>
+     * Here are some examples of how to apply tint to ctColor:
+     * <blockquote>
+     * <pre>
+     * If (tint &lt; 0)
+     * Lum' = Lum * (1.0 + tint)
+     *
+     * For example: Lum = 200; tint = -0.5; Darken 50%
+     * Lum' = 200 * (0.5) =&gt; 100
+     * For example: Lum = 200; tint = -1.0; Darken 100% (make black)
+     * Lum' = 200 * (1.0-1.0) =&gt; 0
+     * If (tint &gt; 0)
+     * Lum' = Lum * (1.0-tint) + (HLSMAX - HLSMAX * (1.0-tint))
+     * For example: Lum = 100; tint = 0.75; Lighten 75%
+     *
+     * Lum' = 100 * (1-.75) + (HLSMAX - HLSMAX*(1-.75))
+     * = 100 * .25 + (255 - 255 * .25)
+     * = 25 + (255 - 63) = 25 + 192 = 217
+     * For example: Lum = 100; tint = 1.0; Lighten 100% (make white)
+     * Lum' = 100 * (1-1) + (HLSMAX - HLSMAX*(1-1))
+     * = 100 * 0 + (255 - 255 * 0)
+     * = 0 + (255 - 0) = 255
+     * </pre>
+     * </blockquote>
+     *
+     * @param tint the tint value
+     */
+    public abstract void setTint(double tint);
+}
diff --git a/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java b/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
index a28c342a74..853eec6ff0 100644
--- a/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
+++ b/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
@@ -137,6 +137,18 @@ public interface SheetConditionalFormatting {
     ConditionalFormattingRule createConditionalFormattingRule(String formula);

 

     /**

+     * Create a Databar conditional formatting rule.

+     * <p>The thresholds and colour for it will be created, but will be 

+     *  empty and require configuring with 

+     *  {@link ConditionalFormattingRule#getDataBarFormatting()}

+     *  then

+     *  {@link DataBarFormatting#getMinThreshold()}

+     *  and 

+     *  {@link DataBarFormatting#getMaxThreshold()}

+     */

+    ConditionalFormattingRule createConditionalFormattingRule(ExtendedColor color);

+    

+    /**

      * Create an Icon Set / Multi-State conditional formatting rule.

      * <p>The thresholds for it will be created, but will be empty

      *  and require configuring with 

@@ -146,7 +158,17 @@ public interface SheetConditionalFormatting {
      */

     ConditionalFormattingRule createConditionalFormattingRule(IconSet iconSet);

 

-    // TODO Support types beyond CELL_VALUE_IS and FORMULA and ICONs

+    /**

+     * Create a Color Scale / Color Gradient conditional formatting rule.

+     * <p>The thresholds and colours for it will be created, but will be 

+     *  empty and require configuring with 

+     *  {@link ConditionalFormattingRule#getColorScaleFormatting()}

+     *  then

+     *  {@link ColorScaleFormatting#getThresholds()}

+     *  and

+     *  {@link ColorScaleFormatting#getColors()}

+     */

+    ConditionalFormattingRule createConditionalFormattingColorScaleRule();

     

     /**

     * Gets Conditional Formatting object at a particular index

diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java
index f1d5a2378d..b5f22a1a1a 100644
--- a/src/java/org/apache/poi/util/IOUtils.java
+++ b/src/java/org/apache/poi/util/IOUtils.java
@@ -57,7 +57,7 @@ public final class IOUtils {
         // Wind back those 8 bytes
         if(stream instanceof PushbackInputStream) {
             PushbackInputStream pin = (PushbackInputStream)stream;
-            pin.unread(header);
+            pin.unread(header, 0, read);
         } else {
             stream.reset();
         }
diff --git a/src/java/org/apache/poi/util/Units.java b/src/java/org/apache/poi/util/Units.java
index d7f211db6c..c871fc0a31 100644
--- a/src/java/org/apache/poi/util/Units.java
+++ b/src/java/org/apache/poi/util/Units.java
@@ -20,8 +20,14 @@ package org.apache.poi.util;
  * @author Yegor Kozlov

  */

 public class Units {

+    /**

+     * In Escher absolute distances are specified in

+     * English Metric Units (EMUs), occasionally referred to as A units;

+     * there are 360000 EMUs per centimeter, 914400 EMUs per inch, 12700 EMUs per point.

+     */

     public static final int EMU_PER_PIXEL = 9525;

     public static final int EMU_PER_POINT = 12700;

+    public static final int EMU_PER_CENTIMETER = 360000;

 

     /**

      * Master DPI (576 pixels per inch).

@@ -99,4 +105,17 @@ public class Units {
         points /= POINT_DPI;

         return (int)points;

     }

+    

+    public static int pointsToPixel(double points) {

+        points *= PIXEL_DPI;

+        points /= POINT_DPI;

+        return (int)points;

+    }

+

+    public static double pixelToPoints(int pixel) {

+        double points = pixel;

+        points *= POINT_DPI;

+        points /= PIXEL_DPI;

+        return points;

+    }

 }