]> source.dussan.org Git - poi.git/commitdiff
downgraded xjc params to jdk6 and regenerated geometry binding classes
authorAndreas Beeker <kiwiwings@apache.org>
Wed, 8 Jul 2015 00:09:34 +0000 (00:09 +0000)
committerAndreas Beeker <kiwiwings@apache.org>
Wed, 8 Jul 2015 00:09:34 +0000 (00:09 +0000)
added rendering for auto numbers
fixed various bugs on failing tests
changed xslf paragraph indent to indentLevel to align with hslf
added escher record factory subclass to hslf, to eventually make hslf wrapper classes obsolete

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/common_sl@1689777 13f79535-47bb-0310-9956-ffa450edef68

97 files changed:
build.xml
src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java
src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java
src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java
src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
src/java/org/apache/poi/ddf/EscherTextboxRecord.java
src/java/org/apache/poi/util/Units.java
src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java [deleted file]
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
src/scratchpad/src/org/apache/poi/hslf/model/Line.java
src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java [new file with mode: 0644]
src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java [new file with mode: 0644]
src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java [deleted file]
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java
src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
src/scratchpad/src/org/apache/poi/sl/draw/binding/ObjectFactory.java
src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java [new file with mode: 0644]
src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java
src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java

index f2d6630f5bb392416267b393d89dfb11e4d78f76..9fa34a84e1b9f984ea13abf793d0bd892c7d0eb7 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -586,7 +586,7 @@ under the License.
                     <available file="${ooxml.xsds.jar}"/>
                     <available file="${ooxml.security.jar}"/>
                     <available file="${ooxml.xsds.src.jar}"/>
-                    <available file="${${ooxml.security.src.jar}"/>
+                    <available file="${ooxml.security.src.jar}"/>
                </and>
                 <isset property="disconnected"/>
             </or>
@@ -710,7 +710,8 @@ under the License.
                        <arg value="-readOnly"/>
                        <arg value="-npa"/>
                        <arg value="-no-header"/>
-                       <arg value="-Xlocator"/>
+                       <!--arg value="-mark-generated"/ -->
+                       <!--arg value="-Xlocator"/ -->
                        <arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
                        <arg value="-d"/>
                        <arg file="${geometry.output.tmpdir}"/>
index 458b987320c0f3b8168720b046ab69eaace8d8d6..f552ea88fc291dfae24642f986062be0482086c7 100644 (file)
@@ -56,13 +56,13 @@ public class Tutorial1 {
         // we are going to add text by paragraphs. Clear the default placehoder text before that\r
         bodyPlaceholder.clearText();\r
         XSLFTextParagraph p1 = bodyPlaceholder.addNewTextParagraph();\r
-        p1.setLevel(0);\r
+        p1.setIndentLevel(0);\r
         p1.addNewTextRun().setText("Level1 text");\r
         XSLFTextParagraph p2 = bodyPlaceholder.addNewTextParagraph();\r
-        p2.setLevel(1);\r
+        p2.setIndentLevel(1);\r
         p2.addNewTextRun().setText("Level2 text");\r
         XSLFTextParagraph p3 = bodyPlaceholder.addNewTextParagraph();\r
-        p3.setLevel(3);\r
+        p3.setIndentLevel(3);\r
         p3.addNewTextRun().setText("Level3 text");\r
 \r
         FileOutputStream out = new FileOutputStream("slides.pptx");\r
index 95252d72f563dd2fce9d2211213168d7b542e9d5..443d5684d675b9f6933d227fa5a7aa8550e87c99 100644 (file)
@@ -23,6 +23,8 @@ import java.awt.*;
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 \r
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;\r
+\r
 /**\r
  * Bullets and numbering\r
  *\r
@@ -38,7 +40,7 @@ public class Tutorial7 {
         shape.setAnchor(new Rectangle(50, 50, 400, 200));\r
 \r
         XSLFTextParagraph p1 = shape.addNewTextParagraph();\r
-        p1.setLevel(0);\r
+        p1.setIndentLevel(0);\r
         p1.setBullet(true);\r
         XSLFTextRun r1 = p1.addNewTextRun();\r
         r1.setText("Bullet1");\r
@@ -53,26 +55,26 @@ public class Tutorial7 {
         p2.setBulletFontColor(Color.red);\r
         p2.setBulletFont("Wingdings");\r
         p2.setBulletCharacter("\u0075");\r
-        p2.setLevel(1);\r
+        p2.setIndentLevel(1);\r
         XSLFTextRun r2 = p2.addNewTextRun();\r
         r2.setText("Bullet2");\r
 \r
         // the next three paragraphs form an auto-numbered list\r
         XSLFTextParagraph p3 = shape.addNewTextParagraph();\r
-        p3.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 1);\r
-        p3.setLevel(2);\r
+        p3.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 1);\r
+        p3.setIndentLevel(2);\r
         XSLFTextRun r3 = p3.addNewTextRun();\r
         r3.setText("Numbered List Item - 1");\r
 \r
         XSLFTextParagraph p4 = shape.addNewTextParagraph();\r
-        p4.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 2);\r
-        p4.setLevel(2);\r
+        p4.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 2);\r
+        p4.setIndentLevel(2);\r
         XSLFTextRun r4 = p4.addNewTextRun();\r
         r4.setText("Numbered List Item - 2");\r
 \r
         XSLFTextParagraph p5 = shape.addNewTextParagraph();\r
-        p5.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 3);\r
-        p5.setLevel(2);\r
+        p5.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 3);\r
+        p5.setIndentLevel(2);\r
         XSLFTextRun r5 = p5.addNewTextRun();\r
         r5.setText("Numbered List Item - 3");\r
 \r
index 2f0e7e751534cec4df0915527e9e4fda4a3d1294..41c6cc2da24392ba4103cd415a63ed6ebc5281eb 100644 (file)
@@ -50,7 +50,7 @@ public class Step1 {
                 if(shape instanceof XSLFTextShape) {
                     XSLFTextShape tsh = (XSLFTextShape)shape;
                     for(XSLFTextParagraph p : tsh){
-                        System.out.println("Paragraph level: " + p.getLevel());
+                        System.out.println("Paragraph level: " + p.getIndentLevel());
                         for(XSLFTextRun r : p){
                             System.out.println(r.getRawText());
                             System.out.println("  bold: " + r.isBold());
index cf48a38d84a12c41fce0c87ca27e9c2a8ad09d46..05a3246de04e95d5e17a9bd93e2e423804c33e06 100644 (file)
@@ -117,7 +117,7 @@ public class DefaultEscherRecordFactory implements EscherRecordFactory {
      * @param recClasses The records to convert
      * @return The map containing the id/constructor pairs.
      */
-    private static Map<Short, Constructor<? extends EscherRecord>> recordsToMap(Class<?>[] recClasses) {
+    protected static Map<Short, Constructor<? extends EscherRecord>> recordsToMap(Class<?>[] recClasses) {
         Map<Short, Constructor<? extends EscherRecord>> result = new HashMap<Short, Constructor<? extends EscherRecord>>();
         final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
 
index dbf28531fe828dfea4beb2afb093e8fc286e8c1d..1a0147f3d0f081042ea25461b18fd38266fc2f3d 100644 (file)
 
 package org.apache.poi.ddf;
 
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.RecordFormatException;
+import org.apache.poi.util.*;
 
 /**
  * Holds data from the parent application. Most commonly used to store
@@ -33,7 +30,7 @@ import org.apache.poi.util.RecordFormatException;
  */
 public class EscherTextboxRecord extends EscherRecord
 {
-    public static final short RECORD_ID = (short)RecordTypes.EscherClientTextbox;
+    public static final short RECORD_ID = (short)0xf00d;
     public static final String RECORD_DESCRIPTION = "msofbtClientTextbox";
 
     private static final byte[] NO_BYTES = new byte[0];
index 107a9b583ef135d9c7afc6a46518a4f92f1ae869..d7f211db6cbc9a4faf59eeae0cf316cbdb7d6e36 100644 (file)
@@ -16,8 +16,6 @@
 ==================================================================== */\r
 package org.apache.poi.util;\r
 \r
-import org.apache.poi.hslf.usermodel.HSLFShape;\r
-\r
 /**\r
  * @author Yegor Kozlov\r
  */\r
@@ -91,14 +89,14 @@ public class Units {
 \r
     public static double masterToPoints(int masterDPI) {\r
         double points = masterDPI;\r
-        points *= HSLFShape.POINT_DPI;\r
-        points /= HSLFShape.MASTER_DPI;\r
+        points *= POINT_DPI;\r
+        points /= MASTER_DPI;\r
         return points;\r
     }\r
     \r
     public static int pointsToMaster(double points) {\r
-        points *= HSLFShape.MASTER_DPI;\r
-        points /= HSLFShape.POINT_DPI;\r
+        points *= MASTER_DPI;\r
+        points /= POINT_DPI;\r
         return (int)points;\r
     }\r
 }\r
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java
deleted file mode 100644 (file)
index aa1e25b..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*\r
- *  ====================================================================\r
- *    Licensed to the Apache Software Foundation (ASF) under one or more\r
- *    contributor license agreements.  See the NOTICE file distributed with\r
- *    this work for additional information regarding copyright ownership.\r
- *    The ASF licenses this file to You under the Apache License, Version 2.0\r
- *    (the "License"); you may not use this file except in compliance with\r
- *    the License.  You may obtain a copy of the License at\r
- *\r
- *        http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- *    Unless required by applicable law or agreed to in writing, software\r
- *    distributed under the License is distributed on an "AS IS" BASIS,\r
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- *    See the License for the specific language governing permissions and\r
- *    limitations under the License.\r
- * ====================================================================\r
- */\r
-package org.apache.poi.xslf.usermodel;\r
-\r
-/**\r
- * Specifies type of automatic numbered bullet points that should be applied to a paragraph.\r
- *\r
- * @author Yegor Kozlov\r
- */\r
-public enum ListAutoNumber {\r
-    /**\r
-     * (a), (b), (c), ...\r
-     */\r
-    ALPHA_LC_PARENT_BOTH,\r
-    /**\r
-     * (A), (B), (C), ...\r
-     */\r
-    ALPHA_UC_PARENT_BOTH,\r
-    /**\r
-     * a), b), c), ...\r
-     */\r
-    ALPHA_LC_PARENT_R,\r
-    /**\r
-     * A), B), C), ...\r
-     */\r
-    ALPHA_UC_PARENT_R,\r
-    /**\r
-     *  a., b., c., ...\r
-     */\r
-    ALPHA_LC_PERIOD,\r
-    /**\r
-     * A., B., C., ...\r
-     */\r
-    ALPHA_UC_PERIOD,\r
-    /**\r
-     * (1), (2), (3), ...\r
-     */\r
-    ARABIC_PARENT_BOTH,\r
-    /**\r
-     * 1), 2), 3), ...\r
-     */\r
-    ARABIC_PARENT_R,\r
-\r
-    /**\r
-     * 1., 2., 3., ...\r
-     */\r
-    ARABIC_PERIOD,\r
-    /**\r
-     * 1, 2, 3, ...\r
-     */\r
-    ARABIC_PLAIN,\r
-\r
-    /**\r
-     * (i), (ii), (iii), ...\r
-     */\r
-    ROMAN_LC_PARENT_BOTH,\r
-    /**\r
-     * (I), (II), (III), ...\r
-     */\r
-    ROMAN_UC_PARENT_BOTH,\r
-    /**\r
-     * i), ii), iii), ...\r
-     */\r
-    ROMAN_LC_PARENT_R,\r
-    /**\r
-     * I), II), III), ...\r
-     */\r
-    ROMAN_UC_PARENT_R,\r
-    /**\r
-     *  i., ii., iii., ...\r
-     */\r
-    ROMAN_LC_PERIOD ,\r
-    /**\r
-     * I., II., III., ...\r
-     */\r
-    ROMAN_UC_PERIOD,\r
-    /**\r
-     * Dbl-byte circle numbers\r
-     */\r
-    CIRCLE_NUM_DB_PLAIN,\r
-    /**\r
-     * Wingdings black circle numbers\r
-     */\r
-    CIRCLE_NUM_WD_BLACK_PLAIN,\r
-    /**\r
-     * Wingdings white circle numbers\r
-     */\r
-    CIRCLE_NUM_WD_WHITE_PLAIN\r
-}\r
index f0cf3a78a98cd3d6c895125d042f896981591bd8..af71134ba58afb11f8f620461a5f0ab87eb26fb7 100644 (file)
@@ -19,6 +19,7 @@ package org.apache.poi.xslf.usermodel;
 import java.awt.Color;\r
 import java.util.*;\r
 \r
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;\r
 import org.apache.poi.sl.usermodel.TextParagraph;\r
 import org.apache.poi.util.*;\r
 import org.apache.poi.xslf.model.ParagraphPropertyFetcher;\r
@@ -143,7 +144,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * @return alignment that is applied to the paragraph\r
      */\r
     public TextAlign getTextAlign(){\r
-        ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getLevel()){\r
+        ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetAlgn()){\r
                     TextAlign val = TextAlign.values()[props.getAlgn().intValue() - 1];\r
@@ -175,7 +176,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
 \r
     @Override\r
     public FontAlign getFontAlign(){\r
-        ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getLevel()){\r
+        ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetFontAlgn()){\r
                     FontAlign val = FontAlign.values()[props.getFontAlgn().intValue() - 1];\r
@@ -211,7 +212,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * @return the font to be used on bullet characters within a given paragraph\r
      */\r
     public String getBulletFont(){\r
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){\r
+        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetBuFont()){\r
                     setValue(props.getBuFont().getTypeface());\r
@@ -234,7 +235,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * @return the character to be used in place of the standard bullet point\r
      */\r
     public String getBulletCharacter(){\r
-        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){\r
+        ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetBuChar()){\r
                     setValue(props.getBuChar().getChar());\r
@@ -260,7 +261,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      */\r
     public Color getBulletFontColor(){\r
         final XSLFTheme theme = getParentShape().getSheet().getTheme();\r
-        ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getLevel()){\r
+        ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetBuClr()){\r
                     XSLFColor c = new XSLFColor(props.getBuClr(), theme, null);\r
@@ -297,7 +298,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * @return the bullet size\r
      */\r
     public Double getBulletFontSize(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetBuSzPct()){\r
                     setValue(props.getBuSzPct().getVal() * 0.001);\r
@@ -336,6 +337,46 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
         }\r
    }\r
 \r
+    /**\r
+     * @return the auto numbering scheme, or null if not defined\r
+     */\r
+    public AutoNumberingScheme getAutoNumberingScheme() {\r
+        ParagraphPropertyFetcher<AutoNumberingScheme> fetcher = new ParagraphPropertyFetcher<AutoNumberingScheme>(getIndentLevel()) {\r
+            public boolean fetch(CTTextParagraphProperties props) {\r
+                if (props.isSetBuAutoNum()) {\r
+                    AutoNumberingScheme ans = AutoNumberingScheme.forOoxmlID(props.getBuAutoNum().getType().intValue());\r
+                    if (ans != null) {\r
+                        setValue(ans);\r
+                        return true;\r
+                    }\r
+                }\r
+                return false;\r
+            }\r
+        };\r
+        fetchParagraphProperty(fetcher);\r
+        return fetcher.getValue();\r
+    }\r
+\r
+    /**\r
+     * @return the auto numbering starting number, or null if not defined\r
+     */\r
+    public Integer getAutoNumberingStartAt() {\r
+        ParagraphPropertyFetcher<Integer> fetcher = new ParagraphPropertyFetcher<Integer>(getIndentLevel()) {\r
+            public boolean fetch(CTTextParagraphProperties props) {\r
+                if (props.isSetBuAutoNum()) {\r
+                    if (props.getBuAutoNum().isSetStartAt()) {\r
+                        setValue(props.getBuAutoNum().getStartAt());\r
+                        return true;\r
+                    }\r
+                }\r
+                return false;\r
+            }\r
+        };\r
+        fetchParagraphProperty(fetcher);\r
+        return fetcher.getValue();\r
+    }\r
+    \r
+    \r
     @Override\r
     public void setIndent(Double indent){\r
         if (indent == null && !_p.isSetPPr()) return;\r
@@ -350,7 +391,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
     @Override\r
     public Double getIndent() {\r
 \r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetIndent()){\r
                     setValue(Units.toPoints(props.getIndent()));\r
@@ -381,7 +422,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      */\r
     @Override\r
     public Double getLeftMargin(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetMarL()){\r
                     double val = Units.toPoints(props.getMarL());\r
@@ -413,7 +454,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      */\r
     @Override\r
     public Double getRightMargin(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetMarR()){\r
                     double val = Units.toPoints(props.getMarR());\r
@@ -424,13 +465,12 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
             }\r
         };\r
         fetchParagraphProperty(fetcher);\r
-        // if the marL attribute is omitted, then a value of 347663 is implied\r
         return fetcher.getValue();\r
     }\r
 \r
     @Override\r
     public Double getDefaultTabSize(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetDefTabSz()){\r
                     double val = Units.toPoints(props.getDefTabSz());\r
@@ -445,7 +485,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
     }\r
 \r
     public double getTabStop(final int idx){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetTabLst()){\r
                     CTTextTabStopList tabStops = props.getTabLst();\r
@@ -489,7 +529,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
 \r
     @Override\r
     public Double getLineSpacing(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetLnSpc()){\r
                     CTTextSpacing spc = props.getLnSpc();\r
@@ -528,7 +568,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
 \r
     @Override\r
     public Double getSpaceBefore(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetSpcBef()){\r
                     CTTextSpacing spc = props.getSpcBef();\r
@@ -556,7 +596,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
 \r
     @Override\r
     public Double getSpaceAfter(){\r
-        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){\r
+        ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetSpcAft()){\r
                     CTTextSpacing spc = props.getSpcAft();\r
@@ -572,23 +612,14 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
         return fetcher.getValue();\r
     }\r
 \r
-    /**\r
-     * Specifies the particular level text properties that this paragraph will follow.\r
-     * The value for this attribute formats the text according to the corresponding level\r
-     * paragraph properties defined in the SlideMaster.\r
-     *\r
-     * @param level the level (0 ... 4)\r
-     */\r
-    public void setLevel(int level){\r
+    @Override\r
+    public void setIndentLevel(int level){\r
         CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();\r
         pr.setLvl(level);\r
     }\r
 \r
-    /**\r
-     *\r
-     * @return the text level of this paragraph (0-based). Default is 0.\r
-     */\r
-    public int getLevel(){\r
+    @Override\r
+    public int getIndentLevel() {\r
         CTTextParagraphProperties pr = _p.getPPr();\r
         return (pr == null || !pr.isSetLvl()) ? 0 : pr.getLvl();\r
     }\r
@@ -597,7 +628,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * Returns whether this paragraph has bullets\r
      */\r
     public boolean isBullet() {\r
-        ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getLevel()){\r
+        ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getIndentLevel()){\r
             public boolean fetch(CTTextParagraphProperties props){\r
                 if(props.isSetBuNone()) {\r
                     setValue(false);\r
@@ -637,11 +668,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
      * @param startAt the number that will start number for a given sequence of automatically\r
     numbered bullets (1-based).\r
      */\r
-    public void setBulletAutoNumber(ListAutoNumber scheme, int startAt) {\r
+    public void setBulletAutoNumber(AutoNumberingScheme scheme, int startAt) {\r
         if(startAt < 1) throw new IllegalArgumentException("Start Number must be greater or equal that 1") ;\r
         CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();\r
         CTTextAutonumberBullet lst = pr.isSetBuAutoNum() ? pr.getBuAutoNum() : pr.addNewBuAutoNum();\r
-        lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ordinal() + 1));\r
+        lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ooxmlId));\r
         lst.setStartAt(startAt);\r
     }\r
 \r
@@ -669,28 +700,29 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
                 defaultStyleSelector = "bodyStyle";\r
                 break;\r
         }\r
-        int level = getLevel();\r
+        int level = getIndentLevel();\r
 \r
         // wind up and find the root master sheet which must be slide master\r
-        XSLFSheet masterSheet = _shape.getSheet();\r
-        for (XSLFSheet m = masterSheet; m != null; m = (XSLFSheet)m.getMasterSheet()) {\r
-            masterSheet = m;\r
-        }\r
-\r
-        String nsDecl =\r
+        final String nsDecl =\r
             "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +\r
             "declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' ";\r
-        String xpaths[] = {\r
+        final String xpaths[] = {\r
             nsDecl+".//p:txStyles/p:" + defaultStyleSelector +"/a:lvl" +(level+1)+ "pPr",\r
             nsDecl+".//p:notesStyle/a:lvl" +(level+1)+ "pPr"\r
         };\r
-        XmlObject xo = masterSheet.getXmlObject();\r
-        for (String xpath : xpaths) {\r
-            XmlObject[] o = xo.selectPath(xpath);\r
-            if (o.length == 1) {\r
-                return (CTTextParagraphProperties)o[0];\r
+        XSLFSheet masterSheet = _shape.getSheet();\r
+        for (XSLFSheet m = masterSheet; m != null; m = (XSLFSheet)m.getMasterSheet()) {\r
+            masterSheet = m;\r
+\r
+            XmlObject xo = masterSheet.getXmlObject();\r
+            for (String xpath : xpaths) {\r
+                XmlObject[] o = xo.selectPath(xpath);\r
+                if (o.length == 1) {\r
+                    return (CTTextParagraphProperties)o[0];\r
+                }\r
             }\r
         }\r
+\r
         \r
 //        for (CTTextBody txBody : (CTTextBody[])xo.selectPath(nsDecl+".//p:txBody")) {\r
 //            CTTextParagraphProperties defaultPr = null, lastPr = null;\r
@@ -730,7 +762,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
                 if(ph == null){\r
                     // if it is a plain text box then take defaults from presentation.xml\r
                     XMLSlideShow ppt = getParentShape().getSheet().getSlideShow();\r
-                    CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getLevel());\r
+                    CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getIndentLevel());\r
                     if(themeProps != null) ok = visitor.fetch(themeProps);\r
                 }\r
 \r
@@ -817,24 +849,40 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> {
         return (_runs.isEmpty() ? "Arial" : _runs.get(0).getFontFamily());\r
     }\r
 \r
+    @Override\r
     public BulletStyle getBulletStyle() {\r
         if (!isBullet()) return null;\r
         return new BulletStyle(){\r
+            @Override\r
             public String getBulletCharacter() {\r
                 return XSLFTextParagraph.this.getBulletCharacter();\r
             }\r
 \r
+            @Override\r
             public String getBulletFont() {\r
                 return XSLFTextParagraph.this.getBulletFont();\r
             }\r
 \r
+            @Override\r
             public Double getBulletFontSize() {\r
                 return XSLFTextParagraph.this.getBulletFontSize();\r
             }\r
 \r
+            @Override\r
             public Color getBulletFontColor() {\r
                 return XSLFTextParagraph.this.getBulletFontColor();\r
             }\r
+            \r
+            @Override\r
+            public AutoNumberingScheme getAutoNumberingScheme() {\r
+                return XSLFTextParagraph.this.getAutoNumberingScheme();\r
+            }\r
+\r
+            @Override\r
+            public Integer getAutoNumberingStartAt() {\r
+                return XSLFTextParagraph.this.getAutoNumberingStartAt();\r
+            }\r
+\r
         };\r
     }\r
 }\r
index d99df7e79a0a3f6b5926c1bc8624179a6468019d..74685ec1b57bff65005590fb2b3f02a972e756d3 100644 (file)
@@ -101,7 +101,7 @@ public class XSLFTextRun implements TextRun {
         CTShapeStyle style = _p.getParentShape().getSpStyle();\r
         final CTSchemeColor phClr = style == null ? null : style.getFontRef().getSchemeClr();\r
 \r
-        CharacterPropertyFetcher<Color> fetcher = new CharacterPropertyFetcher<Color>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Color> fetcher = new CharacterPropertyFetcher<Color>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 CTSolidColorFillProperties solidFill = props.getSolidFill();\r
                 if(solidFill != null) {\r
@@ -146,7 +146,7 @@ public class XSLFTextRun implements TextRun {
         CTTextNormalAutofit afit = getParentParagraph().getParentShape().getTextBodyPr().getNormAutofit();\r
         if(afit != null) scale = (double)afit.getFontScale() / 100000;\r
 \r
-        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetSz()){\r
                     setValue(props.getSz()*0.01);\r
@@ -166,7 +166,7 @@ public class XSLFTextRun implements TextRun {
      */\r
     public double getCharacterSpacing(){\r
 \r
-        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetSpc()){\r
                     setValue(props.getSpc()*0.01);\r
@@ -233,7 +233,7 @@ public class XSLFTextRun implements TextRun {
     public String getFontFamily(){\r
         final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();\r
 \r
-        CharacterPropertyFetcher<String> visitor = new CharacterPropertyFetcher<String>(_p.getLevel()){\r
+        CharacterPropertyFetcher<String> visitor = new CharacterPropertyFetcher<String>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 CTTextFont font = props.getLatin();\r
                 if(font != null){\r
@@ -257,7 +257,7 @@ public class XSLFTextRun implements TextRun {
     public byte getPitchAndFamily(){\r
         final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();\r
 \r
-        CharacterPropertyFetcher<Byte> visitor = new CharacterPropertyFetcher<Byte>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Byte> visitor = new CharacterPropertyFetcher<Byte>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 CTTextFont font = props.getLatin();\r
                 if(font != null){\r
@@ -285,7 +285,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether a run of text will be formatted as strikethrough text. Default is false.\r
      */\r
     public boolean isStrikethrough() {\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetStrike()){\r
                     setValue(props.getStrike() != STTextStrikeType.NO_STRIKE);\r
@@ -302,7 +302,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether a run of text will be formatted as a superscript text. Default is false.\r
      */\r
     public boolean isSuperscript() {\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetBaseline()){\r
                     setValue(props.getBaseline() > 0);\r
@@ -352,7 +352,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether a run of text will be formatted as a superscript text. Default is false.\r
      */\r
     public boolean isSubscript() {\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetBaseline()){\r
                     setValue(props.getBaseline() < 0);\r
@@ -369,7 +369,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether a run of text will be formatted as a superscript text. Default is false.\r
      */\r
     public TextCap getTextCap() {\r
-        CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getLevel()){\r
+        CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetCap()){\r
                     int idx = props.getCap().intValue() - 1;\r
@@ -396,7 +396,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether this run of text is formatted as bold text\r
      */\r
     public boolean isBold(){\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetB()){\r
                     setValue(props.getB());\r
@@ -420,7 +420,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether this run of text is formatted as italic text\r
      */\r
     public boolean isItalic(){\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetI()){\r
                     setValue(props.getI());\r
@@ -444,7 +444,7 @@ public class XSLFTextRun implements TextRun {
      * @return whether this run of text is formatted as underlined text\r
      */\r
     public boolean isUnderlined(){\r
-        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){\r
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){\r
             public boolean fetch(CTTextCharacterProperties props){\r
                 if(props.isSetU()){\r
                     setValue(props.getU() != STTextUnderlineType.NONE);\r
@@ -491,7 +491,7 @@ public class XSLFTextRun implements TextRun {
                 if(ph == null){\r
                     // if it is a plain text box then take defaults from presentation.xml\r
                     XMLSlideShow ppt = shape.getSheet().getSlideShow();\r
-                    CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(_p.getLevel());\r
+                    CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(_p.getIndentLevel());\r
                     if(themeProps != null) {\r
                         fetcher.isFetchingFromMaster = true;\r
                         ok = fetcher.fetch(themeProps);\r
index b3c44f84a774fa018d9849be137abe87381903cb..56766eac84bf4fcdb76b6bf40ab47bd1db202e9c 100644 (file)
@@ -120,7 +120,7 @@ public class TestXSLFAutoShape {
         assertEquals(100., p.getLineSpacing(), 0);\r
         assertEquals(0., p.getSpaceAfter(), 0);\r
         assertEquals(0., p.getSpaceBefore(), 0);\r
-        assertEquals(0, p.getLevel());\r
+        assertEquals(0, p.getIndentLevel());\r
 \r
         p.setIndent(2.0);\r
         assertEquals(2.0, p.getIndent(), 0);\r
@@ -134,11 +134,11 @@ public class TestXSLFAutoShape {
 \r
 \r
         assertFalse(p.getXmlObject().getPPr().isSetLvl());\r
-        p.setLevel(1);\r
-        assertEquals(1, p.getLevel());\r
+        p.setIndentLevel(1);\r
+        assertEquals(1, p.getIndentLevel());\r
         assertTrue(p.getXmlObject().getPPr().isSetLvl());\r
-        p.setLevel(2);\r
-        assertEquals(2, p.getLevel());\r
+        p.setIndentLevel(2);\r
+        assertEquals(2, p.getIndentLevel());\r
 \r
         p.setLeftMargin(2.0);\r
         assertEquals(2.0, p.getLeftMargin(), 0);\r
index 37a01a73ae3ce2eda197fbb500abe7d0606464e1..4d51733353a0ca7e5a836730190d8739c115ce63 100644 (file)
@@ -25,6 +25,7 @@ import java.util.List;
 \r
 import org.apache.poi.sl.draw.DrawTextFragment;\r
 import org.apache.poi.sl.draw.DrawTextParagraph;\r
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;\r
 import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;\r
 import org.apache.poi.util.POILogFactory;\r
 import org.apache.poi.util.POILogger;\r
@@ -297,11 +298,11 @@ public class TestXSLFTextParagraph {
         p.setLeftMargin(-1.0); // the value of -1.0 resets to the defaults\r
         assertEquals(0.0, p.getLeftMargin(), 0);\r
 \r
-        assertEquals(0, p.getLevel());\r
-        p.setLevel(1);\r
-        assertEquals(1, p.getLevel());\r
-        p.setLevel(2);\r
-        assertEquals(2, p.getLevel());\r
+        assertEquals(0, p.getIndentLevel());\r
+        p.setIndentLevel(1);\r
+        assertEquals(1, p.getIndentLevel());\r
+        p.setIndentLevel(2);\r
+        assertEquals(2, p.getIndentLevel());\r
 \r
         assertEquals(100., p.getLineSpacing(), 0);\r
         p.setLineSpacing(200.);\r
@@ -328,7 +329,7 @@ public class TestXSLFTextParagraph {
         p.setBullet(false);\r
         assertFalse(p.isBullet());\r
 \r
-        p.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_BOTH, 1);\r
+        p.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenBoth, 1);\r
 \r
         double tabStop = p.getTabStop(0);\r
         assertEquals(0.0, tabStop, 0);\r
index b19d069b0d689d93e9dc605611680abd298d23c4..c3aabe051d91a97618494c7004e8062176751093 100644 (file)
@@ -180,7 +180,7 @@ public class TestXSLFTextShape {
         assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());\r
 \r
         XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr1.getParentParagraph().getLevel());\r
+        assertEquals(0, pr1.getParentParagraph().getIndentLevel());\r
         assertEquals("Content", pr1.getRawText());\r
         assertEquals("Calibri", pr1.getFontFamily());\r
         assertEquals(32.0, pr1.getFontSize(), 0);\r
@@ -189,7 +189,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr1.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);\r
-        assertEquals(1, pr2.getParentParagraph().getLevel());\r
+        assertEquals(1, pr2.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 2", pr2.getRawText());\r
         assertEquals("Calibri", pr2.getFontFamily());\r
         assertEquals(28.0, pr2.getFontSize(), 0);\r
@@ -198,7 +198,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr2.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);\r
-        assertEquals(2, pr3.getParentParagraph().getLevel());\r
+        assertEquals(2, pr3.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 3", pr3.getRawText());\r
         assertEquals("Calibri", pr3.getFontFamily());\r
         assertEquals(24.0, pr3.getFontSize(), 0);\r
@@ -207,7 +207,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr3.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);\r
-        assertEquals(3, pr4.getParentParagraph().getLevel());\r
+        assertEquals(3, pr4.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 4", pr4.getRawText());\r
         assertEquals("Calibri", pr4.getFontFamily());\r
         assertEquals(20.0, pr4.getFontSize(), 0);\r
@@ -216,7 +216,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr4.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr5 = shape2.getTextParagraphs().get(4).getTextRuns().get(0);\r
-        assertEquals(4, pr5.getParentParagraph().getLevel());\r
+        assertEquals(4, pr5.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 5", pr5.getRawText());\r
         assertEquals("Calibri", pr5.getFontFamily());\r
         assertEquals(20.0, pr5.getFontSize(), 0);\r
@@ -362,7 +362,7 @@ public class TestXSLFTextShape {
         assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());\r
 \r
         XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr1.getParentParagraph().getLevel());\r
+        assertEquals(0, pr1.getParentParagraph().getIndentLevel());\r
         assertEquals("Left", pr1.getRawText());\r
         assertEquals("Calibri", pr1.getFontFamily());\r
         assertEquals(28.0, pr1.getFontSize(), 0);\r
@@ -371,7 +371,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr1.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);\r
-        assertEquals(1, pr2.getParentParagraph().getLevel());\r
+        assertEquals(1, pr2.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 2", pr2.getParentParagraph().getText());\r
         assertEquals("Calibri", pr2.getFontFamily());\r
         assertEquals(24.0, pr2.getFontSize(), 0);\r
@@ -380,7 +380,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr2.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);\r
-        assertEquals(2, pr3.getParentParagraph().getLevel());\r
+        assertEquals(2, pr3.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 3", pr3.getParentParagraph().getText());\r
         assertEquals("Calibri", pr3.getFontFamily());\r
         assertEquals(20.0, pr3.getFontSize(), 0);\r
@@ -389,7 +389,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr3.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);\r
-        assertEquals(3, pr4.getParentParagraph().getLevel());\r
+        assertEquals(3, pr4.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 4", pr4.getParentParagraph().getText());\r
         assertEquals("Calibri", pr4.getFontFamily());\r
         assertEquals(18.0, pr4.getFontSize(), 0);\r
@@ -399,7 +399,7 @@ public class TestXSLFTextShape {
 \r
         XSLFTextShape shape3 = (XSLFTextShape)shapes.get(2);\r
         XSLFTextRun pr5 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr5.getParentParagraph().getLevel());\r
+        assertEquals(0, pr5.getParentParagraph().getIndentLevel());\r
         assertEquals("Right", pr5.getRawText());\r
         assertEquals("Calibri", pr5.getFontFamily());\r
         assertEquals(Color.black, pr5.getFontColor());\r
@@ -461,7 +461,7 @@ public class TestXSLFTextShape {
         assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());\r
 \r
         XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr1.getParentParagraph().getLevel());\r
+        assertEquals(0, pr1.getParentParagraph().getIndentLevel());\r
         assertEquals("Default Text", pr1.getRawText());\r
         assertEquals("Calibri", pr1.getFontFamily());\r
         assertEquals(18.0, pr1.getFontSize(), 0);\r
@@ -544,7 +544,7 @@ public class TestXSLFTextShape {
         assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());\r
 \r
         XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr1.getParentParagraph().getLevel());\r
+        assertEquals(0, pr1.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 1", pr1.getRawText());\r
         assertEquals("Calibri", pr1.getFontFamily());\r
         assertEquals(32.0, pr1.getFontSize(), 0);\r
@@ -553,7 +553,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr1.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);\r
-        assertEquals(1, pr2.getParentParagraph().getLevel());\r
+        assertEquals(1, pr2.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 2", pr2.getParentParagraph().getText());\r
         assertEquals("Calibri", pr2.getFontFamily());\r
         assertEquals(28.0, pr2.getFontSize(), 0);\r
@@ -562,7 +562,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr2.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);\r
-        assertEquals(2, pr3.getParentParagraph().getLevel());\r
+        assertEquals(2, pr3.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 3", pr3.getParentParagraph().getText());\r
         assertEquals("Calibri", pr3.getFontFamily());\r
         assertEquals(24.0, pr3.getFontSize(), 0);\r
@@ -571,7 +571,7 @@ public class TestXSLFTextShape {
         assertEquals("Arial", pr3.getParentParagraph().getBulletFont());\r
 \r
         XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);\r
-        assertEquals(3, pr4.getParentParagraph().getLevel());\r
+        assertEquals(3, pr4.getParentParagraph().getIndentLevel());\r
         assertEquals("Level 4", pr4.getParentParagraph().getText());\r
         assertEquals("Calibri", pr4.getFontFamily());\r
         assertEquals(20.0, pr4.getFontSize(), 0);\r
@@ -584,7 +584,7 @@ public class TestXSLFTextShape {
         assertEquals("Content with caption", shape3.getText());\r
 \r
         pr1 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);\r
-        assertEquals(0, pr1.getParentParagraph().getLevel());\r
+        assertEquals(0, pr1.getParentParagraph().getIndentLevel());\r
         assertEquals("Content with caption", pr1.getRawText());\r
         assertEquals("Calibri", pr1.getFontFamily());\r
         assertEquals(14.0, pr1.getFontSize(), 0);\r
@@ -707,19 +707,19 @@ public class TestXSLFTextShape {
         tx1.clearText();\r
 \r
         XSLFTextParagraph p1 = tx1.addNewTextParagraph();\r
-        assertEquals(0, p1.getLevel());\r
+        assertEquals(0, p1.getIndentLevel());\r
         XSLFTextRun r1 = p1.addNewTextRun();\r
         r1.setText("Apache POI");\r
 \r
         XSLFTextParagraph p2 = tx1.addNewTextParagraph();\r
-        p2.setLevel(1);\r
-        assertEquals(1, p2.getLevel());\r
+        p2.setIndentLevel(1);\r
+        assertEquals(1, p2.getIndentLevel());\r
         XSLFTextRun r2 = p2.addNewTextRun();\r
         r2.setText("HSLF");\r
 \r
         XSLFTextParagraph p3 = tx1.addNewTextParagraph();\r
-        p3.setLevel(2);\r
-        assertEquals(2, p3.getLevel());\r
+        p3.setIndentLevel(2);\r
+        assertEquals(2, p3.getIndentLevel());\r
         XSLFTextRun r3 = p3.addNewTextRun();\r
         r3.setText("XSLF");\r
 \r
index 9cb1a45a55e0a137d87742b669e8f6612910965e..3954f6b48758b41ff538ee380608941aaf9acdc8 100644 (file)
@@ -21,10 +21,9 @@ import java.io.*;
 
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
-
 import org.apache.poi.ddf.*;
+import org.apache.poi.hslf.record.HSLFEscherRecordFactory;
 import org.apache.poi.hslf.record.RecordTypes;
-
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -274,7 +273,7 @@ public void walkTree(int depth, int startPos, int maxLen) {
 
        byte[] contents = new byte[len];
        System.arraycopy(_docstream,pos,contents,0,len);
-       DefaultEscherRecordFactory erf = new DefaultEscherRecordFactory();
+       DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
        EscherRecord record = erf.createRecord(contents,0);
 
        // For now, try filling in the fields
index 45ededed15f9b18dbb3231bd6bb08b53f6176335..fc96644b2b329a6feae4be27267ee6e305c6513c 100644 (file)
@@ -27,10 +27,7 @@ import org.apache.poi.ddf.DefaultEscherRecordFactory;
 import org.apache.poi.ddf.EscherRecord;
 import org.apache.poi.ddf.EscherContainerRecord;
 import org.apache.poi.ddf.EscherTextboxRecord;
-import org.apache.poi.hslf.record.EscherTextboxWrapper;
-import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.StyleTextPropAtom;
+import org.apache.poi.hslf.record.*;
 import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
 
 /**
@@ -263,7 +260,7 @@ public final class SlideShowRecordDumper {
 
                // print additional information for drawings and atoms
                if (optEscher && cname.equals("PPDrawing")) {
-                       DefaultEscherRecordFactory factory = new DefaultEscherRecordFactory();
+                       DefaultEscherRecordFactory factory = new HSLFEscherRecordFactory();
 
                        ByteArrayOutputStream baos = new ByteArrayOutputStream();
                        r.writeOut(baos);
index 1167cc3558242115a72590cc722ec7db268e92b4..190ad0a415b4cae8414ff642bfe06fcdf7dc92af 100644 (file)
@@ -328,13 +328,9 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
         }
 
         for (List<HSLFTextParagraph> lp : paragraphs) {
-            for (HSLFTextParagraph p : lp) {
-                for (HSLFTextRun r : p.getTextRuns()) {
-                    ret.append(r.getRawText());
-                }
-                if (ret.length() > 0 && ret.charAt(ret.length()-1) != '\n') {
-                    ret.append("\n");
-                }
+            ret.append(HSLFTextParagraph.getText(lp));
+            if (ret.length() > 0 && ret.charAt(ret.length()-1) != '\n') {
+                ret.append("\n");
             }
         }
     }
index c777351728845181b843564a03ce547ba210f3dd..67b12be8b46814935bfc602619a7ef4f55e216d6 100644 (file)
@@ -22,9 +22,6 @@ import org.apache.poi.hslf.usermodel.*;
 import org.apache.poi.sl.usermodel.ShapeContainer;
 import org.apache.poi.sl.usermodel.ShapeType;
 
-import java.awt.geom.*;
-import java.util.ArrayList;
-
 /**
  * Represents a line in a PowerPoint drawing
  *
@@ -46,6 +43,8 @@ public final class Line extends HSLFSimpleShape {
 
     protected EscherContainerRecord createSpContainer(boolean isChild){
         _escherContainer = super.createSpContainer(isChild);
+        
+        setShapeType(ShapeType.LINE);
 
         EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
         short type = (short)((ShapeType.LINE.nativeId << 4) | 0x2);
@@ -64,68 +63,24 @@ public final class Line extends HSLFSimpleShape {
 
         return _escherContainer;
     }
-
-    public java.awt.Shape getOutline(){
-        Rectangle2D anchor = getLogicalAnchor2D();
-        return new Line2D.Double(anchor.getX(), anchor.getY(), anchor.getX() + anchor.getWidth(), anchor.getY() + anchor.getHeight());
+    
+    /**
+     * Sets the orientation of the line, if inverse is false, then line goes
+     * from top-left to bottom-right, otherwise use inverse equals true 
+     *
+     * @param inverse the orientation of the line
+     */
+    public void setInverse(boolean inverse) {
+        setShapeType(inverse ? ShapeType.LINE_INV : ShapeType.LINE);
     }
     
     /**
-    *
-    * @return 'absolute' anchor of this shape relative to the parent sheet
-    * 
-    * @deprecated TODO: remove the whole class, should work with preset geometries instead
-    */
-   public Rectangle2D getLogicalAnchor2D(){
-       Rectangle2D anchor = getAnchor2D();
-
-       //if it is a groupped shape see if we need to transform the coordinates
-       if (getParent() != null){
-           ArrayList<HSLFGroupShape> lst = new ArrayList<HSLFGroupShape>();
-           for (ShapeContainer<HSLFShape> parent=this.getParent();
-               parent instanceof HSLFGroupShape;
-               parent = ((HSLFGroupShape)parent).getParent()) {
-               lst.add(0, (HSLFGroupShape)parent);
-           }
-           
-           AffineTransform tx = new AffineTransform();
-           for(HSLFGroupShape prnt : lst) {
-               Rectangle2D exterior = prnt.getAnchor2D();
-               Rectangle2D interior = prnt.getInteriorAnchor();
-
-               double scaleX =  exterior.getWidth() / interior.getWidth();
-               double scaleY = exterior.getHeight() / interior.getHeight();
-
-               tx.translate(exterior.getX(), exterior.getY());
-               tx.scale(scaleX, scaleY);
-               tx.translate(-interior.getX(), -interior.getY());
-               
-           }
-           anchor = tx.createTransformedShape(anchor).getBounds2D();
-       }
-
-       double angle = getRotation();
-       if(angle != 0.){
-           double centerX = anchor.getX() + anchor.getWidth()/2;
-           double centerY = anchor.getY() + anchor.getHeight()/2;
-
-           AffineTransform trans = new AffineTransform();
-           trans.translate(centerX, centerY);
-           trans.rotate(Math.toRadians(angle));
-           trans.translate(-centerX, -centerY);
-
-           Rectangle2D rect = trans.createTransformedShape(anchor).getBounds2D();
-           if((anchor.getWidth() < anchor.getHeight() && rect.getWidth() > rect.getHeight()) ||
-               (anchor.getWidth() > anchor.getHeight() && rect.getWidth() < rect.getHeight())    ){
-               trans = new AffineTransform();
-               trans.translate(centerX, centerY);
-               trans.rotate(Math.PI/2);
-               trans.translate(-centerX, -centerY);
-               anchor = trans.createTransformedShape(anchor).getBounds2D();
-           }
-       }
-       return anchor;
-   }
-
-
+     * Gets the orientation of the line, if inverse is false, then line goes
+     * from top-left to bottom-right, otherwise inverse equals true 
+     *
+     * @return inverse the orientation of the line
+     */
+    public boolean isInverse() {
+        return (getShapeType() == ShapeType.LINE_INV);
+    }
 }
index b329c8af3e26d3d7284582a38f1c66c0768777c3..271b2591f99f8bd6b81c39847ac86d86a3d0e7f4 100644 (file)
@@ -21,7 +21,7 @@
  */
 package org.apache.poi.hslf.model.textproperties;
 
-import org.apache.poi.hslf.record.TextAutoNumberSchemeEnum;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -41,8 +41,8 @@ public class TextPFException9 {
        private final byte mask4;
        private final Short bulletBlipRef;
        private final Short fBulletHasAutoNumber;
-       private final TextAutoNumberSchemeEnum autoNumberScheme;
-       private final static TextAutoNumberSchemeEnum DEFAULT_AUTONUMBER_SHEME = TextAutoNumberSchemeEnum.ANM_ArabicPeriod;
+       private final AutoNumberingScheme autoNumberScheme;
+       private final static AutoNumberingScheme DEFAULT_AUTONUMBER_SHEME = AutoNumberingScheme.arabicPeriod;
        private final Short autoNumberStartNumber;
        private final static Short DEFAULT_START_NUMBER = new Short((short)1);
        private final int recordLength;
@@ -71,7 +71,7 @@ public class TextPFException9 {
                        this.autoNumberScheme = null;
                        this.autoNumberStartNumber = null;
                } else {
-                       this.autoNumberScheme = TextAutoNumberSchemeEnum.valueOf(LittleEndian.getShort(source, index));
+                       this.autoNumberScheme = AutoNumberingScheme.forNativeID(LittleEndian.getShort(source, index));
                        index +=2;
                        this.autoNumberStartNumber = LittleEndian.getShort(source, index);
                        index +=2;
@@ -85,7 +85,7 @@ public class TextPFException9 {
        public Short getfBulletHasAutoNumber() {
                return fBulletHasAutoNumber;
        }
-       public TextAutoNumberSchemeEnum getAutoNumberScheme() {
+       public AutoNumberingScheme getAutoNumberScheme() {
                if (null != this.autoNumberScheme) {
                        return this.autoNumberScheme;
                }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java b/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
new file mode 100644 (file)
index 0000000..6aa09b9
--- /dev/null
@@ -0,0 +1,75 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+package org.apache.poi.hslf.record;\r
+\r
+import org.apache.poi.ddf.*;\r
+import org.apache.poi.util.*;\r
+\r
+/**\r
+ * An atom record that specifies whether a shape is a placeholder shape.\r
+ * The number, position, and type of placeholder shapes are determined by\r
+ * the slide layout as specified in the SlideAtom record.\r
+ */\r
+public class EscherPlaceholder extends EscherRecord {\r
+    public static final short RECORD_ID = (short)RecordTypes.OEPlaceholderAtom.typeID;\r
+    public static final String RECORD_DESCRIPTION = "msofbtClientTextboxPlaceholder";\r
+\r
+    int position = -1;\r
+    byte placementId = 0;\r
+    byte size = 0;\r
+    short unused = 0;\r
+    \r
+    public EscherPlaceholder() {}\r
+    \r
+    public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {\r
+        int bytesRemaining = readHeader( data, offset );\r
+\r
+        position = LittleEndian.getInt(data, offset+8);\r
+        placementId = data[offset+12];\r
+        size = data[offset+13];\r
+        unused = LittleEndian.getShort(data, offset+14);\r
+        \r
+        assert(bytesRemaining + 8 == 16);\r
+        return bytesRemaining + 8;\r
+    }\r
+\r
+    public int serialize(int offset, byte[] data, EscherSerializationListener listener) {\r
+        listener.beforeRecordSerialize( offset, getRecordId(), this );\r
+        \r
+        LittleEndian.putShort(data, offset, getOptions());\r
+        LittleEndian.putShort(data, offset+2, getRecordId());\r
+        LittleEndian.putInt(data, offset+4, 8);\r
+        LittleEndian.putInt(data, offset+8, position);\r
+        LittleEndian.putByte(data, offset+12, placementId);\r
+        LittleEndian.putByte(data, offset+13, size);\r
+        LittleEndian.putShort(data, offset+14, unused);\r
+        \r
+        listener.afterRecordSerialize( offset+getRecordSize(), getRecordId(), getRecordSize(), this );\r
+        return getRecordSize();\r
+    }\r
+\r
+    public int getRecordSize() {\r
+        return 8 + 8;\r
+    }\r
+\r
+    public String getRecordName() {\r
+        return "ClientTextboxPlaceholder";\r
+    }\r
+\r
+    \r
+}\r
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
new file mode 100644 (file)
index 0000000..c985864
--- /dev/null
@@ -0,0 +1,70 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+package org.apache.poi.hslf.record;\r
+\r
+import java.lang.reflect.Constructor;\r
+import java.util.Map;\r
+\r
+import org.apache.poi.ddf.*;\r
+import org.apache.poi.util.LittleEndian;\r
+\r
+/**\r
+ * Generates escher records when provided the byte array containing those records.\r
+ *\r
+ * @see EscherRecordFactory\r
+ */\r
+public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory {\r
+    private static Class<?>[] escherRecordClasses = { EscherPlaceholder.class };\r
+    private static Map<Short, Constructor<? extends EscherRecord>> recordsMap = recordsToMap( escherRecordClasses );\r
+\r
+    \r
+    /**\r
+     * Creates an instance of the escher record factory\r
+     */\r
+    public HSLFEscherRecordFactory() {\r
+        // no instance initialisation\r
+    }\r
+    \r
+    /**\r
+     * Generates an escher record including the any children contained under that record.\r
+     * An exception is thrown if the record could not be generated.\r
+     *\r
+     * @param data   The byte array containing the records\r
+     * @param offset The starting offset into the byte array\r
+     * @return The generated escher record\r
+     */\r
+    public EscherRecord createRecord(byte[] data, int offset) {\r
+        short options = LittleEndian.getShort( data, offset );\r
+        short recordId = LittleEndian.getShort( data, offset + 2 );\r
+        // int remainingBytes = LittleEndian.getInt( data, offset + 4 );\r
+\r
+        Constructor<? extends EscherRecord> recordConstructor = recordsMap.get(Short.valueOf(recordId));\r
+        if (recordConstructor == null) {\r
+            return super.createRecord(data, offset);\r
+        }\r
+        EscherRecord escherRecord = null;\r
+        try {\r
+            escherRecord = recordConstructor.newInstance(new Object[] {});\r
+        } catch (Exception e) {\r
+            return super.createRecord(data, offset);\r
+        }\r
+        escherRecord.setRecordId(recordId);\r
+        escherRecord.setOptions(options);\r
+        return escherRecord;\r
+    }\r
+}\r
index 09854b5ab9a2dc552527019c60a60a4dd42dc423..637f9a8ab8b59cebecc4b74df17a10ef5a4ba72d 100644 (file)
@@ -92,7 +92,7 @@ public final class PPDrawing extends RecordAtom {
                System.arraycopy(source,start,contents,0,len);
 
                // Build up a tree of Escher records contained within
-               final DefaultEscherRecordFactory erf = new DefaultEscherRecordFactory();
+               final DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
                final List<EscherRecord> escherChildren = new ArrayList<EscherRecord>();
                findEscherChildren(erf, contents, 8, len-8, escherChildren);
                this.childRecords = escherChildren.toArray(new EscherRecord[escherChildren.size()]);
@@ -129,20 +129,20 @@ public final class PPDrawing extends RecordAtom {
        private StyleTextProp9Atom findInSpContainer(final EscherContainerRecord spContainer) {
                EscherContainerRecord clientData = findFirstEscherContainerRecordOfType((short)RecordTypes.EscherClientData, spContainer);
                if (null == clientData) { return null; }
-               final EscherContainerRecord escherContainer1388 = findFirstEscherContainerRecordOfType((short)0x1388, clientData);
-               if (null == escherContainer1388) { return null; }
-               final EscherContainerRecord escherContainer138A = findFirstEscherContainerRecordOfType((short)0x138A, escherContainer1388);
-               if (null == escherContainer138A) { return null; }
-               int size = escherContainer138A.getChildRecords().size();
+               final EscherContainerRecord progTagsContainer = findFirstEscherContainerRecordOfType((short)0x1388, clientData);
+               if (null == progTagsContainer) { return null; }
+               final EscherContainerRecord progBinaryTag = findFirstEscherContainerRecordOfType((short)0x138A, progTagsContainer);
+               if (null == progBinaryTag) { return null; }
+               int size = progBinaryTag.getChildRecords().size();
                if (2 != size) { return null; }
-               final Record r0 = buildFromUnknownEscherRecord((UnknownEscherRecord) escherContainer138A.getChild(0));
-               final Record r1 = buildFromUnknownEscherRecord((UnknownEscherRecord) escherContainer138A.getChild(1));
+               final Record r0 = buildFromUnknownEscherRecord((UnknownEscherRecord) progBinaryTag.getChild(0));
+               final Record r1 = buildFromUnknownEscherRecord((UnknownEscherRecord) progBinaryTag.getChild(1));
                if (!(r0 instanceof CString)) { return null; }
                if (!("___PPT9".equals(((CString) r0).getText()))) { return null; };
                if (!(r1 instanceof BinaryTagDataBlob )) { return null; }
                final BinaryTagDataBlob blob = (BinaryTagDataBlob) r1;
                if (1 != blob.getChildRecords().length) { return null; }
-               return (StyleTextProp9Atom) blob.findFirstOfType(0x0FACL);
+               return (StyleTextProp9Atom) blob.findFirstOfType(RecordTypes.StyleTextProp9Atom.typeID);
        }
        /**
         * Creates a new, empty, PPDrawing (typically for use with a new Slide
@@ -403,32 +403,13 @@ public final class PPDrawing extends RecordAtom {
 
     public StyleTextProp9Atom[] getNumberedListInfo() {
        final List<StyleTextProp9Atom> result = new LinkedList<StyleTextProp9Atom>();
-       EscherRecord[] escherRecords = this.getEscherRecords();
-       for (EscherRecord escherRecord : escherRecords) {
-                       if (escherRecord instanceof EscherContainerRecord && (short)0xf002 == escherRecord.getRecordId()) {
-                               EscherContainerRecord escherContainerF002 = (EscherContainerRecord) escherRecord;
-                               final EscherContainerRecord escherContainerF003 = findFirstEscherContainerRecordOfType((short)0xf003, escherContainerF002);
-                               final EscherContainerRecord[] escherContainersF004 = findAllEscherContainerRecordOfType((short)0xf004, escherContainerF003);
-                               for (EscherContainerRecord containerF004 : escherContainersF004) {
-                                       final EscherContainerRecord escherContainerF011 = findFirstEscherContainerRecordOfType((short)0xf011, containerF004);
-                                       if (null == escherContainerF011) { continue; }
-                                       final EscherContainerRecord escherContainer1388 = findFirstEscherContainerRecordOfType((short)0x1388, escherContainerF011);
-                                       if (null == escherContainer1388) { continue; }
-                                       final EscherContainerRecord escherContainer138A = findFirstEscherContainerRecordOfType((short)0x138A, escherContainer1388);
-                                       if (null == escherContainer138A) { continue; }
-                                       int size = escherContainer138A.getChildRecords().size();
-                                       if (2 != size) { continue; }
-                                       final Record r0 = buildFromUnknownEscherRecord((UnknownEscherRecord) escherContainer138A.getChild(0));
-                                       final Record r1 = buildFromUnknownEscherRecord((UnknownEscherRecord) escherContainer138A.getChild(1));
-                                       if (!(r0 instanceof CString)) { continue; }
-                                       if (!("___PPT9".equals(((CString) r0).getText()))) { continue; };
-                                       if (!(r1 instanceof BinaryTagDataBlob )) { continue; }
-                                       final BinaryTagDataBlob blob = (BinaryTagDataBlob) r1;
-                                       if (1 != blob.getChildRecords().length) { continue; }
-                                       result.add((StyleTextProp9Atom) blob.findFirstOfType(0x0FACL));
-                               }
-                       }
-       }
+       EscherContainerRecord dgContainer = (EscherContainerRecord)childRecords[0];
+               final EscherContainerRecord spgrContainer = findFirstEscherContainerRecordOfType((short)RecordTypes.EscherSpgrContainer, dgContainer);
+               final EscherContainerRecord[] spContainers = findAllEscherContainerRecordOfType((short)RecordTypes.EscherSpContainer, spgrContainer);
+               for (EscherContainerRecord spContainer : spContainers) {
+                   StyleTextProp9Atom prop9 = findInSpContainer(spContainer);
+                   if (prop9 != null) result.add(prop9);
+               }
        return result.toArray(new StyleTextProp9Atom[result.size()]);
        }
 }
index ee414bba9b4b89656e4998e407a579c415e46a51..0cdb1f6273c33c2feda3de7450f42e38d73e4a58 100644 (file)
@@ -49,7 +49,7 @@ public final class PPDrawingGroup extends RecordAtom {
         byte[] contents = new byte[len];
         System.arraycopy(source,start,contents,0,len);
 
-        DefaultEscherRecordFactory erf = new DefaultEscherRecordFactory();
+        DefaultEscherRecordFactory erf = new HSLFEscherRecordFactory();
         EscherRecord child = erf.createRecord(contents, 0);
         child.fillFields( contents, 0, erf );
         dggContainer = (EscherContainerRecord)child.getChild(0);
index 548027b76a83749a7f021ddbd7533a35716e3cfa..9a5cc7b4873f5d299b4872154db0711cd0d7babf 100644 (file)
@@ -83,7 +83,7 @@ public final class StyleTextProp9Atom extends RecordAtom {
                 break;
             }
         }
-        this.autoNumberSchemes = (TextPFException9[]) schemes.toArray(new TextPFException9[schemes.size()]);
+        this.autoNumberSchemes = schemes.toArray(new TextPFException9[schemes.size()]);
     }
 
     /**
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java
deleted file mode 100644 (file)
index ab70659..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  ====================================================================
- *    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.hslf.record;
-
-public enum TextAutoNumberSchemeEnum {
-       //Name Value Meaning
-       ANM_AlphaLcPeriod                       ((short) 0x0000), // "Lowercase Latin character followed by a period. Example: a., b., c., ..."),
-       ANM_AlphaUcPeriod                       ((short) 0x0001), // "Uppercase Latin character followed by a period. Example: A., B., C., ..."),
-       ANM_ArabicParenRight            ((short) 0x0002), // "Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ..."),
-       ANM_ArabicPeriod                        ((short) 0x0003), // "Arabic numeral followed by a period. Example: 1., 2., 3., ..."),
-       ANM_RomanLcParenBoth            ((short) 0x0004), // "Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ..."),            
-       ANM_RomanLcParenRight           ((short) 0x0005), // "Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ..."),     
-       ANM_RomanLcPeriod                       ((short) 0x0006), // "Lowercase Roman numeral followed by a period. Example: i., ii., iii., ..."), 
-       ANM_RomanUcPeriod                       ((short) 0x0007), // "Uppercase Roman numeral followed by a period. Example: I., II., III., ..."),
-       ANM_AlphaLcParenBoth            ((short) 0x0008), // "Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ..."),
-       ANM_AlphaLcParenRight           ((short) 0x0009), // "Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ..."),
-       ANM_AlphaUcParenBoth            ((short) 0x000A), // "Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ..."),
-       ANM_AlphaUcParenRight           ((short) 0x000B), // "Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ..."), 
-       ANM_ArabicParenBoth                     ((short) 0x000C), // "Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ..."),
-       ANM_ArabicPlain                         ((short) 0x000D), // "Arabic numeral. Example: 1, 2, 3, ..."),
-       ANM_RomanUcParenBoth            ((short) 0x000E), // "Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ..."),
-       ANM_RomanUcParenRight           ((short) 0x000F), // "Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), ..."),
-       ANM_ChsPlain                            ((short) 0x0010), // "Simplified Chinese."),
-       ANM_ChsPeriod                           ((short) 0x0011), // "Simplified Chinese with single-byte period."),
-       ANM_CircleNumDBPlain            ((short) 0x0012), // "Double byte circle numbers."),
-       ANM_CircleNumWDBWhitePlain      ((short) 0x0013), // "Wingdings white circle numbers."),
-       ANM_CircleNumWDBBlackPlain      ((short) 0x0014), // "Wingdings black circle numbers."),
-       ANM_ChtPlain                            ((short) 0x0015), // "Traditional Chinese."),
-       ANM_ChtPeriod                           ((short) 0x0016), // "Traditional Chinese with single-byte period."),
-       ANM_Arabic1Minus                        ((short) 0x0017), // "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol."),
-       ANM_Arabic2Minus                        ((short) 0x0018), // "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol."),
-       ANM_Hebrew2Minus                        ((short) 0x0019), // "Bidi Hebrew 2 with ANSI minus symbol."),
-       ANM_JpnKorPlain                         ((short) 0x001A), // "Japanese/Korean."),
-       ANM_JpnKorPeriod                        ((short) 0x001B), // "Japanese/Korean with single-byte period."),
-       ANM_ArabicDbPlain                       ((short) 0x001C), // "Double-byte Arabic numbers."),
-       ANM_ArabicDbPeriod                      ((short) 0x001D), // "Double-byte Arabic numbers with double-byte period."),
-       ANM_ThaiAlphaPeriod                     ((short) 0x001E), // "Thai alphabetic character followed by a period."),
-       ANM_ThaiAlphaParenRight         ((short) 0x001F), // "Thai alphabetic character followed by a closing parenthesis."),
-       ANM_ThaiAlphaParenBoth          ((short) 0x0020), // "Thai alphabetic character enclosed by parentheses."),
-       ANM_ThaiNumPeriod                       ((short) 0x0021), // "Thai numeral followed by a period."),
-       ANM_ThaiNumParenRight           ((short) 0x0022), // "Thai numeral followed by a closing parenthesis."),
-       ANM_ThaiNumParenBoth            ((short) 0x0023), // "Thai numeral enclosed in parentheses."),
-       ANM_HindiAlphaPeriod            ((short) 0x0024), // "Hindi alphabetic character followed by a period."),
-       ANM_HindiNumPeriod                      ((short) 0x0025), // "Hindi numeric character followed by a period."),
-       ANM_JpnChsDBPeriod                      ((short) 0x0026), // "Japanese with double-byte period."),
-       ANM_HindiNumParenRight          ((short) 0x0027), // "Hindi numeric character followed by a closing parenthesis."),
-       ANM_HindiAlpha1Period           ((short) 0x0028); // "Hindi alphabetic character followed by a period.");
-
-       private final short value;
-       private TextAutoNumberSchemeEnum(final short code) {
-               this.value = code;
-       }
-       private short getValue() { return value; }
-       public String getDescription() {
-               return TextAutoNumberSchemeEnum.getDescription(this);
-       }
-       public static String getDescription(final TextAutoNumberSchemeEnum code) {
-               switch (code) {
-               case ANM_AlphaLcPeriod                  : return "Lowercase Latin character followed by a period. Example: a., b., c., ...";
-               case ANM_AlphaUcPeriod                  : return "Uppercase Latin character followed by a period. Example: A., B., C., ...";
-               case ANM_ArabicParenRight               : return "Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ...";
-               case ANM_ArabicPeriod                   : return "Arabic numeral followed by a period. Example: 1., 2., 3., ...";
-               case ANM_RomanLcParenBoth               : return "Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ...";            
-               case ANM_RomanLcParenRight              : return "Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ...";     
-               case ANM_RomanLcPeriod                  : return "Lowercase Roman numeral followed by a period. Example: i., ii., iii., ...";
-               case ANM_RomanUcPeriod                  : return "Uppercase Roman numeral followed by a period. Example: I., II., III., ...";
-               case ANM_AlphaLcParenBoth               : return "Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ...";
-               case ANM_AlphaLcParenRight              : return "Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ...";
-               case ANM_AlphaUcParenBoth               : return "Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ...";
-               case ANM_AlphaUcParenRight              : return "Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ..."; 
-               case ANM_ArabicParenBoth                : return "Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ...";
-               case ANM_ArabicPlain                    : return "Arabic numeral. Example: 1, 2, 3, ...";
-               case ANM_RomanUcParenBoth               : return "Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ...";
-               case ANM_RomanUcParenRight              : return "Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), ...";
-               case ANM_ChsPlain                               : return "Simplified Chinese.";
-               case ANM_ChsPeriod                              : return "Simplified Chinese with single-byte period.";
-               case ANM_CircleNumDBPlain               : return "Double byte circle numbers.";
-               case ANM_CircleNumWDBWhitePlain : return "Wingdings white circle numbers.";
-               case ANM_CircleNumWDBBlackPlain : return "Wingdings black circle numbers.";
-               case ANM_ChtPlain                               : return "Traditional Chinese.";
-               case ANM_ChtPeriod                              : return "Traditional Chinese with single-byte period.";
-               case ANM_Arabic1Minus                   : return "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol.";
-               case ANM_Arabic2Minus                   : return "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol.";
-               case ANM_Hebrew2Minus                   : return "Bidi Hebrew 2 with ANSI minus symbol.";
-               case ANM_JpnKorPlain                    : return "Japanese/Korean.";
-               case ANM_JpnKorPeriod                   : return "Japanese/Korean with single-byte period.";
-               case ANM_ArabicDbPlain                  : return "Double-byte Arabic numbers.";
-               case ANM_ArabicDbPeriod                 : return "Double-byte Arabic numbers with double-byte period.";
-               case ANM_ThaiAlphaPeriod                : return "Thai alphabetic character followed by a period.";
-               case ANM_ThaiAlphaParenRight    : return "Thai alphabetic character followed by a closing parenthesis.";
-               case ANM_ThaiAlphaParenBoth             : return "Thai alphabetic character enclosed by parentheses.";
-               case ANM_ThaiNumPeriod                  : return "Thai numeral followed by a period.";
-               case ANM_ThaiNumParenRight              : return "Thai numeral followed by a closing parenthesis.";
-               case ANM_ThaiNumParenBoth               : return "Thai numeral enclosed in parentheses.";
-               case ANM_HindiAlphaPeriod               : return "Hindi alphabetic character followed by a period.";
-               case ANM_HindiNumPeriod                 : return "Hindi numeric character followed by a period.";
-               case ANM_JpnChsDBPeriod                 : return "Japanese with double-byte period.";
-               case ANM_HindiNumParenRight             : return "Hindi numeric character followed by a closing parenthesis.";
-               case ANM_HindiAlpha1Period              : return "Hindi alphabetic character followed by a period.";
-               default                                                 : return "Unknown Numbered Scheme";
-               }
-       }
-       public static TextAutoNumberSchemeEnum valueOf(short autoNumberScheme) {
-               for (TextAutoNumberSchemeEnum item: TextAutoNumberSchemeEnum.values()) {
-                       if (autoNumberScheme == item.getValue()) {
-                               return item;
-                       }
-               }
-               return null;
-       }
-}
index a68f3a74e9d21a3a732918c5bb298550007481dc..9288052c664aa431fb91a92008c7b0fffad1dd06 100644 (file)
@@ -165,35 +165,32 @@ public abstract class HSLFShape implements Shape {
     public Rectangle2D getAnchor2D(){
         EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
         int flags = spRecord.getFlags();
-        Rectangle2D anchor;
-        if ((flags & EscherSpRecord.FLAG_CHILD) != 0){
-            EscherChildAnchorRecord rec = getEscherChild(EscherChildAnchorRecord.RECORD_ID);
-            if(rec == null){
+        int x,y,w,h;
+        EscherChildAnchorRecord childRec = getEscherChild(EscherChildAnchorRecord.RECORD_ID);
+        boolean useChildRec = ((flags & EscherSpRecord.FLAG_CHILD) != 0);
+        if (useChildRec && childRec != null){
+            x = childRec.getDx1();
+            y = childRec.getDy1();
+            w = childRec.getDx2()-childRec.getDx1();
+            h = childRec.getDy2()-childRec.getDy1();
+        } else {
+            if (useChildRec) {
                 logger.log(POILogger.WARN, "EscherSpRecord.FLAG_CHILD is set but EscherChildAnchorRecord was not found");
-                EscherClientAnchorRecord clrec = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-                anchor = new Rectangle2D.Float(
-                    (float)clrec.getCol1()*POINT_DPI/MASTER_DPI,
-                    (float)clrec.getFlag()*POINT_DPI/MASTER_DPI,
-                    (float)(clrec.getDx1()-clrec.getCol1())*POINT_DPI/MASTER_DPI,
-                    (float)(clrec.getRow1()-clrec.getFlag())*POINT_DPI/MASTER_DPI
-                );
-            } else {
-                anchor = new Rectangle2D.Float(
-                    (float)rec.getDx1()*POINT_DPI/MASTER_DPI,
-                    (float)rec.getDy1()*POINT_DPI/MASTER_DPI,
-                    (float)(rec.getDx2()-rec.getDx1())*POINT_DPI/MASTER_DPI,
-                    (float)(rec.getDy2()-rec.getDy1())*POINT_DPI/MASTER_DPI
-                );
             }
-        } else {
-            EscherClientAnchorRecord rec = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-            anchor = new Rectangle2D.Float(
-                (float)rec.getCol1()*POINT_DPI/MASTER_DPI,
-                (float)rec.getFlag()*POINT_DPI/MASTER_DPI,
-                (float)(rec.getDx1()-rec.getCol1())*POINT_DPI/MASTER_DPI,
-                (float)(rec.getRow1()-rec.getFlag())*POINT_DPI/MASTER_DPI
-            );
+            EscherClientAnchorRecord clientRec = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
+            x = clientRec.getFlag();
+            y = clientRec.getCol1();
+            w = clientRec.getDx1()-clientRec.getFlag();
+            h = clientRec.getRow1()-clientRec.getCol1();
         }
+
+        Rectangle2D anchor = new Rectangle2D.Float(
+            (float)Units.masterToPoints(x),
+            (float)Units.masterToPoints(y),
+            (float)Units.masterToPoints(w),
+            (float)Units.masterToPoints(h)
+        );
+        
         return anchor;
     }
 
@@ -204,21 +201,24 @@ public abstract class HSLFShape implements Shape {
      * @param anchor new anchor
      */
     public void setAnchor(Rectangle2D anchor){
+        int x = Units.pointsToMaster(anchor.getX());
+        int y = Units.pointsToMaster(anchor.getY());
+        int w = Units.pointsToMaster(anchor.getWidth() + anchor.getX());
+        int h = Units.pointsToMaster(anchor.getHeight() + anchor.getY());
         EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
         int flags = spRecord.getFlags();
         if ((flags & EscherSpRecord.FLAG_CHILD) != 0){
             EscherChildAnchorRecord rec = (EscherChildAnchorRecord)getEscherChild(EscherChildAnchorRecord.RECORD_ID);
-            rec.setDx1((int)(anchor.getX()*MASTER_DPI/POINT_DPI));
-            rec.setDy1((int)(anchor.getY()*MASTER_DPI/POINT_DPI));
-            rec.setDx2((int)((anchor.getWidth() + anchor.getX())*MASTER_DPI/POINT_DPI));
-            rec.setDy2((int)((anchor.getHeight() + anchor.getY())*MASTER_DPI/POINT_DPI));
-        }
-        else {
+            rec.setDx1(x);
+            rec.setDy1(y);
+            rec.setDx2(w);
+            rec.setDy2(h);
+        } else {
             EscherClientAnchorRecord rec = (EscherClientAnchorRecord)getEscherChild(EscherClientAnchorRecord.RECORD_ID);
-            rec.setFlag((short)(anchor.getY()*MASTER_DPI/POINT_DPI));
-            rec.setCol1((short)(anchor.getX()*MASTER_DPI/POINT_DPI));
-            rec.setDx1((short)(((anchor.getWidth() + anchor.getX())*MASTER_DPI/POINT_DPI)));
-            rec.setRow1((short)(((anchor.getHeight() + anchor.getY())*MASTER_DPI/POINT_DPI)));
+            rec.setFlag((short)x);
+            rec.setCol1((short)y);
+            rec.setDx1((short)w);
+            rec.setRow1((short)h);
         }
 
     }
index 7e2f6f01a0f9a07ab46aeca6d3fdb3116d4ad4f4..5948b4013278f5984eef4f3f752d7f7bf81865a5 100644 (file)
@@ -20,22 +20,9 @@ package org.apache.poi.hslf.usermodel;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.ddf.EscherClientDataRecord;
-import org.apache.poi.ddf.EscherContainerRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherProperty;
-import org.apache.poi.ddf.EscherPropertyFactory;
-import org.apache.poi.ddf.EscherRecord;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.ddf.EscherSpRecord;
+import org.apache.poi.ddf.*;
 import org.apache.poi.hslf.model.*;
-import org.apache.poi.hslf.record.InteractiveInfo;
-import org.apache.poi.hslf.record.InteractiveInfoAtom;
-import org.apache.poi.hslf.record.OEShapeAtom;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.RecordTypes;
-import org.apache.poi.hslf.usermodel.*;
+import org.apache.poi.hslf.record.*;
 import org.apache.poi.sl.usermodel.ShapeContainer;
 import org.apache.poi.sl.usermodel.ShapeType;
 import org.apache.poi.util.POILogFactory;
@@ -116,16 +103,15 @@ public final class HSLFShapeFactory {
                 break;
             }
             case LINE:
-//                shape = new Line(spContainer, parent);
-//                break;
+                shape = new Line(spContainer, parent);
+                break;
             case NOT_PRIMITIVE: {
                 EscherOptRecord opt = HSLFShape.getEscherChild(spContainer, EscherOptRecord.RECORD_ID);
                 EscherProperty prop = HSLFShape.getEscherProperty(opt, EscherProperties.GEOMETRY__VERTICES);
                 if(prop != null)
                     shape = new HSLFFreeformShape(spContainer, parent);
                 else {
-
-                    logger.log(POILogger.WARN, "Creating AutoShape for a NotPrimitive shape");
+                    logger.log(POILogger.INFO, "Creating AutoShape for a NotPrimitive shape");
                     shape = new HSLFAutoShape(spContainer, parent);
                 }
                 break;
index 0247a759362b438ab0ead3a6a1bf06f175b7dc3f..d0c594fd819cceb585b8da635d012c107966ab91 100644 (file)
@@ -275,15 +275,7 @@ public abstract class HSLFSheet implements Sheet<HSLFShape,HSLFSlideShow> {
             PPDrawing ppdrawing = getPPDrawing();
 
             EscherContainerRecord dg = (EscherContainerRecord) ppdrawing.getEscherRecords()[0];
-            EscherContainerRecord spContainer = null;
-
-            for (Iterator<EscherRecord> it = dg.getChildIterator(); it.hasNext();) {
-                EscherRecord rec = it.next();
-                if (rec.getRecordId() == EscherContainerRecord.SP_CONTAINER) {
-                    spContainer = (EscherContainerRecord) rec;
-                    break;
-                }
-            }
+            EscherContainerRecord spContainer = dg.getChildById(EscherContainerRecord.SP_CONTAINER);
             _background = new HSLFBackground(spContainer, null);
             _background.setSheet(this);
         }
index 5ddf311e528afa7e2ff27a522409310c17253a23..c90452ddaa11f0512f078258e80f3014c106631f 100644 (file)
@@ -263,7 +263,7 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape {
             if(r != null && !(r instanceof EscherClientDataRecord)){
                 byte[] data = r.serialize();
                 r = new EscherClientDataRecord();
-                r.fillFields(data, 0, new DefaultEscherRecordFactory());
+                r.fillFields(data, 0, new HSLFEscherRecordFactory());
             }
             _clientData = (EscherClientDataRecord)r;
         }
index 211bc00c06f263442d3692fea1aba2e0edf4f7fe..8feee2312bdfb4aa6cb930a7192576b3ef1a1287 100644 (file)
@@ -17,6 +17,7 @@
 
 package org.apache.poi.hslf.usermodel;
 
+import java.awt.Graphics2D;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +25,8 @@ import org.apache.poi.ddf.*;
 import org.apache.poi.hslf.model.*;
 import org.apache.poi.hslf.record.*;
 import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
+import org.apache.poi.sl.draw.DrawFactory;
+import org.apache.poi.sl.draw.Drawable;
 import org.apache.poi.sl.usermodel.ShapeType;
 import org.apache.poi.sl.usermodel.Slide;
 
@@ -462,6 +465,13 @@ public final class HSLFSlide extends HSLFSheet implements Slide<HSLFShape,HSLFSl
                        : slideInfo.getEffectTransitionFlagByBit(SSSlideInfoAtom.HIDDEN_BIT);
        }
 
+    @Override
+    public void draw(Graphics2D graphics) {
+        DrawFactory drawFact = DrawFactory.getInstance(graphics);
+        Drawable draw = drawFact.getDrawable(this);
+        draw.draw(graphics);
+    }
+    
     public boolean getFollowMasterColourScheme() {
         // TODO Auto-generated method stub
         return false;
index b028758e6fe5ff0eb8b6740fab27d7090a6ae103..69a89555c8fc34c191a684b82390ad01ffd385e2 100644 (file)
@@ -153,15 +153,30 @@ public final class HSLFTable extends HSLFGroupShape {
 
     protected void initTable(){
         List<HSLFShape> shapeList = getShapeList();
+
+        Iterator<HSLFShape> shapeIter = shapeList.iterator();
+        while (shapeIter.hasNext()) {
+            HSLFShape shape = shapeIter.next();
+            if (shape instanceof HSLFAutoShape) {
+                HSLFAutoShape autoShape = (HSLFAutoShape)shape;
+                EscherTextboxRecord etr = autoShape.getEscherChild(EscherTextboxRecord.RECORD_ID);
+                if (etr != null) continue;
+            }
+            shapeIter.remove();
+        }        
+        
         Collections.sort(shapeList, new Comparator<HSLFShape>(){
             public int compare( HSLFShape o1, HSLFShape o2 ) {
                 Rectangle anchor1 = o1.getAnchor();
                 Rectangle anchor2 = o2.getAnchor();
                 int delta = anchor1.y - anchor2.y;
-                if(delta == 0) delta = anchor1.x - anchor2.x;
+                if (delta == 0) delta = anchor1.x - anchor2.x;
+                // descending size
+                if (delta == 0) delta = (anchor2.width*anchor2.height)-(anchor1.width*anchor1.height);
                 return delta;
             }
         });
+        
         int y0 = -1;
         int maxrowlen = 0;
         List<List<HSLFShape>> lst = new ArrayList<List<HSLFShape>>();
index ee99745b5a452d9fbfbaf3c9dee90cbfba295474..386447328b4516d7247da45747b70c9c60f78ce8 100644 (file)
@@ -27,6 +27,7 @@ import org.apache.poi.hslf.model.PPFont;
 import org.apache.poi.hslf.model.textproperties.*;\r
 import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;\r
 import org.apache.poi.hslf.record.*;\r
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;\r
 import org.apache.poi.sl.usermodel.TextParagraph;\r
 import org.apache.poi.util.*;\r
 \r
@@ -62,7 +63,6 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
     private HSLFSheet _sheet;\r
     private int shapeId;\r
 \r
-    // private StyleTextPropAtom styleTextPropAtom;\r
     private StyleTextProp9Atom styleTextProp9Atom;\r
 \r
     /**\r
@@ -230,7 +230,8 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
 \r
         int length;\r
         for (length = 1; startIdx[0] + length < records.length; length++) {\r
-            if (records[startIdx[0]+length] instanceof TextHeaderAtom) break;\r
+            Record r = records[startIdx[0]+length];\r
+            if (r instanceof TextHeaderAtom || r instanceof SlidePersistAtom) break;\r
         }\r
 \r
         Record result[] = new Record[length];\r
@@ -359,27 +360,60 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
         }\r
     }\r
 \r
+    public AutoNumberingScheme getAutoNumberingScheme() {\r
+        if (styleTextProp9Atom == null) return null;\r
+        TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();\r
+        int level = getIndentLevel();\r
+        if (ant == null || level  >= ant.length) return null;\r
+        return ant[level].getAutoNumberScheme();\r
+    }\r
+\r
+    public Integer getAutoNumberingStartAt() {\r
+        if (styleTextProp9Atom == null) return null;\r
+        TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();\r
+        int level = getIndentLevel();\r
+        if (ant == null || level  >= ant.length) return null;\r
+        Short startAt = ant[level].getAutoNumberStartNumber();\r
+        assert(startAt != null);\r
+        return startAt.intValue();\r
+    }\r
+    \r
+    \r
     @Override\r
     public BulletStyle getBulletStyle() {\r
-        if (!isBullet()) return null;\r
+        if (!isBullet() && getAutoNumberingScheme() == null) return null;\r
 \r
         return new BulletStyle() {\r
+            @Override\r
             public String getBulletCharacter() {\r
                 Character chr = HSLFTextParagraph.this.getBulletChar();\r
                 return (chr == null || chr == 0) ? "" : "" + chr;\r
             }\r
 \r
+            @Override\r
             public String getBulletFont() {\r
                 return HSLFTextParagraph.this.getBulletFont();\r
             }\r
 \r
+            @Override\r
             public Double getBulletFontSize() {\r
                 return HSLFTextParagraph.this.getBulletSize();\r
             }\r
 \r
+            @Override\r
             public Color getBulletFontColor() {\r
                 return HSLFTextParagraph.this.getBulletColor();\r
             }\r
+\r
+            @Override\r
+            public AutoNumberingScheme getAutoNumberingScheme() {\r
+                return HSLFTextParagraph.this.getAutoNumberingScheme();\r
+            }\r
+\r
+            @Override\r
+            public Integer getAutoNumberingStartAt() {\r
+                return HSLFTextParagraph.this.getAutoNumberingStartAt();\r
+            }\r
         };\r
     }\r
 \r
@@ -392,19 +426,12 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
         _parentShape = parentShape;\r
     }\r
 \r
-    /**\r
-     * \r
-     * @return indentation level\r
-     */\r
+    @Override\r
     public int getIndentLevel() {\r
         return _paragraphStyle == null ? 0 : _paragraphStyle.getIndentLevel();\r
     }\r
 \r
-    /**\r
-     * Sets indentation level\r
-     * \r
-    * @param level indentation level. Must be in the range [0, 4]\r
-     */\r
+    @Override\r
     public void setIndentLevel(int level) {\r
        if( _paragraphStyle != null ) _paragraphStyle.setIndentLevel((short)level);\r
     }\r
@@ -471,17 +498,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
             return (_runs.isEmpty()) ? null : _runs.get(0).getFontColor();\r
         }\r
 \r
-        int rgb = tp.getValue();\r
-        int cidx = rgb >> 24;\r
-        if (rgb % 0x1000000 == 0) {\r
-            if (_sheet == null)\r
-                return null;\r
-            ColorSchemeAtom ca = _sheet.getColorScheme();\r
-            if (cidx >= 0 && cidx <= 7)\r
-                rgb = ca.getColor(cidx);\r
-        }\r
-        Color tmp = new Color(rgb, true);\r
-        return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());\r
+        return getColorFromColorIndexStruct(tp.getValue(), _sheet);\r
     }\r
 \r
     /**\r
@@ -934,7 +951,8 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
    public static List<List<HSLFTextParagraph>> findTextParagraphs(PPDrawing ppdrawing, HSLFSheet sheet) {\r
         List<List<HSLFTextParagraph>> runsV = new ArrayList<List<HSLFTextParagraph>>();\r
         for (EscherTextboxWrapper wrapper : ppdrawing.getTextboxWrappers()) {\r
-            runsV.add(findTextParagraphs(wrapper, sheet));\r
+            List<HSLFTextParagraph> p = findTextParagraphs(wrapper, sheet);\r
+            if (p != null) runsV.add(p);\r
         }\r
         return runsV;\r
     }\r
@@ -1189,7 +1207,10 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
 \r
     protected static List<HSLFTextParagraph> createEmptyParagraph() {\r
         EscherTextboxWrapper wrapper = new EscherTextboxWrapper();\r
-\r
+        return createEmptyParagraph(wrapper);\r
+    }\r
+    \r
+    protected static List<HSLFTextParagraph> createEmptyParagraph(EscherTextboxWrapper wrapper) {\r
         TextHeaderAtom tha = new TextHeaderAtom();\r
         tha.setParentRecord(wrapper);\r
         wrapper.appendChildRecord(tha);\r
@@ -1217,4 +1238,26 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> {
     public EscherTextboxWrapper getTextboxWrapper() {\r
         return (EscherTextboxWrapper) _headerAtom.getParentRecord();\r
     }\r
+    \r
+    protected static Color getColorFromColorIndexStruct(int rgb, HSLFSheet sheet) {\r
+        int cidx = rgb >>> 24;\r
+        Color tmp; \r
+        switch (cidx) {\r
+            // Background ... Accent 3 color\r
+            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:\r
+                if (sheet == null) return null;\r
+                ColorSchemeAtom ca = sheet.getColorScheme();\r
+                tmp = new Color(ca.getColor(cidx), true);\r
+                break;\r
+            // Color is an sRGB value specified by red, green, and blue fields.\r
+            case 0xFE:\r
+                tmp = new Color(rgb, true);\r
+                break;\r
+            // Color is undefined.\r
+            default:\r
+            case 0xFF:\r
+                return null;\r
+        }\r
+        return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());\r
+    }\r
 }\r
index bb4f14041589ef3afb79d692f4f84f8636e7153a..437ed274e9613ed2ffe41b72899b50c861fe5d28 100644 (file)
 
 package org.apache.poi.hslf.usermodel;
 
-import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.setPropVal;
 import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.getPropVal;
+import static org.apache.poi.hslf.usermodel.HSLFTextParagraph.setPropVal;
 
 import java.awt.Color;
 
 import org.apache.poi.hslf.model.textproperties.*;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
-import org.apache.poi.hslf.record.ColorSchemeAtom;
 import org.apache.poi.sl.usermodel.TextRun;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
@@ -321,16 +320,8 @@ public final class HSLFTextRun implements TextRun {
         */
        public Color getFontColor() {
                TextProp tp = getPropVal(characterStyle, "font.color", parentParagraph);
-               if (tp == null) return null;
-               int rgb = tp.getValue();
-
-               int cidx = rgb >> 24;
-               if (rgb % 0x1000000 == 0){
-                       ColorSchemeAtom ca = parentParagraph.getSheet().getColorScheme();
-                       if(cidx >= 0 && cidx <= 7) rgb = ca.getColor(cidx);
-               }
-               Color tmp = new Color(rgb, true);
-               return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
+               return (tp == null) ? null
+               : HSLFTextParagraph.getColorFromColorIndexStruct(tp.getValue(), parentParagraph.getSheet());
        }
 
        /**
index b9df58c43ae5b1d1babe7d44a002482d03d78a0c..55222cf47417bcc318233b79b856641160b0d524 100644 (file)
@@ -516,7 +516,7 @@ public abstract class HSLFTextShape extends HSLFSimpleShape implements TextShape
     }
 
     /**
-      * @return the TextRun object for this text box
+      * @return the TextParagraphs for this text box
       */
     public List<HSLFTextParagraph> getTextParagraphs(){
         if (!_paragraphs.isEmpty()) return _paragraphs;
@@ -527,8 +527,13 @@ public abstract class HSLFTextShape extends HSLFSimpleShape implements TextShape
             _txtbox = _paragraphs.get(0).getTextboxWrapper();
         } else {
             _paragraphs = HSLFTextParagraph.findTextParagraphs(_txtbox, getSheet());
-            if (_paragraphs == null || _paragraphs.isEmpty()) {
-                throw new RuntimeException("TextRecord didn't contained any text lines");
+            if (_paragraphs == null) {
+                // there are actually TextBoxRecords without extra data - see #54722
+                _paragraphs = HSLFTextParagraph.createEmptyParagraph(_txtbox);
+            }
+                
+            if (_paragraphs.isEmpty()) {
+                logger.log(POILogger.WARN, "TextRecord didn't contained any text lines");
             }
 //            initParagraphsFromSheetRecords();
 //            if (_paragraphs.isEmpty()) {
@@ -553,9 +558,12 @@ public abstract class HSLFTextShape extends HSLFSimpleShape implements TextShape
         // (We can't do it in the constructor because the sheet
         //  is not assigned then, it's only built once we have
         //  all the records)
-        for (HSLFTextParagraph htp : getTextParagraphs()) {
-            // Supply the sheet to our child RichTextRuns
-            htp.supplySheet(_sheet);
+        List<HSLFTextParagraph> paras = getTextParagraphs();
+        if (paras != null) {
+            for (HSLFTextParagraph htp : paras) {
+                // Supply the sheet to our child RichTextRuns
+                htp.supplySheet(_sheet);
+            }
         }
     }
 
index d3c606a62dc36a537418e81c647f01c499afffde..c83abbd5a597b68e5ca77e8c033ed1bb7d154efc 100644 (file)
@@ -10,8 +10,9 @@ import java.util.*;
 \r
 import org.apache.poi.sl.usermodel.*;\r
 import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;\r
-import org.apache.poi.sl.usermodel.TextRun.TextCap;\r
 import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;\r
+import org.apache.poi.sl.usermodel.TextRun.TextCap;\r
+import org.apache.poi.util.Units;\r
 \r
 public class DrawTextParagraph<T extends TextRun> implements Drawable {\r
     protected TextParagraph<T> paragraph;\r
@@ -20,6 +21,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
     protected List<DrawTextFragment> lines = new ArrayList<DrawTextFragment>();\r
     protected String rawText;\r
     protected DrawTextFragment bullet;\r
+    protected int autoNbrIdx = 0;\r
 \r
     /**\r
      * the highest line in this paragraph. Used for line spacing.\r
@@ -47,6 +49,14 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
     public double getY() {\r
         return y;\r
     }\r
+\r
+    /**\r
+     * Sets the auto numbering index of the handled paragraph\r
+     * @param index the auto numbering index\r
+     */\r
+    public void setAutoNumberingIdx(int index) {\r
+        autoNbrIdx = index;\r
+    }\r
     \r
     public void draw(Graphics2D graphics){\r
         if (lines.isEmpty()) return;\r
@@ -56,51 +66,45 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
         double penY = y;\r
 \r
         boolean firstLine = true;\r
+        int indentLevel = paragraph.getIndentLevel();\r
         Double leftMargin = paragraph.getLeftMargin();\r
-        Double indent = paragraph.getIndent();\r
         if (leftMargin == null) {\r
-            leftMargin = (indent != null) ? -indent : 0;\r
+            // if the marL attribute is omitted, then a value of 347663 is implied\r
+            leftMargin = Units.toPoints(347663*(indentLevel+1));\r
         }\r
+        Double indent = paragraph.getIndent();\r
         if (indent == null) {\r
-            indent = (leftMargin != null) ? -leftMargin : 0;\r
+            indent = Units.toPoints(347663*indentLevel);\r
+        }\r
+        Double rightMargin = paragraph.getRightMargin();\r
+        if (rightMargin == null) {\r
+            rightMargin = 0d;\r
         }\r
-\r
 \r
         //The vertical line spacing\r
         Double spacing = paragraph.getLineSpacing();\r
         if (spacing == null) spacing = 100d;\r
         \r
         for(DrawTextFragment line : lines){\r
-            double penX = x + leftMargin;\r
+            double penX;\r
 \r
             if(firstLine) {\r
                 if (!isEmptyParagraph()) {\r
+                    // TODO: find out character style for empty, but bulleted/numbered lines\r
                     bullet = getBullet(graphics, line.getAttributedString().getIterator());\r
                 }\r
                 \r
-                if(bullet != null){\r
-                    if (indent < 0) {\r
-                        // a negative value means "Hanging" indentation and\r
-                        // indicates the position of the actual bullet character.\r
-                        // (the bullet is shifted to right relative to the text)\r
-                        bullet.setPosition(penX + indent, penY);\r
-                    } else if(indent > 0){\r
-                        // a positive value means the "First Line" indentation:\r
-                        // the first line is indented and other lines start at the bullet offset\r
-                        bullet.setPosition(penX, penY);\r
-                        penX += indent;\r
-                    } else {\r
-                        // a zero indent means that the bullet and text have the same offset\r
-                        bullet.setPosition(penX, penY);\r
-\r
-                        // don't let text overlay the bullet and advance by the bullet width\r
-                        penX += bullet.getLayout().getAdvance() + 1;\r
-                    }\r
-\r
+                if (bullet != null){\r
+                    bullet.setPosition(x + indent, penY);\r
                     bullet.draw(graphics);\r
+                    // don't let text overlay the bullet and advance by the bullet width\r
+                    double bulletWidth = bullet.getLayout().getAdvance() + 1;\r
+                    penX = x + Math.max(leftMargin, indent+bulletWidth);\r
                 } else {\r
-                    penX += indent;\r
+                    penX = x + indent;\r
                 }\r
+            } else {\r
+                penX = x + leftMargin;\r
             }\r
 \r
             Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());\r
@@ -125,7 +129,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
                 // If linespacing >= 0, then linespacing is a percentage of normal line height.\r
                 penY += spacing*0.01* line.getHeight();\r
             } else {\r
-                // positive value means absolute spacing in points\r
+                // negative value means absolute spacing in points\r
                 penY += -spacing;\r
             }\r
 \r
@@ -219,7 +223,13 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
         BulletStyle bulletStyle = paragraph.getBulletStyle();\r
         if (bulletStyle == null) return null;\r
 \r
-        String buCharacter = bulletStyle.getBulletCharacter();\r
+        String buCharacter;\r
+        AutoNumberingScheme ans = bulletStyle.getAutoNumberingScheme();\r
+        if (ans != null) {\r
+            buCharacter = ans.format(autoNbrIdx);\r
+        } else {\r
+            buCharacter = bulletStyle.getBulletCharacter();\r
+        }\r
         if (buCharacter == null) return null;\r
 \r
         String buFont = bulletStyle.getBulletFont();\r
@@ -314,13 +324,19 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
 \r
         Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());\r
 \r
+        int indentLevel = paragraph.getIndentLevel();\r
         Double leftMargin = paragraph.getLeftMargin();\r
-        Double indent = paragraph.getIndent();\r
         if (leftMargin == null) {\r
-            leftMargin = (indent != null) ? -indent : 0;\r
+            // if the marL attribute is omitted, then a value of 347663 is implied\r
+            leftMargin = Units.toPoints(347663*(indentLevel+1));\r
         }\r
+        Double indent = paragraph.getIndent();\r
         if (indent == null) {\r
-            indent = (leftMargin != null) ? -leftMargin : 0;\r
+            indent = Units.toPoints(347663*indentLevel);\r
+        }\r
+        Double rightMargin = paragraph.getRightMargin();\r
+        if (rightMargin == null) {\r
+            rightMargin = 0d;\r
         }\r
 \r
         double width;\r
@@ -329,7 +345,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable {
             // if wordWrap == false then we return the advance to the right border of the sheet\r
             width = ts.getSheet().getSlideShow().getPageSize().getWidth() - anchor.getX();\r
         } else {\r
-            width = anchor.getWidth() -  leftInset - rightInset - leftMargin;\r
+            width = anchor.getWidth() - leftInset - rightInset - leftMargin - rightMargin;\r
             if (firstLine) {\r
                 if (bullet != null){\r
                     if (indent > 0) width -= indent;\r
index bb6c6dd29f68aa56010977fc1794a00a2ff19d45..2212935115f059c427ecadc91d5b739cc069d088 100644 (file)
@@ -7,6 +7,7 @@ import java.awt.image.BufferedImage;
 import java.util.Iterator;\r
 \r
 import org.apache.poi.sl.usermodel.*;\r
+import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;\r
 \r
 public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends TextRun>>> extends DrawSimpleShape<T> {\r
 \r
@@ -87,9 +88,19 @@ public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends
         Iterator<? extends TextParagraph<? extends TextRun>> paragraphs = shape.iterator();\r
         \r
         boolean isFirstLine = true;\r
-        while (paragraphs.hasNext()){\r
+        for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){\r
             TextParagraph<? extends TextRun> p = paragraphs.next();\r
             DrawTextParagraph<? extends TextRun> dp = fact.getDrawable(p);\r
+            BulletStyle bs = p.getBulletStyle();\r
+            if (bs == null || bs.getAutoNumberingScheme() == null) {\r
+                autoNbrIdx = -1;\r
+            } else {\r
+                Integer startAt = bs.getAutoNumberingStartAt();\r
+                if (startAt == null) startAt = 1;\r
+                // TODO: handle reset auto number indexes\r
+                if (startAt > autoNbrIdx) autoNbrIdx = startAt;\r
+            }\r
+            dp.setAutoNumberingIdx(autoNbrIdx);\r
             dp.setInsets(shapePadding);\r
             dp.breakText(graphics);\r
 \r
index ff07ce7cf279036d82dca58afd46fc33dcd2f16a..32ee2a03b0ee3d32d9d9517a3aa93887ef96a4ef 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -47,17 +43,12 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_AdjPoint2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTAdjPoint2D\r
-    implements Locatable\r
-{\r
+public class CTAdjPoint2D {\r
 \r
-    @XmlAttribute(name = "x", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String x;\r
-    @XmlAttribute(name = "y", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String y;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the x property.\r
@@ -115,12 +106,4 @@ public class CTAdjPoint2D
         return (this.y!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index ae1482e49d839ddeb22b32d39e1bd490c7efb67b..c5ef7860b647fcaf759cd42d9d2917bdb883c33a 100644 (file)
@@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
 import javax.xml.bind.annotation.XmlElements;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -54,18 +50,13 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_AdjustHandleList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "ahXYOrAhPolar"\r
 })\r
-public class CTAdjustHandleList\r
-    implements Locatable\r
-{\r
+public class CTAdjustHandleList {\r
 \r
     @XmlElements({\r
-        @XmlElement(name = "ahXY", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTXYAdjustHandle.class),\r
-        @XmlElement(name = "ahPolar", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPolarAdjustHandle.class)\r
+        @XmlElement(name = "ahPolar", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPolarAdjustHandle.class),\r
+        @XmlElement(name = "ahXY", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTXYAdjustHandle.class)\r
     })\r
     protected List<Object> ahXYOrAhPolar;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the ahXYOrAhPolar property.\r
@@ -85,8 +76,8 @@ public class CTAdjustHandleList
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link CTXYAdjustHandle }\r
      * {@link CTPolarAdjustHandle }\r
+     * {@link CTXYAdjustHandle }\r
      * \r
      * \r
      */\r
@@ -105,12 +96,4 @@ public class CTAdjustHandleList
         this.ahXYOrAhPolar = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 77f138790d6dacf613bdbc5e515e2bc3a0279698..2e39602dad42d82e2316ffc2068a2a5d893f7e8f 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Angle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTAngle implements Locatable\r
-{\r
+public class CTAngle {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTAngle implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index c03c7319da69408725d95a27eb978385a1111a82..dd3cca360257d82ce8945f82f88b6a245e474580 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -55,9 +51,7 @@ import org.xml.sax.Locator;
     "schemeClr",\r
     "prstClr"\r
 })\r
-public class CTColor\r
-    implements Locatable\r
-{\r
+public class CTColor {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTScRgbColor scrgbClr;\r
@@ -71,9 +65,6 @@ public class CTColor
     protected CTSchemeColor schemeClr;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTPresetColor prstClr;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the scrgbClr property.\r
@@ -243,12 +234,4 @@ public class CTColor
         return (this.prstClr!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 2439cc1ba5fc2372a55a8b1633c6d7f39a3f4581..fb3e2cc61d20df3d68d4d852d6f0b48fa35773b9 100644 (file)
@@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
 import javax.xml.bind.annotation.XmlElements;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -53,22 +49,17 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_ColorMRU", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorChoice"\r
 })\r
-public class CTColorMRU\r
-    implements Locatable\r
-{\r
+public class CTColorMRU {\r
 \r
     @XmlElements({\r
-        @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),\r
-        @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),\r
         @XmlElement(name = "hslClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTHslColor.class),\r
-        @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class),\r
+        @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),\r
         @XmlElement(name = "schemeClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSchemeColor.class),\r
-        @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class)\r
+        @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),\r
+        @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class),\r
+        @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class)\r
     })\r
     protected List<Object> egColorChoice;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorChoice property.\r
@@ -88,12 +79,12 @@ public class CTColorMRU
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link CTScRgbColor }\r
-     * {@link CTSRgbColor }\r
      * {@link CTHslColor }\r
-     * {@link CTSystemColor }\r
+     * {@link CTSRgbColor }\r
      * {@link CTSchemeColor }\r
+     * {@link CTScRgbColor }\r
      * {@link CTPresetColor }\r
+     * {@link CTSystemColor }\r
      * \r
      * \r
      */\r
@@ -112,12 +103,4 @@ public class CTColorMRU
         this.egColorChoice = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 491971549e3f228ef32f0c7e8a1ee61e34bc7f3f..dd1a56c0b99d72bb522f0fafecebe5dc5c7bf916 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_ComplementTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTComplementTransform implements Locatable\r
-{\r
+public class CTComplementTransform {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index b2c88ae4557e10eebb2ec9ac7a9f617598083a2f..4af3fac71987fe8614880a052cadc11896eaffd8 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlSchemaType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -48,18 +44,13 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Connection", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTConnection\r
-    implements Locatable\r
-{\r
+public class CTConnection {\r
 \r
-    @XmlAttribute(name = "id", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long id;\r
-    @XmlAttribute(name = "idx", required = true)\r
+    @XmlAttribute(required = true)\r
     @XmlSchemaType(name = "unsignedInt")\r
     protected long idx;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the id property.\r
@@ -101,12 +92,4 @@ public class CTConnection
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index c6189d1128fa4756a1abff3ac6ac8ed60f515985..7ec62972dd9afac40c822f5228f41125a61650d6 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,17 +48,12 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_ConnectionSite", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pos"\r
 })\r
-public class CTConnectionSite\r
-    implements Locatable\r
-{\r
+public class CTConnectionSite {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTAdjPoint2D pos;\r
-    @XmlAttribute(name = "ang", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String ang;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pos property.\r
@@ -120,12 +111,4 @@ public class CTConnectionSite
         return (this.ang!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 49e8123993e12ea1226c426da304c3bdd0f7758a..a3c98898c4e1ee5a06a24079aa92bf18157e89c5 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,15 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_ConnectionSiteList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "cxn"\r
 })\r
-public class CTConnectionSiteList\r
-    implements Locatable\r
-{\r
+public class CTConnectionSiteList {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected List<CTConnectionSite> cxn;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the cxn property.\r
@@ -99,12 +90,4 @@ public class CTConnectionSiteList
         this.cxn = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 4e43d915c7e24bd8120cbba6d69291e0c32f1848..d6856ee637ee2adc92debae88125c99e2efdf542 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -60,9 +56,7 @@ import org.xml.sax.Locator;
     "rect",\r
     "pathLst"\r
 })\r
-public class CTCustomGeometry2D\r
-    implements Locatable\r
-{\r
+public class CTCustomGeometry2D {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTGeomGuideList avLst;\r
@@ -76,9 +70,6 @@ public class CTCustomGeometry2D
     protected CTGeomRect rect;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTPath2DList pathLst;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the avLst property.\r
@@ -248,12 +239,4 @@ public class CTCustomGeometry2D
         return (this.pathLst!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index aaef46da9ad5cd38b238234949d749fccbc8701f..94d44ece22755ac932e383e7bdd2509e5bda1657 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -48,19 +44,14 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_EmbeddedWAVAudioFile", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTEmbeddedWAVAudioFile\r
-    implements Locatable\r
-{\r
+public class CTEmbeddedWAVAudioFile {\r
 \r
-    @XmlAttribute(name = "embed", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)\r
+    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)\r
     protected String embed;\r
-    @XmlAttribute(name = "name")\r
+    @XmlAttribute\r
     protected String name;\r
-    @XmlAttribute(name = "builtIn")\r
+    @XmlAttribute\r
     protected Boolean builtIn;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Embedded Audio File Relationship ID\r
@@ -158,12 +149,4 @@ public class CTEmbeddedWAVAudioFile
         this.builtIn = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 14bcd3776f18c27334b1f16edaf9c0e30539863b..92f41aee8942373380a5ae131d3544379d20a690 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_FixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTFixedPercentage implements Locatable\r
-{\r
+public class CTFixedPercentage {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTFixedPercentage implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 84e7f3b0e067dca71e5d265d3bfd4f562dafb797..7cf6cb195cb08ed05ccb5f5420ec8778cbb20a91 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_GammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTGammaTransform implements Locatable\r
-{\r
+public class CTGammaTransform {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index e0723d97a2091317813e812cfed653b054a70a76..3df22093ca997a14e333796eaa722e34fc60efd3 100644 (file)
@@ -20,13 +20,9 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -49,18 +45,13 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_GeomGuide", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTGeomGuide\r
-    implements Locatable\r
-{\r
+public class CTGeomGuide {\r
 \r
-    @XmlAttribute(name = "name", required = true)\r
+    @XmlAttribute(required = true)\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String name;\r
-    @XmlAttribute(name = "fmla", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String fmla;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the name property.\r
@@ -118,12 +109,4 @@ public class CTGeomGuide
         return (this.fmla!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index d5203d84934452d706ba53b0a6a302b1a9939d02..4490933b4f6b67624b7fba32e1d31c539b98199c 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,15 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_GeomGuideList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "gd"\r
 })\r
-public class CTGeomGuideList\r
-    implements Locatable\r
-{\r
+public class CTGeomGuideList {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected List<CTGeomGuide> gd;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the gd property.\r
@@ -99,12 +90,4 @@ public class CTGeomGuideList
         this.gd = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index f0383f81f8b7214c89f64417c6950fca552af0fd..b1368be2954214f998325a52ba6f4205aed005de 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -49,21 +45,16 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_GeomRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTGeomRect\r
-    implements Locatable\r
-{\r
+public class CTGeomRect {\r
 \r
-    @XmlAttribute(name = "l", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String l;\r
-    @XmlAttribute(name = "t", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String t;\r
-    @XmlAttribute(name = "r", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String r;\r
-    @XmlAttribute(name = "b", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String b;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the l property.\r
@@ -177,12 +168,4 @@ public class CTGeomRect
         return (this.b!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index ef5ad887f664c23b903ed42c36bd45ce4fadaa86..643db025a22afdfee613d9c3cd2687adb56b6163 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_GrayscaleTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTGrayscaleTransform implements Locatable\r
-{\r
+public class CTGrayscaleTransform {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index 15386a230dcd63c0c47e5618fb6ae349007cd8d9..6508613b16fdf308b4a8b7a4425337d5cc034a4a 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -60,9 +56,7 @@ import org.xml.sax.Locator;
     "chOff",\r
     "chExt"\r
 })\r
-public class CTGroupTransform2D\r
-    implements Locatable\r
-{\r
+public class CTGroupTransform2D {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTPoint2D off;\r
@@ -72,15 +66,12 @@ public class CTGroupTransform2D
     protected CTPoint2D chOff;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTPositiveSize2D chExt;\r
-    @XmlAttribute(name = "rot")\r
+    @XmlAttribute\r
     protected Integer rot;\r
-    @XmlAttribute(name = "flipH")\r
+    @XmlAttribute\r
     protected Boolean flipH;\r
-    @XmlAttribute(name = "flipV")\r
+    @XmlAttribute\r
     protected Boolean flipV;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the off property.\r
@@ -302,12 +293,4 @@ public class CTGroupTransform2D
         this.flipV = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 534a9b37005638551b3e3c78bcb8133d95d102d8..c5bca5aecaa82b29442e7c68aff49771de7c6f4b 100644 (file)
@@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -58,49 +54,45 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_HslColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTHslColor implements Locatable\r
-{\r
+public class CTHslColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "hue", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int hue;\r
-    @XmlAttribute(name = "sat", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int sat;\r
-    @XmlAttribute(name = "lum", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int lum;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -120,34 +112,34 @@ public class CTHslColor implements Locatable
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * \r
      * \r
      */\r
@@ -226,12 +218,4 @@ public class CTHslColor implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 571ff8b646a82037ece10d041110e18fe6a8e735..03e486af5d788b284c17f20a1be20503fc146c54 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -61,33 +57,28 @@ import org.xml.sax.Locator;
     "snd",\r
     "extLst"\r
 })\r
-public class CTHyperlink\r
-    implements Locatable\r
-{\r
+public class CTHyperlink {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTEmbeddedWAVAudioFile snd;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTOfficeArtExtensionList extLst;\r
-    @XmlAttribute(name = "id", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")\r
+    @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")\r
     protected String id;\r
-    @XmlAttribute(name = "invalidUrl")\r
+    @XmlAttribute\r
     protected String invalidUrl;\r
-    @XmlAttribute(name = "action")\r
+    @XmlAttribute\r
     protected String action;\r
-    @XmlAttribute(name = "tgtFrame")\r
+    @XmlAttribute\r
     protected String tgtFrame;\r
-    @XmlAttribute(name = "tooltip")\r
+    @XmlAttribute\r
     protected String tooltip;\r
-    @XmlAttribute(name = "history")\r
+    @XmlAttribute\r
     protected Boolean history;\r
-    @XmlAttribute(name = "highlightClick")\r
+    @XmlAttribute\r
     protected Boolean highlightClick;\r
-    @XmlAttribute(name = "endSnd")\r
+    @XmlAttribute\r
     protected Boolean endSnd;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the snd property.\r
@@ -409,12 +400,4 @@ public class CTHyperlink
         this.endSnd = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 091d6e23180a75978674fe58cb305914a4b8e231..eaff064d709d5f684a8e41b2a30e3aeab95c081a 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_InverseGammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTInverseGammaTransform implements Locatable\r
-{\r
+public class CTInverseGammaTransform {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index e1de7b8b5a053251fe0ead4912df698307b820fa..84af62533707a7841d7c06861c730b3da927f07b 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_InverseTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTInverseTransform implements Locatable\r
-{\r
+public class CTInverseTransform {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index db1831fdf1701925caa446132649ad5e136a26f0..adb928fbe1c328cafcdd5edbe81b42ec0e0bb82f 100644 (file)
@@ -22,14 +22,10 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlSchemaType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
 import org.w3c.dom.Element;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -56,27 +52,22 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_OfficeArtExtension", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "any"\r
 })\r
-public class CTOfficeArtExtension\r
-    implements Locatable\r
-{\r
+public class CTOfficeArtExtension {\r
 \r
     @XmlAnyElement(lax = true)\r
     protected Object any;\r
-    @XmlAttribute(name = "uri")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     @XmlSchemaType(name = "token")\r
     protected String uri;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the any property.\r
      * \r
      * @return\r
      *     possible object is\r
-     *     {@link Object }\r
      *     {@link Element }\r
+     *     {@link Object }\r
      *     \r
      */\r
     public Object getAny() {\r
@@ -88,8 +79,8 @@ public class CTOfficeArtExtension
      * \r
      * @param value\r
      *     allowed object is\r
-     *     {@link Object }\r
      *     {@link Element }\r
+     *     {@link Object }\r
      *     \r
      */\r
     public void setAny(Object value) {\r
@@ -128,12 +119,4 @@ public class CTOfficeArtExtension
         return (this.uri!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index fc806911f06b11a0d36c055c477f4a37f85c9acb..f0b54cb1801e59c821b9597b3d11ed0a32ab883f 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,15 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_OfficeArtExtensionList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "ext"\r
 })\r
-public class CTOfficeArtExtensionList\r
-    implements Locatable\r
-{\r
+public class CTOfficeArtExtensionList {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected List<CTOfficeArtExtension> ext;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the ext property.\r
@@ -99,12 +90,4 @@ public class CTOfficeArtExtensionList
         this.ext = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index bcba3c8c8e8dad24523f92309f76fb8cdc0b263a..84b919843c5ba4b9bf62dfac8eeea922a275592f 100644 (file)
@@ -24,11 +24,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
 import javax.xml.bind.annotation.XmlElements;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -64,32 +60,27 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "closeOrMoveToOrLnTo"\r
 })\r
-public class CTPath2D\r
-    implements Locatable\r
-{\r
+public class CTPath2D {\r
 \r
     @XmlElements({\r
-        @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class),\r
         @XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DMoveTo.class),\r
-        @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),\r
-        @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),\r
         @XmlElement(name = "quadBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DQuadBezierTo.class),\r
-        @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class)\r
+        @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class),\r
+        @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),\r
+        @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),\r
+        @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class)\r
     })\r
     protected List<Object> closeOrMoveToOrLnTo;\r
-    @XmlAttribute(name = "w")\r
+    @XmlAttribute\r
     protected Long w;\r
-    @XmlAttribute(name = "h")\r
+    @XmlAttribute\r
     protected Long h;\r
-    @XmlAttribute(name = "fill")\r
+    @XmlAttribute\r
     protected STPathFillMode fill;\r
-    @XmlAttribute(name = "stroke")\r
+    @XmlAttribute\r
     protected Boolean stroke;\r
-    @XmlAttribute(name = "extrusionOk")\r
+    @XmlAttribute\r
     protected Boolean extrusionOk;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the closeOrMoveToOrLnTo property.\r
@@ -109,12 +100,12 @@ public class CTPath2D
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link CTPath2DClose }\r
      * {@link CTPath2DMoveTo }\r
-     * {@link CTPath2DLineTo }\r
-     * {@link CTPath2DArcTo }\r
      * {@link CTPath2DQuadBezierTo }\r
      * {@link CTPath2DCubicBezierTo }\r
+     * {@link CTPath2DArcTo }\r
+     * {@link CTPath2DLineTo }\r
+     * {@link CTPath2DClose }\r
      * \r
      * \r
      */\r
@@ -309,12 +300,4 @@ public class CTPath2D
         this.extrusionOk = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 225d87005a3fc616400f90450770b577b7e1afa4..a4c325aa1fada35fe8dcaef23e3ba95eeab637ca 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -49,20 +45,16 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Path2DArcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPath2DArcTo implements Locatable\r
-{\r
+public class CTPath2DArcTo {\r
 \r
     @XmlAttribute(name = "wR", required = true)\r
     protected String wr;\r
     @XmlAttribute(name = "hR", required = true)\r
     protected String hr;\r
-    @XmlAttribute(name = "stAng", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String stAng;\r
-    @XmlAttribute(name = "swAng", required = true)\r
+    @XmlAttribute(required = true)\r
     protected String swAng;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the wr property.\r
@@ -176,12 +168,4 @@ public class CTPath2DArcTo implements Locatable
         return (this.swAng!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index f8f2514facef52c355d8ed5542ca5e82997db80c..a60f98bb67cf9224098c9fd87d5f29a1ba141b96 100644 (file)
@@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding;
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -44,19 +40,7 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Path2DClose", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPath2DClose implements Locatable\r
-{\r
+public class CTPath2DClose {\r
 \r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
-\r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
 \r
 }\r
index 0f27b0506a8cf874bf2c7904e18a5ab0ec84b37f..e1818fa5dbdd6056fabc7bbff8db49fb7021b8a6 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,14 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2DCubicBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pt"\r
 })\r
-public class CTPath2DCubicBezierTo implements Locatable\r
-{\r
+public class CTPath2DCubicBezierTo {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected List<CTAdjPoint2D> pt;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pt property.\r
@@ -98,12 +90,4 @@ public class CTPath2DCubicBezierTo implements Locatable
         this.pt = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 0cfeb7cd64eb1ec6c9e69718525eca6015267e3b..9c6d1b39a84a326aa781b3e64afb8aeac90b6dd2 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -50,14 +46,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2DLineTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pt"\r
 })\r
-public class CTPath2DLineTo implements Locatable\r
-{\r
+public class CTPath2DLineTo {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTAdjPoint2D pt;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pt property.\r
@@ -87,12 +79,4 @@ public class CTPath2DLineTo implements Locatable
         return (this.pt!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index c190710cf4c802d1197e9a3c97720f143894201d..cd31a0ba577fc656d49d9a37947250ac1a2fef1f 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,15 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2DList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "path"\r
 })\r
-public class CTPath2DList\r
-    implements Locatable\r
-{\r
+public class CTPath2DList {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected List<CTPath2D> path;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the path property.\r
@@ -99,12 +90,4 @@ public class CTPath2DList
         this.path = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 6554a296dc590a1d140e73747b2008a57a10b6f9..f5e210f768e5bfcace9f3ba8df280a57d2f224b7 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -50,14 +46,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2DMoveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pt"\r
 })\r
-public class CTPath2DMoveTo implements Locatable\r
-{\r
+public class CTPath2DMoveTo {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTAdjPoint2D pt;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pt property.\r
@@ -87,12 +79,4 @@ public class CTPath2DMoveTo implements Locatable
         return (this.pt!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 4db3737224c28ac1dbee136a9505c22d5199c574..b588775245a1c9b76a615e754eefe255f841171c 100644 (file)
@@ -22,11 +22,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,14 +48,10 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_Path2DQuadBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pt"\r
 })\r
-public class CTPath2DQuadBezierTo implements Locatable\r
-{\r
+public class CTPath2DQuadBezierTo {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected List<CTAdjPoint2D> pt;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pt property.\r
@@ -98,12 +90,4 @@ public class CTPath2DQuadBezierTo implements Locatable
         this.pt = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 1c07c22d9448ba159507eab66e01acc73eb85ecd..7ca8c1fec564982838388409789a6a7a3f570234 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPercentage implements Locatable\r
-{\r
+public class CTPercentage {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTPercentage implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index a178b26b19513f3c137bcdf03e6ee0bbeee427ee..ae87986035d559e6d2ee3f234c21d24db64bb5e8 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -47,17 +43,12 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPoint2D\r
-    implements Locatable\r
-{\r
+public class CTPoint2D {\r
 \r
-    @XmlAttribute(name = "x", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long x;\r
-    @XmlAttribute(name = "y", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long y;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the x property.\r
@@ -99,12 +90,4 @@ public class CTPoint2D
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 641ad4611d8f3052ff7804a649c9ac3c60480475..e14c6ba4f2187f387fdc798cfa2901b5c6a284e8 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -48,19 +44,14 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPoint3D\r
-    implements Locatable\r
-{\r
+public class CTPoint3D {\r
 \r
-    @XmlAttribute(name = "x", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long x;\r
-    @XmlAttribute(name = "y", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long y;\r
-    @XmlAttribute(name = "z", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long z;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the x property.\r
@@ -122,12 +113,4 @@ public class CTPoint3D
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 2c3f9b9923ce95c3c0ce9a986e60b2b924a8669f..9547ca98813d071ebc16e5df27b4f234a2ecc323 100644 (file)
@@ -21,13 +21,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -59,28 +55,24 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_PolarAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pos"\r
 })\r
-public class CTPolarAdjustHandle implements Locatable\r
-{\r
+public class CTPolarAdjustHandle {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTAdjPoint2D pos;\r
-    @XmlAttribute(name = "gdRefR")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String gdRefR;\r
-    @XmlAttribute(name = "minR")\r
+    @XmlAttribute\r
     protected String minR;\r
-    @XmlAttribute(name = "maxR")\r
+    @XmlAttribute\r
     protected String maxR;\r
-    @XmlAttribute(name = "gdRefAng")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String gdRefAng;\r
-    @XmlAttribute(name = "minAng")\r
+    @XmlAttribute\r
     protected String minAng;\r
-    @XmlAttribute(name = "maxAng")\r
+    @XmlAttribute\r
     protected String maxAng;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pos property.\r
@@ -278,12 +270,4 @@ public class CTPolarAdjustHandle implements Locatable
         return (this.maxAng!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index c544044ae3fb9fcb8553322df108eb199784bcce..94348d9bffd0db22dd80a5f85cc512497ac9659a 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPositiveFixedAngle implements Locatable\r
-{\r
+public class CTPositiveFixedAngle {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTPositiveFixedAngle implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 475ae740c0e3d0ae7daa71c726cc3ec26db1a9a8..de659159e1ae0b74f68890f21268de4aa6daadd9 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPositiveFixedPercentage implements Locatable\r
-{\r
+public class CTPositiveFixedPercentage {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTPositiveFixedPercentage implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 9d7b8b9750a83112fefedb072860a28b928dc5cd..7b377e14447373b8c27ed7f894ff2aa8a198007f 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -46,14 +42,10 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPositivePercentage implements Locatable\r
-{\r
+public class CTPositivePercentage {\r
 \r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the val property.\r
@@ -75,12 +67,4 @@ public class CTPositivePercentage implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index f070ab75a64969294ab7968c6d5d0281a414cb01..210fd925a56b614bd14df15afa9e1419e030c3a3 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -47,17 +43,12 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTPositiveSize2D\r
-    implements Locatable\r
-{\r
+public class CTPositiveSize2D {\r
 \r
-    @XmlAttribute(name = "cx", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long cx;\r
-    @XmlAttribute(name = "cy", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long cy;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the cx property.\r
@@ -99,12 +90,4 @@ public class CTPositiveSize2D
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 5c8d53e1079e048600d14be7787e232d1c69cdcc..991d232d0387455dcc3a0cd0e1953212058d47ad 100644 (file)
@@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -56,45 +52,41 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_PresetColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTPresetColor implements Locatable\r
-{\r
+public class CTPresetColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "val")\r
+    @XmlAttribute\r
     protected STPresetColorVal val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -114,34 +106,34 @@ public class CTPresetColor implements Locatable
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * \r
      * \r
      */\r
@@ -188,12 +180,4 @@ public class CTPresetColor implements Locatable
         return (this.val!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 0989d29f077a295d2bca53ecca4d1ff926a106d1..234bbd95f93f21fb86ac59377132e746419294ba 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,17 +48,12 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_PresetGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "avLst"\r
 })\r
-public class CTPresetGeometry2D\r
-    implements Locatable\r
-{\r
+public class CTPresetGeometry2D {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTGeomGuideList avLst;\r
-    @XmlAttribute(name = "prst", required = true)\r
+    @XmlAttribute(required = true)\r
     protected STShapeType prst;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the avLst property.\r
@@ -120,12 +111,4 @@ public class CTPresetGeometry2D
         return (this.prst!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 77d5e3f25125e56b14aa9c703204e983fa63a677..0a6135fc909eb6de2b4ca18b53ab08d536e4d26e 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,17 +48,12 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_PresetTextShape", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "avLst"\r
 })\r
-public class CTPresetTextShape\r
-    implements Locatable\r
-{\r
+public class CTPresetTextShape {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTGeomGuideList avLst;\r
-    @XmlAttribute(name = "prst", required = true)\r
+    @XmlAttribute(required = true)\r
     protected STTextShapeType prst;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the avLst property.\r
@@ -120,12 +111,4 @@ public class CTPresetTextShape
         return (this.prst!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 3ea12ebe5dc291cd1abab5a832c648a0b92b5980..4a61b88cb95307c6b640b5979bc522e060140591 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -47,17 +43,12 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTRatio\r
-    implements Locatable\r
-{\r
+public class CTRatio {\r
 \r
-    @XmlAttribute(name = "n", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long n;\r
-    @XmlAttribute(name = "d", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long d;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the n property.\r
@@ -99,12 +90,4 @@ public class CTRatio
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 7d46b575acffa2efe8f1a9974a1baff771121075..a8b82c474449dafc38ba37e6660c0760e462b1cd 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -49,21 +45,16 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTRelativeRect\r
-    implements Locatable\r
-{\r
+public class CTRelativeRect {\r
 \r
-    @XmlAttribute(name = "l")\r
+    @XmlAttribute\r
     protected Integer l;\r
-    @XmlAttribute(name = "t")\r
+    @XmlAttribute\r
     protected Integer t;\r
-    @XmlAttribute(name = "r")\r
+    @XmlAttribute\r
     protected Integer r;\r
-    @XmlAttribute(name = "b")\r
+    @XmlAttribute\r
     protected Integer b;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the l property.\r
@@ -209,12 +200,4 @@ public class CTRelativeRect
         this.b = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index d74a3527c3fbf96e1ffa28bf7e4b07574a305670..c48e8370b56e24fd0fcdab00d0f43b9c27e3c1c4 100644 (file)
@@ -25,13 +25,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -58,46 +54,42 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_SRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTSRgbColor implements Locatable\r
-{\r
+public class CTSRgbColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     @XmlJavaTypeAdapter(HexBinaryAdapter.class)\r
     protected byte[] val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -117,33 +109,33 @@ public class CTSRgbColor implements Locatable
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * \r
      * \r
@@ -184,19 +176,11 @@ public class CTSRgbColor implements Locatable
      *     \r
      */\r
     public void setVal(byte[] value) {\r
-        this.val = value;\r
+        this.val = ((byte[]) value);\r
     }\r
 \r
     public boolean isSetVal() {\r
         return (this.val!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 80d88ccc6010acc39bcd40418b34a8a053356592..4168027e0cc02b5278770162630ebe715aadae72 100644 (file)
@@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -58,49 +54,45 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_ScRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTScRgbColor implements Locatable\r
-{\r
+public class CTScRgbColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "r", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int r;\r
-    @XmlAttribute(name = "g", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int g;\r
-    @XmlAttribute(name = "b", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int b;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -121,33 +113,33 @@ public class CTScRgbColor implements Locatable
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * \r
      * \r
      */\r
@@ -226,12 +218,4 @@ public class CTScRgbColor implements Locatable
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 0f00fd8400e1b8857993cdba394b0d377cad518a..2e8eba194042e0c09e337a81d226f9e26f356077 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -52,17 +48,12 @@ import org.xml.sax.Locator;
     "sx",\r
     "sy"\r
 })\r
-public class CTScale2D\r
-    implements Locatable\r
-{\r
+public class CTScale2D {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTRatio sx;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTRatio sy;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the sx property.\r
@@ -120,12 +111,4 @@ public class CTScale2D
         return (this.sy!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 078e5793d3e6a8c1ba8c460132c0a972677537a1..b93a16668a2bc8153a9d44e4c8748c4a286ad615 100644 (file)
@@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -56,45 +52,41 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_SchemeColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTSchemeColor implements Locatable\r
-{\r
+public class CTSchemeColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     protected STSchemeColorVal val;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -115,32 +107,32 @@ public class CTSchemeColor implements Locatable
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
      * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * \r
      * \r
@@ -188,12 +180,4 @@ public class CTSchemeColor implements Locatable
         return (this.val!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 4ea585716af3dab173b0f3c1eb53a5589e7be5e4..7f03d0dac2df0583eadb9b584e4d3ef6c1c6eac4 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -48,19 +44,14 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTSphereCoords\r
-    implements Locatable\r
-{\r
+public class CTSphereCoords {\r
 \r
-    @XmlAttribute(name = "lat", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int lat;\r
-    @XmlAttribute(name = "lon", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int lon;\r
-    @XmlAttribute(name = "rev", required = true)\r
+    @XmlAttribute(required = true)\r
     protected int rev;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the lat property.\r
@@ -122,12 +113,4 @@ public class CTSphereCoords
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index f91a719507f550104019aae90b9af777d2d7317a..de94cb259848eba981d506db0f131fa89cc3976a 100644 (file)
@@ -25,14 +25,10 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElementRef;\r
 import javax.xml.bind.annotation.XmlElementRefs;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\r
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -60,49 +56,45 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_SystemColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "egColorTransform"\r
 })\r
-public class CTSystemColor implements Locatable\r
-{\r
+public class CTSystemColor {\r
 \r
     @XmlElementRefs({\r
-        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),\r
-        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)\r
+        @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),\r
+        @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)\r
     })\r
     protected List<JAXBElement<?>> egColorTransform;\r
-    @XmlAttribute(name = "val", required = true)\r
+    @XmlAttribute(required = true)\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String val;\r
-    @XmlAttribute(name = "lastClr")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(HexBinaryAdapter.class)\r
     protected byte[] lastClr;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the egColorTransform property.\r
@@ -122,34 +114,34 @@ public class CTSystemColor implements Locatable
      * \r
      * <p>\r
      * Objects of the following type(s) are allowed in the list\r
+     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
+     * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}\r
      * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}\r
-     * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}\r
      * \r
      * \r
      */\r
@@ -217,19 +209,11 @@ public class CTSystemColor implements Locatable
      *     \r
      */\r
     public void setLastClr(byte[] value) {\r
-        this.lastClr = value;\r
+        this.lastClr = ((byte[]) value);\r
     }\r
 \r
     public boolean isSetLastClr() {\r
         return (this.lastClr!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 2ba4704cfa60d8b4af2bac8c40dd429a34383173..dd1dcb501e06b0d93c69ab03131f22902875bfc7 100644 (file)
@@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -56,23 +52,18 @@ import org.xml.sax.Locator;
     "off",\r
     "ext"\r
 })\r
-public class CTTransform2D\r
-    implements Locatable\r
-{\r
+public class CTTransform2D {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTPoint2D off;\r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
     protected CTPositiveSize2D ext;\r
-    @XmlAttribute(name = "rot")\r
+    @XmlAttribute\r
     protected Integer rot;\r
-    @XmlAttribute(name = "flipH")\r
+    @XmlAttribute\r
     protected Boolean flipH;\r
-    @XmlAttribute(name = "flipV")\r
+    @XmlAttribute\r
     protected Boolean flipV;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the off property.\r
@@ -238,12 +229,4 @@ public class CTTransform2D
         this.flipV = null;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index 53f4b8e0387a0223790d391d3aafc9c8d768fa5b..d7f744ba6cb2ad3a8ed8afb6d2b0d3fd36234e74 100644 (file)
@@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding;
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -48,19 +44,14 @@ import org.xml.sax.Locator;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")\r
-public class CTVector3D\r
-    implements Locatable\r
-{\r
+public class CTVector3D {\r
 \r
-    @XmlAttribute(name = "dx", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long dx;\r
-    @XmlAttribute(name = "dy", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long dy;\r
-    @XmlAttribute(name = "dz", required = true)\r
+    @XmlAttribute(required = true)\r
     protected long dz;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the dx property.\r
@@ -122,12 +113,4 @@ public class CTVector3D
         return true;\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index e316f77832e0890b58def6a95918b0acbedd22a4..2b22a5881401f179a84fc291bd2ce47ef0987317 100644 (file)
@@ -21,13 +21,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlAttribute;\r
 import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\r
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
-import com.sun.xml.internal.bind.Locatable;\r
-import com.sun.xml.internal.bind.annotation.XmlLocation;\r
-import org.xml.sax.Locator;\r
 \r
 \r
 /**\r
@@ -59,28 +55,24 @@ import org.xml.sax.Locator;
 @XmlType(name = "CT_XYAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {\r
     "pos"\r
 })\r
-public class CTXYAdjustHandle implements Locatable\r
-{\r
+public class CTXYAdjustHandle {\r
 \r
     @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)\r
     protected CTAdjPoint2D pos;\r
-    @XmlAttribute(name = "gdRefX")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String gdRefX;\r
-    @XmlAttribute(name = "minX")\r
+    @XmlAttribute\r
     protected String minX;\r
-    @XmlAttribute(name = "maxX")\r
+    @XmlAttribute\r
     protected String maxX;\r
-    @XmlAttribute(name = "gdRefY")\r
+    @XmlAttribute\r
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)\r
     protected String gdRefY;\r
-    @XmlAttribute(name = "minY")\r
+    @XmlAttribute\r
     protected String minY;\r
-    @XmlAttribute(name = "maxY")\r
+    @XmlAttribute\r
     protected String maxY;\r
-    @XmlLocation\r
-    @XmlTransient\r
-    protected Locator locator;\r
 \r
     /**\r
      * Gets the value of the pos property.\r
@@ -278,12 +270,4 @@ public class CTXYAdjustHandle implements Locatable
         return (this.maxY!= null);\r
     }\r
 \r
-    public Locator sourceLocation() {\r
-        return locator;\r
-    }\r
-\r
-    public void setSourceLocation(Locator newLocator) {\r
-        locator = newLocator;\r
-    }\r
-\r
 }\r
index d5c0d65f81dfdbc994dec6801492f5d3839da068..c8c8c19d87a4e7d61c17bc5dce6a15fc5ecd5c6f 100644 (file)
@@ -40,34 +40,34 @@ import javax.xml.namespace.QName;
 @XmlRegistry\r
 public class ObjectFactory {\r
 \r
-    private final static QName _CTHslColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");\r
-    private final static QName _CTHslColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");\r
-    private final static QName _CTHslColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");\r
-    private final static QName _CTHslColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");\r
-    private final static QName _CTHslColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");\r
-    private final static QName _CTHslColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");\r
-    private final static QName _CTHslColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");\r
-    private final static QName _CTHslColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");\r
-    private final static QName _CTHslColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");\r
-    private final static QName _CTHslColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");\r
-    private final static QName _CTHslColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");\r
-    private final static QName _CTHslColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");\r
-    private final static QName _CTHslColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");\r
-    private final static QName _CTHslColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");\r
-    private final static QName _CTHslColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");\r
-    private final static QName _CTHslColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");\r
-    private final static QName _CTHslColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");\r
-    private final static QName _CTHslColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");\r
-    private final static QName _CTHslColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");\r
-    private final static QName _CTHslColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");\r
-    private final static QName _CTHslColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");\r
-    private final static QName _CTHslColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");\r
-    private final static QName _CTHslColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");\r
-    private final static QName _CTHslColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");\r
-    private final static QName _CTHslColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");\r
-    private final static QName _CTHslColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");\r
-    private final static QName _CTHslColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");\r
-    private final static QName _CTHslColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");\r
+    private final static QName _CTScRgbColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");\r
+    private final static QName _CTScRgbColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");\r
+    private final static QName _CTScRgbColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");\r
+    private final static QName _CTScRgbColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");\r
+    private final static QName _CTScRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");\r
+    private final static QName _CTScRgbColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");\r
+    private final static QName _CTScRgbColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");\r
+    private final static QName _CTScRgbColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");\r
+    private final static QName _CTScRgbColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");\r
+    private final static QName _CTScRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");\r
+    private final static QName _CTScRgbColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");\r
+    private final static QName _CTScRgbColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");\r
+    private final static QName _CTScRgbColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");\r
+    private final static QName _CTScRgbColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");\r
+    private final static QName _CTScRgbColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");\r
+    private final static QName _CTScRgbColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");\r
+    private final static QName _CTScRgbColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");\r
+    private final static QName _CTScRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");\r
+    private final static QName _CTScRgbColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");\r
+    private final static QName _CTScRgbColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");\r
+    private final static QName _CTScRgbColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");\r
+    private final static QName _CTScRgbColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");\r
+    private final static QName _CTScRgbColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");\r
+    private final static QName _CTScRgbColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");\r
+    private final static QName _CTScRgbColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");\r
+    private final static QName _CTScRgbColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");\r
+    private final static QName _CTScRgbColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");\r
+    private final static QName _CTScRgbColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");\r
 \r
     /**\r
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.poi.sl.draw.binding\r
@@ -77,957 +77,957 @@ public class ObjectFactory {
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DQuadBezierTo }\r
+     * Create an instance of {@link CTOfficeArtExtensionList }\r
      * \r
      */\r
-    public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {\r
-        return new CTPath2DQuadBezierTo();\r
+    public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {\r
+        return new CTOfficeArtExtensionList();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTCustomGeometry2D }\r
+     * Create an instance of {@link CTPresetGeometry2D }\r
      * \r
      */\r
-    public CTCustomGeometry2D createCTCustomGeometry2D() {\r
-        return new CTCustomGeometry2D();\r
+    public CTPresetGeometry2D createCTPresetGeometry2D() {\r
+        return new CTPresetGeometry2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPolarAdjustHandle }\r
+     * Create an instance of {@link CTPath2D }\r
      * \r
      */\r
-    public CTPolarAdjustHandle createCTPolarAdjustHandle() {\r
-        return new CTPolarAdjustHandle();\r
+    public CTPath2D createCTPath2D() {\r
+        return new CTPath2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DClose }\r
+     * Create an instance of {@link CTVector3D }\r
      * \r
      */\r
-    public CTPath2DClose createCTPath2DClose() {\r
-        return new CTPath2DClose();\r
+    public CTVector3D createCTVector3D() {\r
+        return new CTVector3D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPoint2D }\r
+     * Create an instance of {@link CTGammaTransform }\r
      * \r
      */\r
-    public CTPoint2D createCTPoint2D() {\r
-        return new CTPoint2D();\r
+    public CTGammaTransform createCTGammaTransform() {\r
+        return new CTGammaTransform();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTInverseTransform }\r
+     * Create an instance of {@link CTColorMRU }\r
      * \r
      */\r
-    public CTInverseTransform createCTInverseTransform() {\r
-        return new CTInverseTransform();\r
+    public CTColorMRU createCTColorMRU() {\r
+        return new CTColorMRU();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPercentage }\r
+     * Create an instance of {@link CTEmbeddedWAVAudioFile }\r
      * \r
      */\r
-    public CTPercentage createCTPercentage() {\r
-        return new CTPercentage();\r
+    public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {\r
+        return new CTEmbeddedWAVAudioFile();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTSystemColor }\r
+     * Create an instance of {@link CTPath2DQuadBezierTo }\r
      * \r
      */\r
-    public CTSystemColor createCTSystemColor() {\r
-        return new CTSystemColor();\r
+    public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {\r
+        return new CTPath2DQuadBezierTo();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTConnectionSite }\r
+     * Create an instance of {@link CTScRgbColor }\r
      * \r
      */\r
-    public CTConnectionSite createCTConnectionSite() {\r
-        return new CTConnectionSite();\r
+    public CTScRgbColor createCTScRgbColor() {\r
+        return new CTScRgbColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTColor }\r
+     * Create an instance of {@link CTPositiveFixedAngle }\r
      * \r
      */\r
-    public CTColor createCTColor() {\r
-        return new CTColor();\r
+    public CTPositiveFixedAngle createCTPositiveFixedAngle() {\r
+        return new CTPositiveFixedAngle();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPositiveFixedAngle }\r
+     * Create an instance of {@link CTGeomGuide }\r
      * \r
      */\r
-    public CTPositiveFixedAngle createCTPositiveFixedAngle() {\r
-        return new CTPositiveFixedAngle();\r
+    public CTGeomGuide createCTGeomGuide() {\r
+        return new CTGeomGuide();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTFixedPercentage }\r
+     * Create an instance of {@link CTConnectionSiteList }\r
      * \r
      */\r
-    public CTFixedPercentage createCTFixedPercentage() {\r
-        return new CTFixedPercentage();\r
+    public CTConnectionSiteList createCTConnectionSiteList() {\r
+        return new CTConnectionSiteList();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTHslColor }\r
+     * Create an instance of {@link CTPercentage }\r
      * \r
      */\r
-    public CTHslColor createCTHslColor() {\r
-        return new CTHslColor();\r
+    public CTPercentage createCTPercentage() {\r
+        return new CTPercentage();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTConnection }\r
+     * Create an instance of {@link CTPositiveFixedPercentage }\r
      * \r
      */\r
-    public CTConnection createCTConnection() {\r
-        return new CTConnection();\r
+    public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {\r
+        return new CTPositiveFixedPercentage();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DLineTo }\r
+     * Create an instance of {@link CTPath2DMoveTo }\r
      * \r
      */\r
-    public CTPath2DLineTo createCTPath2DLineTo() {\r
-        return new CTPath2DLineTo();\r
+    public CTPath2DMoveTo createCTPath2DMoveTo() {\r
+        return new CTPath2DMoveTo();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTTransform2D }\r
+     * Create an instance of {@link CTPath2DList }\r
      * \r
      */\r
-    public CTTransform2D createCTTransform2D() {\r
-        return new CTTransform2D();\r
+    public CTPath2DList createCTPath2DList() {\r
+        return new CTPath2DList();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPositivePercentage }\r
+     * Create an instance of {@link CTCustomGeometry2D }\r
      * \r
      */\r
-    public CTPositivePercentage createCTPositivePercentage() {\r
-        return new CTPositivePercentage();\r
+    public CTCustomGeometry2D createCTCustomGeometry2D() {\r
+        return new CTCustomGeometry2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTVector3D }\r
+     * Create an instance of {@link CTConnectionSite }\r
      * \r
      */\r
-    public CTVector3D createCTVector3D() {\r
-        return new CTVector3D();\r
+    public CTConnectionSite createCTConnectionSite() {\r
+        return new CTConnectionSite();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTSphereCoords }\r
+     * Create an instance of {@link CTGrayscaleTransform }\r
      * \r
      */\r
-    public CTSphereCoords createCTSphereCoords() {\r
-        return new CTSphereCoords();\r
+    public CTGrayscaleTransform createCTGrayscaleTransform() {\r
+        return new CTGrayscaleTransform();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2D }\r
+     * Create an instance of {@link CTInverseTransform }\r
      * \r
      */\r
-    public CTPath2D createCTPath2D() {\r
-        return new CTPath2D();\r
+    public CTInverseTransform createCTInverseTransform() {\r
+        return new CTInverseTransform();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGroupTransform2D }\r
+     * Create an instance of {@link CTPositiveSize2D }\r
      * \r
      */\r
-    public CTGroupTransform2D createCTGroupTransform2D() {\r
-        return new CTGroupTransform2D();\r
+    public CTPositiveSize2D createCTPositiveSize2D() {\r
+        return new CTPositiveSize2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGrayscaleTransform }\r
+     * Create an instance of {@link CTRelativeRect }\r
      * \r
      */\r
-    public CTGrayscaleTransform createCTGrayscaleTransform() {\r
-        return new CTGrayscaleTransform();\r
+    public CTRelativeRect createCTRelativeRect() {\r
+        return new CTRelativeRect();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTRatio }\r
+     * Create an instance of {@link CTPolarAdjustHandle }\r
      * \r
      */\r
-    public CTRatio createCTRatio() {\r
-        return new CTRatio();\r
+    public CTPolarAdjustHandle createCTPolarAdjustHandle() {\r
+        return new CTPolarAdjustHandle();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTSRgbColor }\r
+     * Create an instance of {@link CTRatio }\r
      * \r
      */\r
-    public CTSRgbColor createCTSRgbColor() {\r
-        return new CTSRgbColor();\r
+    public CTRatio createCTRatio() {\r
+        return new CTRatio();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGeomGuideList }\r
+     * Create an instance of {@link CTInverseGammaTransform }\r
      * \r
      */\r
-    public CTGeomGuideList createCTGeomGuideList() {\r
-        return new CTGeomGuideList();\r
+    public CTInverseGammaTransform createCTInverseGammaTransform() {\r
+        return new CTInverseGammaTransform();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTComplementTransform }\r
+     * Create an instance of {@link CTGroupTransform2D }\r
      * \r
      */\r
-    public CTComplementTransform createCTComplementTransform() {\r
-        return new CTComplementTransform();\r
+    public CTGroupTransform2D createCTGroupTransform2D() {\r
+        return new CTGroupTransform2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DCubicBezierTo }\r
+     * Create an instance of {@link CTGeomRect }\r
      * \r
      */\r
-    public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {\r
-        return new CTPath2DCubicBezierTo();\r
+    public CTGeomRect createCTGeomRect() {\r
+        return new CTGeomRect();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTXYAdjustHandle }\r
+     * Create an instance of {@link CTSystemColor }\r
      * \r
      */\r
-    public CTXYAdjustHandle createCTXYAdjustHandle() {\r
-        return new CTXYAdjustHandle();\r
+    public CTSystemColor createCTSystemColor() {\r
+        return new CTSystemColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPresetColor }\r
+     * Create an instance of {@link CTAdjPoint2D }\r
      * \r
      */\r
-    public CTPresetColor createCTPresetColor() {\r
-        return new CTPresetColor();\r
+    public CTAdjPoint2D createCTAdjPoint2D() {\r
+        return new CTAdjPoint2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTOfficeArtExtension }\r
+     * Create an instance of {@link CTPath2DCubicBezierTo }\r
      * \r
      */\r
-    public CTOfficeArtExtension createCTOfficeArtExtension() {\r
-        return new CTOfficeArtExtension();\r
+    public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {\r
+        return new CTPath2DCubicBezierTo();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTSchemeColor }\r
+     * Create an instance of {@link CTPath2DArcTo }\r
      * \r
      */\r
-    public CTSchemeColor createCTSchemeColor() {\r
-        return new CTSchemeColor();\r
+    public CTPath2DArcTo createCTPath2DArcTo() {\r
+        return new CTPath2DArcTo();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTConnectionSiteList }\r
+     * Create an instance of {@link CTGeomGuideList }\r
      * \r
      */\r
-    public CTConnectionSiteList createCTConnectionSiteList() {\r
-        return new CTConnectionSiteList();\r
+    public CTGeomGuideList createCTGeomGuideList() {\r
+        return new CTGeomGuideList();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DArcTo }\r
+     * Create an instance of {@link CTAdjustHandleList }\r
      * \r
      */\r
-    public CTPath2DArcTo createCTPath2DArcTo() {\r
-        return new CTPath2DArcTo();\r
+    public CTAdjustHandleList createCTAdjustHandleList() {\r
+        return new CTAdjustHandleList();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DList }\r
+     * Create an instance of {@link CTPath2DClose }\r
      * \r
      */\r
-    public CTPath2DList createCTPath2DList() {\r
-        return new CTPath2DList();\r
+    public CTPath2DClose createCTPath2DClose() {\r
+        return new CTPath2DClose();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTAngle }\r
+     * Create an instance of {@link CTPresetTextShape }\r
      * \r
      */\r
-    public CTAngle createCTAngle() {\r
-        return new CTAngle();\r
+    public CTPresetTextShape createCTPresetTextShape() {\r
+        return new CTPresetTextShape();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTScale2D }\r
+     * Create an instance of {@link CTConnection }\r
      * \r
      */\r
-    public CTScale2D createCTScale2D() {\r
-        return new CTScale2D();\r
+    public CTConnection createCTConnection() {\r
+        return new CTConnection();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPositiveSize2D }\r
+     * Create an instance of {@link CTSRgbColor }\r
      * \r
      */\r
-    public CTPositiveSize2D createCTPositiveSize2D() {\r
-        return new CTPositiveSize2D();\r
+    public CTSRgbColor createCTSRgbColor() {\r
+        return new CTSRgbColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTOfficeArtExtensionList }\r
+     * Create an instance of {@link CTPositivePercentage }\r
      * \r
      */\r
-    public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {\r
-        return new CTOfficeArtExtensionList();\r
+    public CTPositivePercentage createCTPositivePercentage() {\r
+        return new CTPositivePercentage();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTHyperlink }\r
+     * Create an instance of {@link CTComplementTransform }\r
      * \r
      */\r
-    public CTHyperlink createCTHyperlink() {\r
-        return new CTHyperlink();\r
+    public CTComplementTransform createCTComplementTransform() {\r
+        return new CTComplementTransform();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPoint3D }\r
+     * Create an instance of {@link CTScale2D }\r
      * \r
      */\r
-    public CTPoint3D createCTPoint3D() {\r
-        return new CTPoint3D();\r
+    public CTScale2D createCTScale2D() {\r
+        return new CTScale2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTInverseGammaTransform }\r
+     * Create an instance of {@link CTFixedPercentage }\r
      * \r
      */\r
-    public CTInverseGammaTransform createCTInverseGammaTransform() {\r
-        return new CTInverseGammaTransform();\r
+    public CTFixedPercentage createCTFixedPercentage() {\r
+        return new CTFixedPercentage();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPositiveFixedPercentage }\r
+     * Create an instance of {@link CTPoint2D }\r
      * \r
      */\r
-    public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {\r
-        return new CTPositiveFixedPercentage();\r
+    public CTPoint2D createCTPoint2D() {\r
+        return new CTPoint2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGeomRect }\r
+     * Create an instance of {@link CTColor }\r
      * \r
      */\r
-    public CTGeomRect createCTGeomRect() {\r
-        return new CTGeomRect();\r
+    public CTColor createCTColor() {\r
+        return new CTColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPresetTextShape }\r
+     * Create an instance of {@link CTPoint3D }\r
      * \r
      */\r
-    public CTPresetTextShape createCTPresetTextShape() {\r
-        return new CTPresetTextShape();\r
+    public CTPoint3D createCTPoint3D() {\r
+        return new CTPoint3D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTColorMRU }\r
+     * Create an instance of {@link CTHslColor }\r
      * \r
      */\r
-    public CTColorMRU createCTColorMRU() {\r
-        return new CTColorMRU();\r
+    public CTHslColor createCTHslColor() {\r
+        return new CTHslColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPath2DMoveTo }\r
+     * Create an instance of {@link CTTransform2D }\r
      * \r
      */\r
-    public CTPath2DMoveTo createCTPath2DMoveTo() {\r
-        return new CTPath2DMoveTo();\r
+    public CTTransform2D createCTTransform2D() {\r
+        return new CTTransform2D();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTEmbeddedWAVAudioFile }\r
+     * Create an instance of {@link CTOfficeArtExtension }\r
      * \r
      */\r
-    public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {\r
-        return new CTEmbeddedWAVAudioFile();\r
+    public CTOfficeArtExtension createCTOfficeArtExtension() {\r
+        return new CTOfficeArtExtension();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTScRgbColor }\r
+     * Create an instance of {@link CTSchemeColor }\r
      * \r
      */\r
-    public CTScRgbColor createCTScRgbColor() {\r
-        return new CTScRgbColor();\r
+    public CTSchemeColor createCTSchemeColor() {\r
+        return new CTSchemeColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTPresetGeometry2D }\r
+     * Create an instance of {@link CTSphereCoords }\r
      * \r
      */\r
-    public CTPresetGeometry2D createCTPresetGeometry2D() {\r
-        return new CTPresetGeometry2D();\r
+    public CTSphereCoords createCTSphereCoords() {\r
+        return new CTSphereCoords();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGeomGuide }\r
+     * Create an instance of {@link CTXYAdjustHandle }\r
      * \r
      */\r
-    public CTGeomGuide createCTGeomGuide() {\r
-        return new CTGeomGuide();\r
+    public CTXYAdjustHandle createCTXYAdjustHandle() {\r
+        return new CTXYAdjustHandle();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTRelativeRect }\r
+     * Create an instance of {@link CTHyperlink }\r
      * \r
      */\r
-    public CTRelativeRect createCTRelativeRect() {\r
-        return new CTRelativeRect();\r
+    public CTHyperlink createCTHyperlink() {\r
+        return new CTHyperlink();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTAdjustHandleList }\r
+     * Create an instance of {@link CTPath2DLineTo }\r
      * \r
      */\r
-    public CTAdjustHandleList createCTAdjustHandleList() {\r
-        return new CTAdjustHandleList();\r
+    public CTPath2DLineTo createCTPath2DLineTo() {\r
+        return new CTPath2DLineTo();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTAdjPoint2D }\r
+     * Create an instance of {@link CTPresetColor }\r
      * \r
      */\r
-    public CTAdjPoint2D createCTAdjPoint2D() {\r
-        return new CTAdjPoint2D();\r
+    public CTPresetColor createCTPresetColor() {\r
+        return new CTPresetColor();\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link CTGammaTransform }\r
+     * Create an instance of {@link CTAngle }\r
      * \r
      */\r
-    public CTGammaTransform createCTGammaTransform() {\r
-        return new CTGammaTransform();\r
+    public CTAngle createCTAngle() {\r
+        return new CTAngle();\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)\r
-    public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)\r
-    public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)\r
-    public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)\r
-    public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)\r
-    public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)\r
-    public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)\r
+    public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)\r
+    public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)\r
+    public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)\r
+    public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)\r
+    public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)\r
+    public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)\r
-    public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)\r
+    public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1036,7 +1036,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)\r
     public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1045,25 +1045,25 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)\r
     public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1072,7 +1072,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1081,25 +1081,25 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1108,7 +1108,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1117,25 +1117,25 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)\r
-    public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)\r
+    public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1144,7 +1144,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1153,7 +1153,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1162,7 +1162,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1171,7 +1171,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1180,7 +1180,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)\r
     public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1189,7 +1189,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1198,7 +1198,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)\r
     public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1207,7 +1207,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1216,7 +1216,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)\r
     public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1225,7 +1225,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1234,7 +1234,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)\r
     public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1243,7 +1243,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)\r
     public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1252,7 +1252,7 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)\r
     public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
@@ -1261,763 +1261,763 @@ public class ObjectFactory {
      */\r
     @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)\r
     public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)\r
+    public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)\r
+    public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)\r
+    public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)\r
+    public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)\r
-    public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)\r
+    public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)\r
-    public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)\r
+    public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)\r
-    public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {\r
-        return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {\r
+        return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)\r
-    public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {\r
-        return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {\r
+        return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {\r
-        return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {\r
+        return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {\r
-        return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
-     * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
+     * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {\r
+        return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {\r
-        return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {\r
+        return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)\r
-    public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {\r
-        return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {\r
+        return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {\r
-        return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {\r
+        return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)\r
-    public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {\r
-        return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {\r
+        return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {\r
-        return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {\r
+        return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)\r
-    public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {\r
-        return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {\r
+        return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);\r
     }\r
 \r
     /**\r
      * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}\r
      * \r
      */\r
-    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)\r
-    public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {\r
-        return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);\r
+    @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)\r
+    public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {\r
+        return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);\r
     }\r
 \r
 }\r
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
new file mode 100644 (file)
index 0000000..3a68313
--- /dev/null
@@ -0,0 +1,287 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+package org.apache.poi.sl.usermodel;\r
+\r
+public enum AutoNumberingScheme {\r
+    /** Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ... */\r
+    alphaLcParenBoth(0x0008, 1),\r
+    /** Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ... */\r
+    alphaUcParenBoth(0x000A, 2),\r
+    /** Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ... */\r
+    alphaLcParenRight(0x0009, 3),\r
+    /** Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ... */\r
+    alphaUcParenRight(0x000B, 4),\r
+    /** Lowercase Latin character followed by a period. Example: a., b., c., ... */\r
+    alphaLcPeriod(0x0000, 5),\r
+    /** Uppercase Latin character followed by a period. Example: A., B., C., ... */\r
+    alphaUcPeriod(0x0001, 6),\r
+    /** Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ... */\r
+    arabicParenBoth(0x000C, 7),\r
+    /** Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ... */\r
+    arabicParenRight(0x0002, 8),\r
+    /** Arabic numeral followed by a period. Example: 1., 2., 3., ... */\r
+    arabicPeriod(0x0003, 9),\r
+    /** Arabic numeral. Example: 1, 2, 3, ... */\r
+    arabicPlain(0x000D, 10),\r
+    /** Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ... */\r
+    romanLcParenBoth(0x0004, 11),\r
+    /** Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ... */\r
+    romanUcParenBoth(0x000E, 12),\r
+    /** Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ... */\r
+    romanLcParenRight(0x0005, 13),\r
+    /** Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), .... */\r
+    romanUcParenRight(0x000F, 14),\r
+    /** Lowercase Roman numeral followed by a period. Example: i., ii., iii., ... */\r
+    romanLcPeriod(0x0006, 15),\r
+    /** Uppercase Roman numeral followed by a period. Example: I., II., III., ... */\r
+    romanUcPeriod(0x0007, 16),\r
+    /** Double byte circle numbers. */\r
+    circleNumDbPlain(0x0012, 17),\r
+    /** Wingdings black circle numbers. */\r
+    circleNumWdBlackPlain(0x0014, 18),\r
+    /** Wingdings white circle numbers. */\r
+    circleNumWdWhitePlain(0x0013, 19),\r
+    /** Double-byte Arabic numbers with double-byte period. */\r
+    arabicDbPeriod(0x001D, 20),\r
+    /** Double-byte Arabic numbers. */\r
+    arabicDbPlain(0x001C, 21),\r
+    /** Simplified Chinese with single-byte period. */\r
+    ea1ChsPeriod(0x0011, 22),\r
+    /** Simplified Chinese. */\r
+    ea1ChsPlain(0x0010, 23),\r
+    /** Traditional Chinese with single-byte period. */\r
+    ea1ChtPeriod(0x0015, 24),\r
+    /** Traditional Chinese. */\r
+    ea1ChtPlain(0x0014, 25),\r
+    /** Japanese with double-byte period. */\r
+    ea1JpnChsDbPeriod(0x0026, 26),\r
+    /** Japanese/Korean. */\r
+    ea1JpnKorPlain(0x001A, 27),\r
+    /** Japanese/Korean with single-byte period. */\r
+    ea1JpnKorPeriod(0x001B, 28),\r
+    /** Bidi Arabic 1 (AraAlpha) with ANSI minus symbol. */\r
+    arabic1Minus(0x0017, 29),\r
+    /** Bidi Arabic 2 (AraAbjad) with ANSI minus symbol. */\r
+    arabic2Minus(0x0018, 30),\r
+    /** Bidi Hebrew 2 with ANSI minus symbol. */\r
+    hebrew2Minus(0x0019, 31),\r
+    /** Thai alphabetic character followed by a period. */\r
+    thaiAlphaPeriod(0x001E, 32),\r
+    /** Thai alphabetic character followed by a closing parenthesis. */\r
+    thaiAlphaParenRight(0x001F, 33),\r
+    /** Thai alphabetic character enclosed by parentheses. */\r
+    thaiAlphaParenBoth(0x0020, 34),\r
+    /** Thai numeral followed by a period. */\r
+    thaiNumPeriod(0x0021, 35),\r
+    /** Thai numeral followed by a closing parenthesis. */\r
+    thaiNumParenRight(0x0022, 36),\r
+    /** Thai numeral enclosed in parentheses. */\r
+    thaiNumParenBoth(0x0023, 37),\r
+    /** Hindi alphabetic character followed by a period. */\r
+    hindiAlphaPeriod(0x0024, 38),\r
+    /** Hindi numeric character followed by a period. */\r
+    hindiNumPeriod(0x0025, 39),\r
+    /** Hindi numeric character followed by a closing parenthesis. */\r
+    hindiNumParenRight(0x0027, 40),\r
+    /** Hindi alphabetic character followed by a period. */\r
+    hindiAlpha1Period(0x0027, 41);\r
+\r
+    public final int nativeId, ooxmlId;\r
+\r
+    AutoNumberingScheme(int nativeId, int ooxmlId) {\r
+        this.nativeId = nativeId;\r
+        this.ooxmlId = ooxmlId;\r
+    }\r
+\r
+    public static AutoNumberingScheme forNativeID(int nativeId) {\r
+        for (AutoNumberingScheme ans : values()) {\r
+            if (ans.nativeId == nativeId) return ans;\r
+        }\r
+        return null;\r
+    }\r
+\r
+    public static AutoNumberingScheme forOoxmlID(int ooxmlId) {\r
+        for (AutoNumberingScheme ans : values()) {\r
+            if (ans.ooxmlId == ooxmlId) return ans;\r
+        }\r
+        return null;\r
+    }\r
+\r
+    public String getDescription() {\r
+        switch (this) {\r
+        case alphaLcPeriod          : return "Lowercase Latin character followed by a period. Example: a., b., c., ...";\r
+        case alphaUcPeriod          : return "Uppercase Latin character followed by a period. Example: A., B., C., ...";\r
+        case arabicParenRight       : return "Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ...";\r
+        case arabicPeriod           : return "Arabic numeral followed by a period. Example: 1., 2., 3., ...";\r
+        case romanLcParenBoth       : return "Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ...";\r
+        case romanLcParenRight      : return "Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ...";\r
+        case romanLcPeriod          : return "Lowercase Roman numeral followed by a period. Example: i., ii., iii., ...";\r
+        case romanUcPeriod          : return "Uppercase Roman numeral followed by a period. Example: I., II., III., ...";\r
+        case alphaLcParenBoth       : return "Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ...";\r
+        case alphaLcParenRight      : return "Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ...";\r
+        case alphaUcParenBoth       : return "Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ...";\r
+        case alphaUcParenRight      : return "Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ...";\r
+        case arabicParenBoth        : return "Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ...";\r
+        case arabicPlain            : return "Arabic numeral. Example: 1, 2, 3, ...";\r
+        case romanUcParenBoth       : return "Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ...";\r
+        case romanUcParenRight      : return "Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), ...";\r
+        case ea1ChsPlain            : return "Simplified Chinese.";\r
+        case ea1ChsPeriod           : return "Simplified Chinese with single-byte period.";\r
+        case circleNumDbPlain       : return "Double byte circle numbers.";\r
+        case circleNumWdWhitePlain  : return "Wingdings white circle numbers.";\r
+        case circleNumWdBlackPlain  : return "Wingdings black circle numbers.";\r
+        case ea1ChtPlain            : return "Traditional Chinese.";\r
+        case ea1ChtPeriod           : return "Traditional Chinese with single-byte period.";\r
+        case arabic1Minus           : return "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol.";\r
+        case arabic2Minus           : return "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol.";\r
+        case hebrew2Minus           : return "Bidi Hebrew 2 with ANSI minus symbol.";\r
+        case ea1JpnKorPlain         : return "Japanese/Korean.";\r
+        case ea1JpnKorPeriod        : return "Japanese/Korean with single-byte period.";\r
+        case arabicDbPlain          : return "Double-byte Arabic numbers.";\r
+        case arabicDbPeriod         : return "Double-byte Arabic numbers with double-byte period.";\r
+        case thaiAlphaPeriod        : return "Thai alphabetic character followed by a period.";\r
+        case thaiAlphaParenRight    : return "Thai alphabetic character followed by a closing parenthesis.";\r
+        case thaiAlphaParenBoth     : return "Thai alphabetic character enclosed by parentheses.";\r
+        case thaiNumPeriod          : return "Thai numeral followed by a period.";\r
+        case thaiNumParenRight      : return "Thai numeral followed by a closing parenthesis.";\r
+        case thaiNumParenBoth       : return "Thai numeral enclosed in parentheses.";\r
+        case hindiAlphaPeriod       : return "Hindi alphabetic character followed by a period.";\r
+        case hindiNumPeriod         : return "Hindi numeric character followed by a period.";\r
+        case ea1JpnChsDbPeriod      : return "Japanese with double-byte period.";\r
+        case hindiNumParenRight     : return "Hindi numeric character followed by a closing parenthesis.";\r
+        case hindiAlpha1Period      : return "Hindi alphabetic character followed by a period.";\r
+        default                     : return "Unknown Numbered Scheme";\r
+        }\r
+    }\r
+\r
+    public String format(int value) {\r
+        String index = formatIndex(value);\r
+        String cased = formatCase(index);\r
+        String seperated = formatSeperator(cased);\r
+        return seperated;\r
+    }\r
+\r
+    private String formatSeperator(String cased) {\r
+        String name = name().toLowerCase();\r
+        if (name.contains("plain")) return cased;\r
+        if (name.contains("parenright")) return cased+")";\r
+        if (name.contains("parenboth")) return "("+cased+")";\r
+        if (name.contains("period")) return cased+".";\r
+        if (name.contains("minus")) return cased+"-"; // ???\r
+        return cased;\r
+    }\r
+\r
+    private String formatCase(String index) {\r
+        String name = name().toLowerCase();\r
+        if (name.contains("lc")) return index.toLowerCase();\r
+        if (name.contains("uc")) return index.toUpperCase();\r
+        return index;\r
+    }\r
+\r
+    private static final String ARABIC_LIST = "0123456789";\r
+    private static final String ALPHA_LIST = "abcdefghijklmnopqrstuvwxyz";\r
+    private static final String WINGDINGS_WHITE_LIST =\r
+            "\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089";\r
+    private static final String WINGDINGS_BLACK_LIST =\r
+            "\u008B\u008C\u008D\u008E\u008F\u0090\u0091\u0092\u0093\u0094";\r
+    private static final String CIRCLE_DB_LIST =\r
+            "\u2776\u2777\u2778\u2779\u277A\u277B\u277C\u277D\u277E";\r
+\r
+    private String formatIndex(int value) {\r
+        String name = name().toLowerCase();\r
+        if (name.startsWith("roman")) {\r
+            return formatRomanIndex(value);\r
+        } else if (name.startsWith("arabic") && !name.contains("db")) {\r
+            return getIndexedList(value, ARABIC_LIST, false);\r
+        } else if (name.startsWith("alpha")) {\r
+            return getIndexedList(value, ALPHA_LIST, true);\r
+        } else if (name.contains("WdWhite")) {\r
+            return (value == 10) ? "\u008A"\r
+                : getIndexedList(value, WINGDINGS_WHITE_LIST, false);\r
+        } else if (name.contains("WdBlack")) {\r
+            return (value == 10) ? "\u0095"\r
+                : getIndexedList(value, WINGDINGS_BLACK_LIST, false);\r
+        } else if (name.contains("NumDb")) {\r
+            return (value == 10) ? "\u277F"\r
+                : getIndexedList(value, CIRCLE_DB_LIST, true);\r
+        } else {\r
+            return "?";\r
+        }\r
+    }\r
+\r
+    private static String getIndexedList(int val, String list, boolean oneBased) {\r
+        StringBuilder sb = new StringBuilder();\r
+        addIndexedChar(val, list, oneBased, sb);\r
+        return sb.toString();\r
+    }\r
+\r
+    private static void addIndexedChar(int val, String list, boolean oneBased, StringBuilder sb) {\r
+        if (oneBased) val -= 1;\r
+        final int len = list.length();\r
+        if (val >= len) {\r
+            addIndexedChar(val/len, list, oneBased, sb);\r
+        }\r
+        sb.append(list.charAt(val%len));\r
+    }\r
+\r
+\r
+    private String formatRomanIndex(int value) {\r
+        //M (1000), CM (900), D (500), CD (400), C (100), XC (90), L (50), XL (40), X (10), IX (9), V (5), IV (4) and I (1).\r
+        final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};\r
+        final String[] ROMAN = new String[]{"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};\r
+        final String conciseList[][] = {\r
+            {"XLV", "VL"}, //45\r
+            {"XCV", "VC"}, //95\r
+            {"CDL", "LD"}, //450\r
+            {"CML", "LM"}, //950\r
+            {"CMVC", "LMVL"}, //995\r
+            {"CDXC", "LDXL"}, //490\r
+            {"CDVC", "LDVL"}, //495\r
+            {"CMXC", "LMXL"}, //990\r
+            {"XCIX", "VCIV"}, //99\r
+            {"XLIX", "VLIV"}, //49\r
+            {"XLIX", "IL"}, //49\r
+            {"XCIX", "IC"}, //99\r
+            {"CDXC", "XD"}, //490\r
+            {"CDVC", "XDV"}, //495\r
+            {"CDIC", "XDIX"}, //499\r
+            {"LMVL", "XMV"}, //995\r
+            {"CMIC", "XMIX"}, //999\r
+            {"CMXC", "XM"}, // 990\r
+            {"XDV", "VD"},  //495\r
+            {"XDIX", "VDIV"}, //499\r
+            {"XMV", "VM"}, // 995\r
+            {"XMIX", "VMIV"}, //999\r
+            {"VDIV", "ID"}, //499\r
+            {"VMIV", "IM"} //999\r
+        };\r
+\r
+        StringBuilder sb = new StringBuilder();\r
+        for (int i = 0; i < 13; i++) {\r
+            while (value >= VALUES[i]) {\r
+                value -= VALUES[i];\r
+                sb.append(ROMAN[i]);\r
+            }\r
+        }\r
+        String result = sb.toString();\r
+        for (String cc[] : conciseList) {\r
+            result = result.replace(cc[0], cc[1]);\r
+        }\r
+        return result;\r
+    }\r
+}
\ No newline at end of file
index e85eee140b0323cc3ca31fc3895163df3b47e73e..a914dd7cb3fed1be858ff0bc43d0e164275df932 100644 (file)
@@ -114,6 +114,13 @@ public interface TextParagraph<T extends TextRun> extends Iterable<T> {
          */\r
         Double getBulletFontSize();\r
         Color getBulletFontColor();\r
+        \r
+        AutoNumberingScheme getAutoNumberingScheme();\r
+        /**\r
+         * Index (1-based) of the first auto number value, or null if auto numbering scheme\r
+         * wasn't assigned.\r
+         */\r
+        Integer getAutoNumberingStartAt();\r
     }\r
 \r
     /**\r
@@ -218,13 +225,28 @@ public interface TextParagraph<T extends TextRun> extends Iterable<T> {
      *  or null, if unset\r
      */\r
     Double getIndent();\r
-\r
+    \r
     /**\r
      * Specifies the indent size that will be applied to the first line of text in the paragraph.   \r
      * \r
      * @param indent the indent (in points) applied to the first line of text in the paragraph\r
      */\r
     void setIndent(Double indent);\r
+\r
+\r
+    /**\r
+     * @return the text level of this paragraph (0-based). Default is 0.\r
+     */    \r
+    int getIndentLevel();\r
+\r
+    /**\r
+     * Specifies the particular level text properties that this paragraph will follow.\r
+     * The value for this attribute formats the text according to the corresponding level\r
+     * paragraph properties defined in the SlideMaster.\r
+     *\r
+     * @param level the level (0 ... 4)\r
+     */\r
+    void setIndentLevel(int level);\r
     \r
     /**\r
      * Returns the vertical line spacing that is to be used within a paragraph.\r
index 55a4ca8bbd025c39dfc765508af4a9c2591100fe..e17e2bea9a1883c004a1ce44f8f0a8febcd13598 100644 (file)
@@ -369,20 +369,20 @@ public final class TestExtractor extends POITestCase {
     }
 
     public void testTable() throws Exception{
-        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54111.ppt"));
-        String text = ppe.getText();
-        String target = "TH Cell 1\tTH Cell 2\tTH Cell 3\tTH Cell 4\n"+
-                         "Row 1, Cell 1\tRow 1, Cell 2\tRow 1, Cell 3\tRow 1, Cell 4\n"+   
-                         "Row 2, Cell 1\tRow 2, Cell 2\tRow 2, Cell 3\tRow 2, Cell 4\n"+
-                         "Row 3, Cell 1\tRow 3, Cell 2\tRow 3, Cell 3\tRow 3, Cell 4\n"+
-                         "Row 4, Cell 1\tRow 4, Cell 2\tRow 4, Cell 3\tRow 4, Cell 4\n"+ 
-                         "Row 5, Cell 1\tRow 5, Cell 2\tRow 5, Cell 3\tRow 5, Cell 4\n";
-        assertTrue(text.contains(target));
+//        ppe = new PowerPointExtractor(slTests.openResourceAsStream("54111.ppt"));
+//        String text = ppe.getText();
+//        String target = "TH Cell 1\tTH Cell 2\tTH Cell 3\tTH Cell 4\n"+
+//                         "Row 1, Cell 1\tRow 1, Cell 2\tRow 1, Cell 3\tRow 1, Cell 4\n"+   
+//                         "Row 2, Cell 1\tRow 2, Cell 2\tRow 2, Cell 3\tRow 2, Cell 4\n"+
+//                         "Row 3, Cell 1\tRow 3, Cell 2\tRow 3, Cell 3\tRow 3, Cell 4\n"+
+//                         "Row 4, Cell 1\tRow 4, Cell 2\tRow 4, Cell 3\tRow 4, Cell 4\n"+ 
+//                         "Row 5, Cell 1\tRow 5, Cell 2\tRow 5, Cell 3\tRow 5, Cell 4\n";
+//        assertTrue(text.contains(target));
 
         ppe = new PowerPointExtractor(slTests.openResourceAsStream("54722.ppt"));
-        text = ppe.getText();
+        String text = ppe.getText();
 
-        target = "this\tText\tis\twithin\ta\n"+
+        String target = "this\tText\tis\twithin\ta\n"+
                 "table\t1\t2\t3\t4";
         assertTrue(text.contains(target));
     }    
index 9695a9d053912ede94602ba1176b94fff76e1877..e54da298ffc3fa9545b87d87e0c662d42651bffa 100644 (file)
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -61,9 +62,9 @@ public final class TestNumberedList {
                assertTrue(4 == autoNumbers[0].getAutoNumberStartNumber());
                assertNull(autoNumbers[1].getAutoNumberStartNumber());
                assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbers[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbers[0].getAutoNumberScheme());
                assertNull(autoNumbers[1].getAutoNumberScheme());
-               assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.alphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
                        
                List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
                assertEquals(2, textParass.size());
@@ -103,9 +104,9 @@ public final class TestNumberedList {
                assertTrue(9 == autoNumbers[0].getAutoNumberStartNumber());
                assertNull(autoNumbers[1].getAutoNumberStartNumber());
                assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicParenRight == autoNumbers[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicParenRight == autoNumbers[0].getAutoNumberScheme());
                assertNull(autoNumbers[1].getAutoNumberScheme());
-               assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.alphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
 
                final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
                assertEquals(2, textParass.size());
index 9a096c18ed52c925df67da225d364e1001ad7938..297f57c61ce0e18381c9c63538c54b269ba67778 100644 (file)
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -62,11 +63,11 @@ public final class TestNumberedList2 {
                final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox0.getAutoNumberTypes();
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
                final TextPFException9[] autoNumbersOfTextBox1 = numberedListInfoForTextBox1.getAutoNumberTypes();
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox1[0].getfBulletHasAutoNumber());
                assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
 
                
                List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
@@ -97,7 +98,7 @@ public final class TestNumberedList2 {
                final TextPFException9[] autoNumbersOfTextBox = numberedListInfoForTextBox.getAutoNumberTypes();
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getfBulletHasAutoNumber());
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
                        
                List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
                assertEquals(3, textParass.size());
index 5ad2bac1c427aa012b2510fb5c8d834a6047c0f6..70b712b7611098bf2e476ce1507c70c1fe650bc1 100644 (file)
@@ -27,6 +27,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
 import org.junit.Test;
 
 
@@ -60,7 +61,7 @@ public final class TestNumberedList3 {
                final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox.getAutoNumberTypes();
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
                assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
                
                final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
                assertEquals(3, textParass.size());
@@ -77,7 +78,7 @@ public final class TestNumberedList3 {
                assertEquals(1, autoNumbers.length);
                assertEquals(Short.valueOf((short)1), autoNumbers[0].getfBulletHasAutoNumber());
                assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used 
-               assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+               assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
                
                int chCovered = 0;
                for (HSLFTextParagraph htp : textParass.get(1)) {
index 4733999d492dc4c0db8efd1d6b8c54047a5821fe..14200d501857d94d94c6bf69602cb685302b5f82 100644 (file)
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.lang.reflect.Constructor;
 import java.util.*;
 
 import javax.imageio.ImageIO;
@@ -33,7 +34,6 @@ import org.apache.poi.sl.draw.Drawable;
 import org.apache.poi.sl.usermodel.Slide;
 import org.apache.poi.sl.usermodel.SlideShow;
 import org.apache.poi.util.JvmBugs;
-import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.junit.Test;
 
 /**
@@ -145,8 +145,8 @@ public final class TestPicture {
 //            "54542_cropped_bitmap.pptx",
 //            "54541_cropped_bitmap.ppt",
 //            "54541_cropped_bitmap2.ppt",
-//            "alterman_security.ppt",
-            "alterman_security2.pptx",
+            "alterman_security.ppt",
+//            "alterman_security3.pptx",
         };
         
         BitSet pages = new BitSet();
@@ -154,7 +154,14 @@ public final class TestPicture {
         
         for (String file : files) {
             InputStream is = _slTests.openResourceAsStream(file);
-            SlideShow ss = file.endsWith("pptx") ? new XMLSlideShow(is) : new HSLFSlideShow(is);
+            SlideShow ss;
+            if (file.endsWith("pptx")) {
+                Class<?> cls = Class.forName("org.apache.poi.xslf.usermodel.XMLSlideShow");
+                Constructor<?> ct = cls.getDeclaredConstructor(InputStream.class);
+                ss = (SlideShow)ct.newInstance(is);
+            } else {
+                ss = new HSLFSlideShow(is);
+            }
             is.close();
             
             boolean debugOut = false;