diff options
97 files changed, 1984 insertions, 2599 deletions
@@ -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}"/> diff --git a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java index 458b987320..f552ea88fc 100644 --- a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java +++ b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java @@ -56,13 +56,13 @@ public class Tutorial1 { // we are going to add text by paragraphs. Clear the default placehoder text before that
bodyPlaceholder.clearText();
XSLFTextParagraph p1 = bodyPlaceholder.addNewTextParagraph();
- p1.setLevel(0);
+ p1.setIndentLevel(0);
p1.addNewTextRun().setText("Level1 text");
XSLFTextParagraph p2 = bodyPlaceholder.addNewTextParagraph();
- p2.setLevel(1);
+ p2.setIndentLevel(1);
p2.addNewTextRun().setText("Level2 text");
XSLFTextParagraph p3 = bodyPlaceholder.addNewTextParagraph();
- p3.setLevel(3);
+ p3.setIndentLevel(3);
p3.addNewTextRun().setText("Level3 text");
FileOutputStream out = new FileOutputStream("slides.pptx");
diff --git a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java index 95252d72f5..443d5684d6 100644 --- a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java +++ b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java @@ -23,6 +23,8 @@ import java.awt.*; import java.io.FileOutputStream;
import java.io.IOException;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
+
/**
* Bullets and numbering
*
@@ -38,7 +40,7 @@ public class Tutorial7 { shape.setAnchor(new Rectangle(50, 50, 400, 200));
XSLFTextParagraph p1 = shape.addNewTextParagraph();
- p1.setLevel(0);
+ p1.setIndentLevel(0);
p1.setBullet(true);
XSLFTextRun r1 = p1.addNewTextRun();
r1.setText("Bullet1");
@@ -53,26 +55,26 @@ public class Tutorial7 { p2.setBulletFontColor(Color.red);
p2.setBulletFont("Wingdings");
p2.setBulletCharacter("\u0075");
- p2.setLevel(1);
+ p2.setIndentLevel(1);
XSLFTextRun r2 = p2.addNewTextRun();
r2.setText("Bullet2");
// the next three paragraphs form an auto-numbered list
XSLFTextParagraph p3 = shape.addNewTextParagraph();
- p3.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 1);
- p3.setLevel(2);
+ p3.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 1);
+ p3.setIndentLevel(2);
XSLFTextRun r3 = p3.addNewTextRun();
r3.setText("Numbered List Item - 1");
XSLFTextParagraph p4 = shape.addNewTextParagraph();
- p4.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 2);
- p4.setLevel(2);
+ p4.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 2);
+ p4.setIndentLevel(2);
XSLFTextRun r4 = p4.addNewTextRun();
r4.setText("Numbered List Item - 2");
XSLFTextParagraph p5 = shape.addNewTextParagraph();
- p5.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_R, 3);
- p5.setLevel(2);
+ p5.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 3);
+ p5.setIndentLevel(2);
XSLFTextRun r5 = p5.addNewTextRun();
r5.setText("Numbered List Item - 3");
diff --git a/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java b/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java index 2f0e7e7515..41c6cc2da2 100644 --- a/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java +++ b/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java @@ -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()); diff --git a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java index cf48a38d84..05a3246de0 100644 --- a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java +++ b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java @@ -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]; diff --git a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java index dbf28531fe..1a0147f3d0 100644 --- a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java +++ b/src/java/org/apache/poi/ddf/EscherTextboxRecord.java @@ -17,10 +17,7 @@ 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]; diff --git a/src/java/org/apache/poi/util/Units.java b/src/java/org/apache/poi/util/Units.java index 107a9b583e..d7f211db6c 100644 --- a/src/java/org/apache/poi/util/Units.java +++ b/src/java/org/apache/poi/util/Units.java @@ -16,8 +16,6 @@ ==================================================================== */
package org.apache.poi.util;
-import org.apache.poi.hslf.usermodel.HSLFShape;
-
/**
* @author Yegor Kozlov
*/
@@ -91,14 +89,14 @@ public class Units { public static double masterToPoints(int masterDPI) {
double points = masterDPI;
- points *= HSLFShape.POINT_DPI;
- points /= HSLFShape.MASTER_DPI;
+ points *= POINT_DPI;
+ points /= MASTER_DPI;
return points;
}
public static int pointsToMaster(double points) {
- points *= HSLFShape.MASTER_DPI;
- points /= HSLFShape.POINT_DPI;
+ points *= MASTER_DPI;
+ points /= POINT_DPI;
return (int)points;
}
}
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 index aa1e25ba9c..0000000000 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java +++ /dev/null @@ -1,105 +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.xslf.usermodel;
-
-/**
- * Specifies type of automatic numbered bullet points that should be applied to a paragraph.
- *
- * @author Yegor Kozlov
- */
-public enum ListAutoNumber {
- /**
- * (a), (b), (c), ...
- */
- ALPHA_LC_PARENT_BOTH,
- /**
- * (A), (B), (C), ...
- */
- ALPHA_UC_PARENT_BOTH,
- /**
- * a), b), c), ...
- */
- ALPHA_LC_PARENT_R,
- /**
- * A), B), C), ...
- */
- ALPHA_UC_PARENT_R,
- /**
- * a., b., c., ...
- */
- ALPHA_LC_PERIOD,
- /**
- * A., B., C., ...
- */
- ALPHA_UC_PERIOD,
- /**
- * (1), (2), (3), ...
- */
- ARABIC_PARENT_BOTH,
- /**
- * 1), 2), 3), ...
- */
- ARABIC_PARENT_R,
-
- /**
- * 1., 2., 3., ...
- */
- ARABIC_PERIOD,
- /**
- * 1, 2, 3, ...
- */
- ARABIC_PLAIN,
-
- /**
- * (i), (ii), (iii), ...
- */
- ROMAN_LC_PARENT_BOTH,
- /**
- * (I), (II), (III), ...
- */
- ROMAN_UC_PARENT_BOTH,
- /**
- * i), ii), iii), ...
- */
- ROMAN_LC_PARENT_R,
- /**
- * I), II), III), ...
- */
- ROMAN_UC_PARENT_R,
- /**
- * i., ii., iii., ...
- */
- ROMAN_LC_PERIOD ,
- /**
- * I., II., III., ...
- */
- ROMAN_UC_PERIOD,
- /**
- * Dbl-byte circle numbers
- */
- CIRCLE_NUM_DB_PLAIN,
- /**
- * Wingdings black circle numbers
- */
- CIRCLE_NUM_WD_BLACK_PLAIN,
- /**
- * Wingdings white circle numbers
- */
- CIRCLE_NUM_WD_WHITE_PLAIN
-}
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java index f0cf3a78a9..af71134ba5 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java @@ -19,6 +19,7 @@ package org.apache.poi.xslf.usermodel; import java.awt.Color;
import java.util.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
import org.apache.poi.sl.usermodel.TextParagraph;
import org.apache.poi.util.*;
import org.apache.poi.xslf.model.ParagraphPropertyFetcher;
@@ -143,7 +144,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * @return alignment that is applied to the paragraph
*/
public TextAlign getTextAlign(){
- ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getLevel()){
+ ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetAlgn()){
TextAlign val = TextAlign.values()[props.getAlgn().intValue() - 1];
@@ -175,7 +176,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { @Override
public FontAlign getFontAlign(){
- ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getLevel()){
+ ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetFontAlgn()){
FontAlign val = FontAlign.values()[props.getFontAlgn().intValue() - 1];
@@ -211,7 +212,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * @return the font to be used on bullet characters within a given paragraph
*/
public String getBulletFont(){
- ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){
+ ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuFont()){
setValue(props.getBuFont().getTypeface());
@@ -234,7 +235,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * @return the character to be used in place of the standard bullet point
*/
public String getBulletCharacter(){
- ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getLevel()){
+ ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuChar()){
setValue(props.getBuChar().getChar());
@@ -260,7 +261,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { */
public Color getBulletFontColor(){
final XSLFTheme theme = getParentShape().getSheet().getTheme();
- ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getLevel()){
+ ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuClr()){
XSLFColor c = new XSLFColor(props.getBuClr(), theme, null);
@@ -297,7 +298,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * @return the bullet size
*/
public Double getBulletFontSize(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuSzPct()){
setValue(props.getBuSzPct().getVal() * 0.001);
@@ -336,6 +337,46 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { }
}
+ /**
+ * @return the auto numbering scheme, or null if not defined
+ */
+ public AutoNumberingScheme getAutoNumberingScheme() {
+ ParagraphPropertyFetcher<AutoNumberingScheme> fetcher = new ParagraphPropertyFetcher<AutoNumberingScheme>(getIndentLevel()) {
+ public boolean fetch(CTTextParagraphProperties props) {
+ if (props.isSetBuAutoNum()) {
+ AutoNumberingScheme ans = AutoNumberingScheme.forOoxmlID(props.getBuAutoNum().getType().intValue());
+ if (ans != null) {
+ setValue(ans);
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+ fetchParagraphProperty(fetcher);
+ return fetcher.getValue();
+ }
+
+ /**
+ * @return the auto numbering starting number, or null if not defined
+ */
+ public Integer getAutoNumberingStartAt() {
+ ParagraphPropertyFetcher<Integer> fetcher = new ParagraphPropertyFetcher<Integer>(getIndentLevel()) {
+ public boolean fetch(CTTextParagraphProperties props) {
+ if (props.isSetBuAutoNum()) {
+ if (props.getBuAutoNum().isSetStartAt()) {
+ setValue(props.getBuAutoNum().getStartAt());
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+ fetchParagraphProperty(fetcher);
+ return fetcher.getValue();
+ }
+
+
@Override
public void setIndent(Double indent){
if (indent == null && !_p.isSetPPr()) return;
@@ -350,7 +391,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { @Override
public Double getIndent() {
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetIndent()){
setValue(Units.toPoints(props.getIndent()));
@@ -381,7 +422,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { */
@Override
public Double getLeftMargin(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetMarL()){
double val = Units.toPoints(props.getMarL());
@@ -413,7 +454,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { */
@Override
public Double getRightMargin(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetMarR()){
double val = Units.toPoints(props.getMarR());
@@ -424,13 +465,12 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { }
};
fetchParagraphProperty(fetcher);
- // if the marL attribute is omitted, then a value of 347663 is implied
return fetcher.getValue();
}
@Override
public Double getDefaultTabSize(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetDefTabSz()){
double val = Units.toPoints(props.getDefTabSz());
@@ -445,7 +485,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { }
public double getTabStop(final int idx){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetTabLst()){
CTTextTabStopList tabStops = props.getTabLst();
@@ -489,7 +529,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { @Override
public Double getLineSpacing(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetLnSpc()){
CTTextSpacing spc = props.getLnSpc();
@@ -528,7 +568,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { @Override
public Double getSpaceBefore(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetSpcBef()){
CTTextSpacing spc = props.getSpcBef();
@@ -556,7 +596,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { @Override
public Double getSpaceAfter(){
- ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getLevel()){
+ ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetSpcAft()){
CTTextSpacing spc = props.getSpcAft();
@@ -572,23 +612,14 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { return fetcher.getValue();
}
- /**
- * Specifies the particular level text properties that this paragraph will follow.
- * The value for this attribute formats the text according to the corresponding level
- * paragraph properties defined in the SlideMaster.
- *
- * @param level the level (0 ... 4)
- */
- public void setLevel(int level){
+ @Override
+ public void setIndentLevel(int level){
CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
pr.setLvl(level);
}
- /**
- *
- * @return the text level of this paragraph (0-based). Default is 0.
- */
- public int getLevel(){
+ @Override
+ public int getIndentLevel() {
CTTextParagraphProperties pr = _p.getPPr();
return (pr == null || !pr.isSetLvl()) ? 0 : pr.getLvl();
}
@@ -597,7 +628,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * Returns whether this paragraph has bullets
*/
public boolean isBullet() {
- ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getLevel()){
+ ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getIndentLevel()){
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuNone()) {
setValue(false);
@@ -637,11 +668,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { * @param startAt the number that will start number for a given sequence of automatically
numbered bullets (1-based).
*/
- public void setBulletAutoNumber(ListAutoNumber scheme, int startAt) {
+ public void setBulletAutoNumber(AutoNumberingScheme scheme, int startAt) {
if(startAt < 1) throw new IllegalArgumentException("Start Number must be greater or equal that 1") ;
CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
CTTextAutonumberBullet lst = pr.isSetBuAutoNum() ? pr.getBuAutoNum() : pr.addNewBuAutoNum();
- lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ordinal() + 1));
+ lst.setType(STTextAutonumberScheme.Enum.forInt(scheme.ooxmlId));
lst.setStartAt(startAt);
}
@@ -669,28 +700,29 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { defaultStyleSelector = "bodyStyle";
break;
}
- int level = getLevel();
+ int level = getIndentLevel();
// wind up and find the root master sheet which must be slide master
- XSLFSheet masterSheet = _shape.getSheet();
- for (XSLFSheet m = masterSheet; m != null; m = (XSLFSheet)m.getMasterSheet()) {
- masterSheet = m;
- }
-
- String nsDecl =
+ final String nsDecl =
"declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
"declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' ";
- String xpaths[] = {
+ final String xpaths[] = {
nsDecl+".//p:txStyles/p:" + defaultStyleSelector +"/a:lvl" +(level+1)+ "pPr",
nsDecl+".//p:notesStyle/a:lvl" +(level+1)+ "pPr"
};
- XmlObject xo = masterSheet.getXmlObject();
- for (String xpath : xpaths) {
- XmlObject[] o = xo.selectPath(xpath);
- if (o.length == 1) {
- return (CTTextParagraphProperties)o[0];
+ XSLFSheet masterSheet = _shape.getSheet();
+ for (XSLFSheet m = masterSheet; m != null; m = (XSLFSheet)m.getMasterSheet()) {
+ masterSheet = m;
+
+ XmlObject xo = masterSheet.getXmlObject();
+ for (String xpath : xpaths) {
+ XmlObject[] o = xo.selectPath(xpath);
+ if (o.length == 1) {
+ return (CTTextParagraphProperties)o[0];
+ }
}
}
+
// for (CTTextBody txBody : (CTTextBody[])xo.selectPath(nsDecl+".//p:txBody")) {
// CTTextParagraphProperties defaultPr = null, lastPr = null;
@@ -730,7 +762,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { if(ph == null){
// if it is a plain text box then take defaults from presentation.xml
XMLSlideShow ppt = getParentShape().getSheet().getSlideShow();
- CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getLevel());
+ CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getIndentLevel());
if(themeProps != null) ok = visitor.fetch(themeProps);
}
@@ -817,24 +849,40 @@ public class XSLFTextParagraph implements TextParagraph<XSLFTextRun> { return (_runs.isEmpty() ? "Arial" : _runs.get(0).getFontFamily());
}
+ @Override
public BulletStyle getBulletStyle() {
if (!isBullet()) return null;
return new BulletStyle(){
+ @Override
public String getBulletCharacter() {
return XSLFTextParagraph.this.getBulletCharacter();
}
+ @Override
public String getBulletFont() {
return XSLFTextParagraph.this.getBulletFont();
}
+ @Override
public Double getBulletFontSize() {
return XSLFTextParagraph.this.getBulletFontSize();
}
+ @Override
public Color getBulletFontColor() {
return XSLFTextParagraph.this.getBulletFontColor();
}
+
+ @Override
+ public AutoNumberingScheme getAutoNumberingScheme() {
+ return XSLFTextParagraph.this.getAutoNumberingScheme();
+ }
+
+ @Override
+ public Integer getAutoNumberingStartAt() {
+ return XSLFTextParagraph.this.getAutoNumberingStartAt();
+ }
+
};
}
}
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java index d99df7e79a..74685ec1b5 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java @@ -101,7 +101,7 @@ public class XSLFTextRun implements TextRun { CTShapeStyle style = _p.getParentShape().getSpStyle();
final CTSchemeColor phClr = style == null ? null : style.getFontRef().getSchemeClr();
- CharacterPropertyFetcher<Color> fetcher = new CharacterPropertyFetcher<Color>(_p.getLevel()){
+ CharacterPropertyFetcher<Color> fetcher = new CharacterPropertyFetcher<Color>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
CTSolidColorFillProperties solidFill = props.getSolidFill();
if(solidFill != null) {
@@ -146,7 +146,7 @@ public class XSLFTextRun implements TextRun { CTTextNormalAutofit afit = getParentParagraph().getParentShape().getTextBodyPr().getNormAutofit();
if(afit != null) scale = (double)afit.getFontScale() / 100000;
- CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getLevel()){
+ CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetSz()){
setValue(props.getSz()*0.01);
@@ -166,7 +166,7 @@ public class XSLFTextRun implements TextRun { */
public double getCharacterSpacing(){
- CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getLevel()){
+ CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetSpc()){
setValue(props.getSpc()*0.01);
@@ -233,7 +233,7 @@ public class XSLFTextRun implements TextRun { public String getFontFamily(){
final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();
- CharacterPropertyFetcher<String> visitor = new CharacterPropertyFetcher<String>(_p.getLevel()){
+ CharacterPropertyFetcher<String> visitor = new CharacterPropertyFetcher<String>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
CTTextFont font = props.getLatin();
if(font != null){
@@ -257,7 +257,7 @@ public class XSLFTextRun implements TextRun { public byte getPitchAndFamily(){
final XSLFTheme theme = _p.getParentShape().getSheet().getTheme();
- CharacterPropertyFetcher<Byte> visitor = new CharacterPropertyFetcher<Byte>(_p.getLevel()){
+ CharacterPropertyFetcher<Byte> visitor = new CharacterPropertyFetcher<Byte>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
CTTextFont font = props.getLatin();
if(font != null){
@@ -285,7 +285,7 @@ public class XSLFTextRun implements TextRun { * @return whether a run of text will be formatted as strikethrough text. Default is false.
*/
public boolean isStrikethrough() {
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetStrike()){
setValue(props.getStrike() != STTextStrikeType.NO_STRIKE);
@@ -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.
*/
public boolean isSuperscript() {
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetBaseline()){
setValue(props.getBaseline() > 0);
@@ -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.
*/
public boolean isSubscript() {
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetBaseline()){
setValue(props.getBaseline() < 0);
@@ -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.
*/
public TextCap getTextCap() {
- CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getLevel()){
+ CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetCap()){
int idx = props.getCap().intValue() - 1;
@@ -396,7 +396,7 @@ public class XSLFTextRun implements TextRun { * @return whether this run of text is formatted as bold text
*/
public boolean isBold(){
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetB()){
setValue(props.getB());
@@ -420,7 +420,7 @@ public class XSLFTextRun implements TextRun { * @return whether this run of text is formatted as italic text
*/
public boolean isItalic(){
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetI()){
setValue(props.getI());
@@ -444,7 +444,7 @@ public class XSLFTextRun implements TextRun { * @return whether this run of text is formatted as underlined text
*/
public boolean isUnderlined(){
- CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+ CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
public boolean fetch(CTTextCharacterProperties props){
if(props.isSetU()){
setValue(props.getU() != STTextUnderlineType.NONE);
@@ -491,7 +491,7 @@ public class XSLFTextRun implements TextRun { if(ph == null){
// if it is a plain text box then take defaults from presentation.xml
XMLSlideShow ppt = shape.getSheet().getSlideShow();
- CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(_p.getLevel());
+ CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(_p.getIndentLevel());
if(themeProps != null) {
fetcher.isFetchingFromMaster = true;
ok = fetcher.fetch(themeProps);
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java index b3c44f84a7..56766eac84 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java @@ -120,7 +120,7 @@ public class TestXSLFAutoShape { assertEquals(100., p.getLineSpacing(), 0);
assertEquals(0., p.getSpaceAfter(), 0);
assertEquals(0., p.getSpaceBefore(), 0);
- assertEquals(0, p.getLevel());
+ assertEquals(0, p.getIndentLevel());
p.setIndent(2.0);
assertEquals(2.0, p.getIndent(), 0);
@@ -134,11 +134,11 @@ public class TestXSLFAutoShape { assertFalse(p.getXmlObject().getPPr().isSetLvl());
- p.setLevel(1);
- assertEquals(1, p.getLevel());
+ p.setIndentLevel(1);
+ assertEquals(1, p.getIndentLevel());
assertTrue(p.getXmlObject().getPPr().isSetLvl());
- p.setLevel(2);
- assertEquals(2, p.getLevel());
+ p.setIndentLevel(2);
+ assertEquals(2, p.getIndentLevel());
p.setLeftMargin(2.0);
assertEquals(2.0, p.getLeftMargin(), 0);
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java index 37a01a73ae..4d51733353 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.poi.sl.draw.DrawTextFragment;
import org.apache.poi.sl.draw.DrawTextParagraph;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -297,11 +298,11 @@ public class TestXSLFTextParagraph { p.setLeftMargin(-1.0); // the value of -1.0 resets to the defaults
assertEquals(0.0, p.getLeftMargin(), 0);
- assertEquals(0, p.getLevel());
- p.setLevel(1);
- assertEquals(1, p.getLevel());
- p.setLevel(2);
- assertEquals(2, p.getLevel());
+ assertEquals(0, p.getIndentLevel());
+ p.setIndentLevel(1);
+ assertEquals(1, p.getIndentLevel());
+ p.setIndentLevel(2);
+ assertEquals(2, p.getIndentLevel());
assertEquals(100., p.getLineSpacing(), 0);
p.setLineSpacing(200.);
@@ -328,7 +329,7 @@ public class TestXSLFTextParagraph { p.setBullet(false);
assertFalse(p.isBullet());
- p.setBulletAutoNumber(ListAutoNumber.ALPHA_LC_PARENT_BOTH, 1);
+ p.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenBoth, 1);
double tabStop = p.getTabStop(0);
assertEquals(0.0, tabStop, 0);
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java index b19d069b0d..c3aabe051d 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java @@ -180,7 +180,7 @@ public class TestXSLFTextShape { assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr1.getParentParagraph().getLevel());
+ assertEquals(0, pr1.getParentParagraph().getIndentLevel());
assertEquals("Content", pr1.getRawText());
assertEquals("Calibri", pr1.getFontFamily());
assertEquals(32.0, pr1.getFontSize(), 0);
@@ -189,7 +189,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
- assertEquals(1, pr2.getParentParagraph().getLevel());
+ assertEquals(1, pr2.getParentParagraph().getIndentLevel());
assertEquals("Level 2", pr2.getRawText());
assertEquals("Calibri", pr2.getFontFamily());
assertEquals(28.0, pr2.getFontSize(), 0);
@@ -198,7 +198,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
- assertEquals(2, pr3.getParentParagraph().getLevel());
+ assertEquals(2, pr3.getParentParagraph().getIndentLevel());
assertEquals("Level 3", pr3.getRawText());
assertEquals("Calibri", pr3.getFontFamily());
assertEquals(24.0, pr3.getFontSize(), 0);
@@ -207,7 +207,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
- assertEquals(3, pr4.getParentParagraph().getLevel());
+ assertEquals(3, pr4.getParentParagraph().getIndentLevel());
assertEquals("Level 4", pr4.getRawText());
assertEquals("Calibri", pr4.getFontFamily());
assertEquals(20.0, pr4.getFontSize(), 0);
@@ -216,7 +216,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr4.getParentParagraph().getBulletFont());
XSLFTextRun pr5 = shape2.getTextParagraphs().get(4).getTextRuns().get(0);
- assertEquals(4, pr5.getParentParagraph().getLevel());
+ assertEquals(4, pr5.getParentParagraph().getIndentLevel());
assertEquals("Level 5", pr5.getRawText());
assertEquals("Calibri", pr5.getFontFamily());
assertEquals(20.0, pr5.getFontSize(), 0);
@@ -362,7 +362,7 @@ public class TestXSLFTextShape { assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr1.getParentParagraph().getLevel());
+ assertEquals(0, pr1.getParentParagraph().getIndentLevel());
assertEquals("Left", pr1.getRawText());
assertEquals("Calibri", pr1.getFontFamily());
assertEquals(28.0, pr1.getFontSize(), 0);
@@ -371,7 +371,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
- assertEquals(1, pr2.getParentParagraph().getLevel());
+ assertEquals(1, pr2.getParentParagraph().getIndentLevel());
assertEquals("Level 2", pr2.getParentParagraph().getText());
assertEquals("Calibri", pr2.getFontFamily());
assertEquals(24.0, pr2.getFontSize(), 0);
@@ -380,7 +380,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
- assertEquals(2, pr3.getParentParagraph().getLevel());
+ assertEquals(2, pr3.getParentParagraph().getIndentLevel());
assertEquals("Level 3", pr3.getParentParagraph().getText());
assertEquals("Calibri", pr3.getFontFamily());
assertEquals(20.0, pr3.getFontSize(), 0);
@@ -389,7 +389,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
- assertEquals(3, pr4.getParentParagraph().getLevel());
+ assertEquals(3, pr4.getParentParagraph().getIndentLevel());
assertEquals("Level 4", pr4.getParentParagraph().getText());
assertEquals("Calibri", pr4.getFontFamily());
assertEquals(18.0, pr4.getFontSize(), 0);
@@ -399,7 +399,7 @@ public class TestXSLFTextShape { XSLFTextShape shape3 = (XSLFTextShape)shapes.get(2);
XSLFTextRun pr5 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr5.getParentParagraph().getLevel());
+ assertEquals(0, pr5.getParentParagraph().getIndentLevel());
assertEquals("Right", pr5.getRawText());
assertEquals("Calibri", pr5.getFontFamily());
assertEquals(Color.black, pr5.getFontColor());
@@ -461,7 +461,7 @@ public class TestXSLFTextShape { assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr1.getParentParagraph().getLevel());
+ assertEquals(0, pr1.getParentParagraph().getIndentLevel());
assertEquals("Default Text", pr1.getRawText());
assertEquals("Calibri", pr1.getFontFamily());
assertEquals(18.0, pr1.getFontSize(), 0);
@@ -544,7 +544,7 @@ public class TestXSLFTextShape { assertEquals(VerticalAlignment.TOP, shape2.getVerticalAlignment());
XSLFTextRun pr1 = shape2.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr1.getParentParagraph().getLevel());
+ assertEquals(0, pr1.getParentParagraph().getIndentLevel());
assertEquals("Level 1", pr1.getRawText());
assertEquals("Calibri", pr1.getFontFamily());
assertEquals(32.0, pr1.getFontSize(), 0);
@@ -553,7 +553,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr1.getParentParagraph().getBulletFont());
XSLFTextRun pr2 = shape2.getTextParagraphs().get(1).getTextRuns().get(0);
- assertEquals(1, pr2.getParentParagraph().getLevel());
+ assertEquals(1, pr2.getParentParagraph().getIndentLevel());
assertEquals("Level 2", pr2.getParentParagraph().getText());
assertEquals("Calibri", pr2.getFontFamily());
assertEquals(28.0, pr2.getFontSize(), 0);
@@ -562,7 +562,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr2.getParentParagraph().getBulletFont());
XSLFTextRun pr3 = shape2.getTextParagraphs().get(2).getTextRuns().get(0);
- assertEquals(2, pr3.getParentParagraph().getLevel());
+ assertEquals(2, pr3.getParentParagraph().getIndentLevel());
assertEquals("Level 3", pr3.getParentParagraph().getText());
assertEquals("Calibri", pr3.getFontFamily());
assertEquals(24.0, pr3.getFontSize(), 0);
@@ -571,7 +571,7 @@ public class TestXSLFTextShape { assertEquals("Arial", pr3.getParentParagraph().getBulletFont());
XSLFTextRun pr4 = shape2.getTextParagraphs().get(3).getTextRuns().get(0);
- assertEquals(3, pr4.getParentParagraph().getLevel());
+ assertEquals(3, pr4.getParentParagraph().getIndentLevel());
assertEquals("Level 4", pr4.getParentParagraph().getText());
assertEquals("Calibri", pr4.getFontFamily());
assertEquals(20.0, pr4.getFontSize(), 0);
@@ -584,7 +584,7 @@ public class TestXSLFTextShape { assertEquals("Content with caption", shape3.getText());
pr1 = shape3.getTextParagraphs().get(0).getTextRuns().get(0);
- assertEquals(0, pr1.getParentParagraph().getLevel());
+ assertEquals(0, pr1.getParentParagraph().getIndentLevel());
assertEquals("Content with caption", pr1.getRawText());
assertEquals("Calibri", pr1.getFontFamily());
assertEquals(14.0, pr1.getFontSize(), 0);
@@ -707,19 +707,19 @@ public class TestXSLFTextShape { tx1.clearText();
XSLFTextParagraph p1 = tx1.addNewTextParagraph();
- assertEquals(0, p1.getLevel());
+ assertEquals(0, p1.getIndentLevel());
XSLFTextRun r1 = p1.addNewTextRun();
r1.setText("Apache POI");
XSLFTextParagraph p2 = tx1.addNewTextParagraph();
- p2.setLevel(1);
- assertEquals(1, p2.getLevel());
+ p2.setIndentLevel(1);
+ assertEquals(1, p2.getIndentLevel());
XSLFTextRun r2 = p2.addNewTextRun();
r2.setText("HSLF");
XSLFTextParagraph p3 = tx1.addNewTextParagraph();
- p3.setLevel(2);
- assertEquals(2, p3.getLevel());
+ p3.setIndentLevel(2);
+ assertEquals(2, p3.getIndentLevel());
XSLFTextRun r3 = p3.addNewTextRun();
r3.setText("XSLF");
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java index 9cb1a45a55..3954f6b487 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java @@ -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 diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java index 45ededed15..fc96644b2b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java @@ -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); diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java index 1167cc3558..190ad0a415 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java @@ -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"); } } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Line.java b/src/scratchpad/src/org/apache/poi/hslf/model/Line.java index c777351728..67b12be8b4 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Line.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Line.java @@ -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); + } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java index b329c8af3e..271b2591f9 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java @@ -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 index 0000000000..6aa09b9364 --- /dev/null +++ b/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java @@ -0,0 +1,75 @@ +/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hslf.record;
+
+import org.apache.poi.ddf.*;
+import org.apache.poi.util.*;
+
+/**
+ * An atom record that specifies whether a shape is a placeholder shape.
+ * The number, position, and type of placeholder shapes are determined by
+ * the slide layout as specified in the SlideAtom record.
+ */
+public class EscherPlaceholder extends EscherRecord {
+ public static final short RECORD_ID = (short)RecordTypes.OEPlaceholderAtom.typeID;
+ public static final String RECORD_DESCRIPTION = "msofbtClientTextboxPlaceholder";
+
+ int position = -1;
+ byte placementId = 0;
+ byte size = 0;
+ short unused = 0;
+
+ public EscherPlaceholder() {}
+
+ public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) {
+ int bytesRemaining = readHeader( data, offset );
+
+ position = LittleEndian.getInt(data, offset+8);
+ placementId = data[offset+12];
+ size = data[offset+13];
+ unused = LittleEndian.getShort(data, offset+14);
+
+ assert(bytesRemaining + 8 == 16);
+ return bytesRemaining + 8;
+ }
+
+ public int serialize(int offset, byte[] data, EscherSerializationListener listener) {
+ listener.beforeRecordSerialize( offset, getRecordId(), this );
+
+ LittleEndian.putShort(data, offset, getOptions());
+ LittleEndian.putShort(data, offset+2, getRecordId());
+ LittleEndian.putInt(data, offset+4, 8);
+ LittleEndian.putInt(data, offset+8, position);
+ LittleEndian.putByte(data, offset+12, placementId);
+ LittleEndian.putByte(data, offset+13, size);
+ LittleEndian.putShort(data, offset+14, unused);
+
+ listener.afterRecordSerialize( offset+getRecordSize(), getRecordId(), getRecordSize(), this );
+ return getRecordSize();
+ }
+
+ public int getRecordSize() {
+ return 8 + 8;
+ }
+
+ public String getRecordName() {
+ return "ClientTextboxPlaceholder";
+ }
+
+
+}
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 index 0000000000..c985864f00 --- /dev/null +++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java @@ -0,0 +1,70 @@ +/* ====================================================================
+ 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;
+
+import java.lang.reflect.Constructor;
+import java.util.Map;
+
+import org.apache.poi.ddf.*;
+import org.apache.poi.util.LittleEndian;
+
+/**
+ * Generates escher records when provided the byte array containing those records.
+ *
+ * @see EscherRecordFactory
+ */
+public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory {
+ private static Class<?>[] escherRecordClasses = { EscherPlaceholder.class };
+ private static Map<Short, Constructor<? extends EscherRecord>> recordsMap = recordsToMap( escherRecordClasses );
+
+
+ /**
+ * Creates an instance of the escher record factory
+ */
+ public HSLFEscherRecordFactory() {
+ // no instance initialisation
+ }
+
+ /**
+ * Generates an escher record including the any children contained under that record.
+ * An exception is thrown if the record could not be generated.
+ *
+ * @param data The byte array containing the records
+ * @param offset The starting offset into the byte array
+ * @return The generated escher record
+ */
+ public EscherRecord createRecord(byte[] data, int offset) {
+ short options = LittleEndian.getShort( data, offset );
+ short recordId = LittleEndian.getShort( data, offset + 2 );
+ // int remainingBytes = LittleEndian.getInt( data, offset + 4 );
+
+ Constructor<? extends EscherRecord> recordConstructor = recordsMap.get(Short.valueOf(recordId));
+ if (recordConstructor == null) {
+ return super.createRecord(data, offset);
+ }
+ EscherRecord escherRecord = null;
+ try {
+ escherRecord = recordConstructor.newInstance(new Object[] {});
+ } catch (Exception e) {
+ return super.createRecord(data, offset);
+ }
+ escherRecord.setRecordId(recordId);
+ escherRecord.setOptions(options);
+ return escherRecord;
+ }
+}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java index 09854b5ab9..637f9a8ab8 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java @@ -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()]); } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java index ee414bba9b..0cdb1f6273 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java @@ -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); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java index 548027b76a..9a5cc7b487 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java @@ -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 index ab706592ef..0000000000 --- a/src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java +++ /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; - } -} diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java index a68f3a74e9..9288052c66 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -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); } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java index 7e2f6f01a0..5948b40132 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java @@ -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; diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java index 0247a75936..d0c594fd81 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java @@ -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); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java index 5ddf311e52..c90452ddaa 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java @@ -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; } diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java index 211bc00c06..8feee2312b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java @@ -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; diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java index b028758e6f..69a89555c8 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java @@ -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>>(); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java index ee99745b5a..386447328b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java @@ -27,6 +27,7 @@ import org.apache.poi.hslf.model.PPFont; import org.apache.poi.hslf.model.textproperties.*;
import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
import org.apache.poi.hslf.record.*;
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
import org.apache.poi.sl.usermodel.TextParagraph;
import org.apache.poi.util.*;
@@ -62,7 +63,6 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { private HSLFSheet _sheet;
private int shapeId;
- // private StyleTextPropAtom styleTextPropAtom;
private StyleTextProp9Atom styleTextProp9Atom;
/**
@@ -230,7 +230,8 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { int length;
for (length = 1; startIdx[0] + length < records.length; length++) {
- if (records[startIdx[0]+length] instanceof TextHeaderAtom) break;
+ Record r = records[startIdx[0]+length];
+ if (r instanceof TextHeaderAtom || r instanceof SlidePersistAtom) break;
}
Record result[] = new Record[length];
@@ -359,27 +360,60 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { }
}
+ public AutoNumberingScheme getAutoNumberingScheme() {
+ if (styleTextProp9Atom == null) return null;
+ TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();
+ int level = getIndentLevel();
+ if (ant == null || level >= ant.length) return null;
+ return ant[level].getAutoNumberScheme();
+ }
+
+ public Integer getAutoNumberingStartAt() {
+ if (styleTextProp9Atom == null) return null;
+ TextPFException9[] ant = styleTextProp9Atom.getAutoNumberTypes();
+ int level = getIndentLevel();
+ if (ant == null || level >= ant.length) return null;
+ Short startAt = ant[level].getAutoNumberStartNumber();
+ assert(startAt != null);
+ return startAt.intValue();
+ }
+
+
@Override
public BulletStyle getBulletStyle() {
- if (!isBullet()) return null;
+ if (!isBullet() && getAutoNumberingScheme() == null) return null;
return new BulletStyle() {
+ @Override
public String getBulletCharacter() {
Character chr = HSLFTextParagraph.this.getBulletChar();
return (chr == null || chr == 0) ? "" : "" + chr;
}
+ @Override
public String getBulletFont() {
return HSLFTextParagraph.this.getBulletFont();
}
+ @Override
public Double getBulletFontSize() {
return HSLFTextParagraph.this.getBulletSize();
}
+ @Override
public Color getBulletFontColor() {
return HSLFTextParagraph.this.getBulletColor();
}
+
+ @Override
+ public AutoNumberingScheme getAutoNumberingScheme() {
+ return HSLFTextParagraph.this.getAutoNumberingScheme();
+ }
+
+ @Override
+ public Integer getAutoNumberingStartAt() {
+ return HSLFTextParagraph.this.getAutoNumberingStartAt();
+ }
};
}
@@ -392,19 +426,12 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { _parentShape = parentShape;
}
- /**
- *
- * @return indentation level
- */
+ @Override
public int getIndentLevel() {
return _paragraphStyle == null ? 0 : _paragraphStyle.getIndentLevel();
}
- /**
- * Sets indentation level
- *
- * @param level indentation level. Must be in the range [0, 4]
- */
+ @Override
public void setIndentLevel(int level) {
if( _paragraphStyle != null ) _paragraphStyle.setIndentLevel((short)level);
}
@@ -471,17 +498,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { return (_runs.isEmpty()) ? null : _runs.get(0).getFontColor();
}
- int rgb = tp.getValue();
- int cidx = rgb >> 24;
- if (rgb % 0x1000000 == 0) {
- if (_sheet == null)
- return null;
- ColorSchemeAtom ca = _sheet.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 getColorFromColorIndexStruct(tp.getValue(), _sheet);
}
/**
@@ -934,7 +951,8 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { public static List<List<HSLFTextParagraph>> findTextParagraphs(PPDrawing ppdrawing, HSLFSheet sheet) {
List<List<HSLFTextParagraph>> runsV = new ArrayList<List<HSLFTextParagraph>>();
for (EscherTextboxWrapper wrapper : ppdrawing.getTextboxWrappers()) {
- runsV.add(findTextParagraphs(wrapper, sheet));
+ List<HSLFTextParagraph> p = findTextParagraphs(wrapper, sheet);
+ if (p != null) runsV.add(p);
}
return runsV;
}
@@ -1189,7 +1207,10 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { protected static List<HSLFTextParagraph> createEmptyParagraph() {
EscherTextboxWrapper wrapper = new EscherTextboxWrapper();
-
+ return createEmptyParagraph(wrapper);
+ }
+
+ protected static List<HSLFTextParagraph> createEmptyParagraph(EscherTextboxWrapper wrapper) {
TextHeaderAtom tha = new TextHeaderAtom();
tha.setParentRecord(wrapper);
wrapper.appendChildRecord(tha);
@@ -1217,4 +1238,26 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFTextRun> { public EscherTextboxWrapper getTextboxWrapper() {
return (EscherTextboxWrapper) _headerAtom.getParentRecord();
}
+
+ protected static Color getColorFromColorIndexStruct(int rgb, HSLFSheet sheet) {
+ int cidx = rgb >>> 24;
+ Color tmp;
+ switch (cidx) {
+ // Background ... Accent 3 color
+ case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
+ if (sheet == null) return null;
+ ColorSchemeAtom ca = sheet.getColorScheme();
+ tmp = new Color(ca.getColor(cidx), true);
+ break;
+ // Color is an sRGB value specified by red, green, and blue fields.
+ case 0xFE:
+ tmp = new Color(rgb, true);
+ break;
+ // Color is undefined.
+ default:
+ case 0xFF:
+ return null;
+ }
+ return new Color(tmp.getBlue(), tmp.getGreen(), tmp.getRed());
+ }
}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java index bb4f140415..437ed274e9 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java @@ -17,14 +17,13 @@ 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()); } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java index b9df58c43a..55222cf474 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java @@ -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); + } } } diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java b/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java index d3c606a62d..c83abbd5a5 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java @@ -10,8 +10,9 @@ import java.util.*; import org.apache.poi.sl.usermodel.*;
import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;
-import org.apache.poi.sl.usermodel.TextRun.TextCap;
import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
+import org.apache.poi.sl.usermodel.TextRun.TextCap;
+import org.apache.poi.util.Units;
public class DrawTextParagraph<T extends TextRun> implements Drawable {
protected TextParagraph<T> paragraph;
@@ -20,6 +21,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { protected List<DrawTextFragment> lines = new ArrayList<DrawTextFragment>();
protected String rawText;
protected DrawTextFragment bullet;
+ protected int autoNbrIdx = 0;
/**
* the highest line in this paragraph. Used for line spacing.
@@ -47,6 +49,14 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { public double getY() {
return y;
}
+
+ /**
+ * Sets the auto numbering index of the handled paragraph
+ * @param index the auto numbering index
+ */
+ public void setAutoNumberingIdx(int index) {
+ autoNbrIdx = index;
+ }
public void draw(Graphics2D graphics){
if (lines.isEmpty()) return;
@@ -56,51 +66,45 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { double penY = y;
boolean firstLine = true;
+ int indentLevel = paragraph.getIndentLevel();
Double leftMargin = paragraph.getLeftMargin();
- Double indent = paragraph.getIndent();
if (leftMargin == null) {
- leftMargin = (indent != null) ? -indent : 0;
+ // if the marL attribute is omitted, then a value of 347663 is implied
+ leftMargin = Units.toPoints(347663*(indentLevel+1));
}
+ Double indent = paragraph.getIndent();
if (indent == null) {
- indent = (leftMargin != null) ? -leftMargin : 0;
+ indent = Units.toPoints(347663*indentLevel);
+ }
+ Double rightMargin = paragraph.getRightMargin();
+ if (rightMargin == null) {
+ rightMargin = 0d;
}
-
//The vertical line spacing
Double spacing = paragraph.getLineSpacing();
if (spacing == null) spacing = 100d;
for(DrawTextFragment line : lines){
- double penX = x + leftMargin;
+ double penX;
if(firstLine) {
if (!isEmptyParagraph()) {
+ // TODO: find out character style for empty, but bulleted/numbered lines
bullet = getBullet(graphics, line.getAttributedString().getIterator());
}
- if(bullet != null){
- if (indent < 0) {
- // a negative value means "Hanging" indentation and
- // indicates the position of the actual bullet character.
- // (the bullet is shifted to right relative to the text)
- bullet.setPosition(penX + indent, penY);
- } else if(indent > 0){
- // a positive value means the "First Line" indentation:
- // the first line is indented and other lines start at the bullet offset
- bullet.setPosition(penX, penY);
- penX += indent;
- } else {
- // a zero indent means that the bullet and text have the same offset
- bullet.setPosition(penX, penY);
-
- // don't let text overlay the bullet and advance by the bullet width
- penX += bullet.getLayout().getAdvance() + 1;
- }
-
+ if (bullet != null){
+ bullet.setPosition(x + indent, penY);
bullet.draw(graphics);
+ // don't let text overlay the bullet and advance by the bullet width
+ double bulletWidth = bullet.getLayout().getAdvance() + 1;
+ penX = x + Math.max(leftMargin, indent+bulletWidth);
} else {
- penX += indent;
+ penX = x + indent;
}
+ } else {
+ penX = x + leftMargin;
}
Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());
@@ -125,7 +129,7 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { // If linespacing >= 0, then linespacing is a percentage of normal line height.
penY += spacing*0.01* line.getHeight();
} else {
- // positive value means absolute spacing in points
+ // negative value means absolute spacing in points
penY += -spacing;
}
@@ -219,7 +223,13 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { BulletStyle bulletStyle = paragraph.getBulletStyle();
if (bulletStyle == null) return null;
- String buCharacter = bulletStyle.getBulletCharacter();
+ String buCharacter;
+ AutoNumberingScheme ans = bulletStyle.getAutoNumberingScheme();
+ if (ans != null) {
+ buCharacter = ans.format(autoNbrIdx);
+ } else {
+ buCharacter = bulletStyle.getBulletCharacter();
+ }
if (buCharacter == null) return null;
String buFont = bulletStyle.getBulletFont();
@@ -314,13 +324,19 @@ public class DrawTextParagraph<T extends TextRun> implements Drawable { Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());
+ int indentLevel = paragraph.getIndentLevel();
Double leftMargin = paragraph.getLeftMargin();
- Double indent = paragraph.getIndent();
if (leftMargin == null) {
- leftMargin = (indent != null) ? -indent : 0;
+ // if the marL attribute is omitted, then a value of 347663 is implied
+ leftMargin = Units.toPoints(347663*(indentLevel+1));
}
+ Double indent = paragraph.getIndent();
if (indent == null) {
- indent = (leftMargin != null) ? -leftMargin : 0;
+ indent = Units.toPoints(347663*indentLevel);
+ }
+ Double rightMargin = paragraph.getRightMargin();
+ if (rightMargin == null) {
+ rightMargin = 0d;
}
double width;
@@ -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
width = ts.getSheet().getSlideShow().getPageSize().getWidth() - anchor.getX();
} else {
- width = anchor.getWidth() - leftInset - rightInset - leftMargin;
+ width = anchor.getWidth() - leftInset - rightInset - leftMargin - rightMargin;
if (firstLine) {
if (bullet != null){
if (indent > 0) width -= indent;
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java b/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java index bb6c6dd29f..2212935115 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java @@ -7,6 +7,7 @@ import java.awt.image.BufferedImage; import java.util.Iterator;
import org.apache.poi.sl.usermodel.*;
+import org.apache.poi.sl.usermodel.TextParagraph.BulletStyle;
public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends TextRun>>> extends DrawSimpleShape<T> {
@@ -87,9 +88,19 @@ public class DrawTextShape<T extends TextShape<? extends TextParagraph<? extends Iterator<? extends TextParagraph<? extends TextRun>> paragraphs = shape.iterator();
boolean isFirstLine = true;
- while (paragraphs.hasNext()){
+ for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){
TextParagraph<? extends TextRun> p = paragraphs.next();
DrawTextParagraph<? extends TextRun> dp = fact.getDrawable(p);
+ BulletStyle bs = p.getBulletStyle();
+ if (bs == null || bs.getAutoNumberingScheme() == null) {
+ autoNbrIdx = -1;
+ } else {
+ Integer startAt = bs.getAutoNumberingStartAt();
+ if (startAt == null) startAt = 1;
+ // TODO: handle reset auto number indexes
+ if (startAt > autoNbrIdx) autoNbrIdx = startAt;
+ }
+ dp.setAutoNumberingIdx(autoNbrIdx);
dp.setInsets(shapePadding);
dp.breakText(graphics);
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java index ff07ce7cf2..32ee2a03b0 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -47,17 +43,12 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_AdjPoint2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTAdjPoint2D
- implements Locatable
-{
+public class CTAdjPoint2D {
- @XmlAttribute(name = "x", required = true)
+ @XmlAttribute(required = true)
protected String x;
- @XmlAttribute(name = "y", required = true)
+ @XmlAttribute(required = true)
protected String y;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the x property.
@@ -115,12 +106,4 @@ public class CTAdjPoint2D return (this.y!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java index ae1482e49d..c5ef7860b6 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java @@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -54,18 +50,13 @@ import org.xml.sax.Locator; @XmlType(name = "CT_AdjustHandleList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"ahXYOrAhPolar"
})
-public class CTAdjustHandleList
- implements Locatable
-{
+public class CTAdjustHandleList {
@XmlElements({
- @XmlElement(name = "ahXY", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTXYAdjustHandle.class),
- @XmlElement(name = "ahPolar", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPolarAdjustHandle.class)
+ @XmlElement(name = "ahPolar", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPolarAdjustHandle.class),
+ @XmlElement(name = "ahXY", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTXYAdjustHandle.class)
})
protected List<Object> ahXYOrAhPolar;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the ahXYOrAhPolar property.
@@ -85,8 +76,8 @@ public class CTAdjustHandleList *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CTXYAdjustHandle }
* {@link CTPolarAdjustHandle }
+ * {@link CTXYAdjustHandle }
*
*
*/
@@ -105,12 +96,4 @@ public class CTAdjustHandleList this.ahXYOrAhPolar = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java index 77f138790d..2e39602dad 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Angle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTAngle implements Locatable
-{
+public class CTAngle {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTAngle implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java index c03c7319da..dd3cca3602 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -55,9 +51,7 @@ import org.xml.sax.Locator; "schemeClr",
"prstClr"
})
-public class CTColor
- implements Locatable
-{
+public class CTColor {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTScRgbColor scrgbClr;
@@ -71,9 +65,6 @@ public class CTColor protected CTSchemeColor schemeClr;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTPresetColor prstClr;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the scrgbClr property.
@@ -243,12 +234,4 @@ public class CTColor return (this.prstClr!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java index 2439cc1ba5..fb3e2cc61d 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java @@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -53,22 +49,17 @@ import org.xml.sax.Locator; @XmlType(name = "CT_ColorMRU", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorChoice"
})
-public class CTColorMRU
- implements Locatable
-{
+public class CTColorMRU {
@XmlElements({
- @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),
- @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),
@XmlElement(name = "hslClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTHslColor.class),
- @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class),
+ @XmlElement(name = "srgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSRgbColor.class),
@XmlElement(name = "schemeClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSchemeColor.class),
- @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class)
+ @XmlElement(name = "scrgbClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTScRgbColor.class),
+ @XmlElement(name = "prstClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPresetColor.class),
+ @XmlElement(name = "sysClr", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTSystemColor.class)
})
protected List<Object> egColorChoice;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorChoice property.
@@ -88,12 +79,12 @@ public class CTColorMRU *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CTScRgbColor }
- * {@link CTSRgbColor }
* {@link CTHslColor }
- * {@link CTSystemColor }
+ * {@link CTSRgbColor }
* {@link CTSchemeColor }
+ * {@link CTScRgbColor }
* {@link CTPresetColor }
+ * {@link CTSystemColor }
*
*
*/
@@ -112,12 +103,4 @@ public class CTColorMRU this.egColorChoice = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java index 491971549e..dd1a56c0b9 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_ComplementTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTComplementTransform implements Locatable
-{
+public class CTComplementTransform {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java index b2c88ae455..4af3fac719 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -48,18 +44,13 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Connection", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTConnection
- implements Locatable
-{
+public class CTConnection {
- @XmlAttribute(name = "id", required = true)
+ @XmlAttribute(required = true)
protected long id;
- @XmlAttribute(name = "idx", required = true)
+ @XmlAttribute(required = true)
@XmlSchemaType(name = "unsignedInt")
protected long idx;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the id property.
@@ -101,12 +92,4 @@ public class CTConnection return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java index c6189d1128..7ec62972dd 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,17 +48,12 @@ import org.xml.sax.Locator; @XmlType(name = "CT_ConnectionSite", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pos"
})
-public class CTConnectionSite
- implements Locatable
-{
+public class CTConnectionSite {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTAdjPoint2D pos;
- @XmlAttribute(name = "ang", required = true)
+ @XmlAttribute(required = true)
protected String ang;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pos property.
@@ -120,12 +111,4 @@ public class CTConnectionSite return (this.ang!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java index 49e8123993..a3c98898c4 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_ConnectionSiteList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"cxn"
})
-public class CTConnectionSiteList
- implements Locatable
-{
+public class CTConnectionSiteList {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected List<CTConnectionSite> cxn;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the cxn property.
@@ -99,12 +90,4 @@ public class CTConnectionSiteList this.cxn = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java index 4e43d915c7..d6856ee637 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -60,9 +56,7 @@ import org.xml.sax.Locator; "rect",
"pathLst"
})
-public class CTCustomGeometry2D
- implements Locatable
-{
+public class CTCustomGeometry2D {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTGeomGuideList avLst;
@@ -76,9 +70,6 @@ public class CTCustomGeometry2D protected CTGeomRect rect;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTPath2DList pathLst;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the avLst property.
@@ -248,12 +239,4 @@ public class CTCustomGeometry2D return (this.pathLst!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java index aaef46da9a..94d44ece22 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -48,19 +44,14 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_EmbeddedWAVAudioFile", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTEmbeddedWAVAudioFile
- implements Locatable
-{
+public class CTEmbeddedWAVAudioFile {
- @XmlAttribute(name = "embed", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)
+ @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)
protected String embed;
- @XmlAttribute(name = "name")
+ @XmlAttribute
protected String name;
- @XmlAttribute(name = "builtIn")
+ @XmlAttribute
protected Boolean builtIn;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Embedded Audio File Relationship ID
@@ -158,12 +149,4 @@ public class CTEmbeddedWAVAudioFile this.builtIn = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java index 14bcd3776f..92f41aee89 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_FixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTFixedPercentage implements Locatable
-{
+public class CTFixedPercentage {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTFixedPercentage implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java index 84e7f3b0e0..7cf6cb195c 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_GammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGammaTransform implements Locatable
-{
+public class CTGammaTransform {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java index e0723d97a2..3df22093ca 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java @@ -20,13 +20,9 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -49,18 +45,13 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_GeomGuide", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGeomGuide
- implements Locatable
-{
+public class CTGeomGuide {
- @XmlAttribute(name = "name", required = true)
+ @XmlAttribute(required = true)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String name;
- @XmlAttribute(name = "fmla", required = true)
+ @XmlAttribute(required = true)
protected String fmla;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the name property.
@@ -118,12 +109,4 @@ public class CTGeomGuide return (this.fmla!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java index d5203d8493..4490933b4f 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_GeomGuideList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"gd"
})
-public class CTGeomGuideList
- implements Locatable
-{
+public class CTGeomGuideList {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected List<CTGeomGuide> gd;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the gd property.
@@ -99,12 +90,4 @@ public class CTGeomGuideList this.gd = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java index f0383f81f8..b1368be295 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -49,21 +45,16 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_GeomRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGeomRect
- implements Locatable
-{
+public class CTGeomRect {
- @XmlAttribute(name = "l", required = true)
+ @XmlAttribute(required = true)
protected String l;
- @XmlAttribute(name = "t", required = true)
+ @XmlAttribute(required = true)
protected String t;
- @XmlAttribute(name = "r", required = true)
+ @XmlAttribute(required = true)
protected String r;
- @XmlAttribute(name = "b", required = true)
+ @XmlAttribute(required = true)
protected String b;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the l property.
@@ -177,12 +168,4 @@ public class CTGeomRect return (this.b!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java index ef5ad887f6..643db025a2 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_GrayscaleTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTGrayscaleTransform implements Locatable
-{
+public class CTGrayscaleTransform {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java index 15386a230d..6508613b16 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -60,9 +56,7 @@ import org.xml.sax.Locator; "chOff",
"chExt"
})
-public class CTGroupTransform2D
- implements Locatable
-{
+public class CTGroupTransform2D {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTPoint2D off;
@@ -72,15 +66,12 @@ public class CTGroupTransform2D protected CTPoint2D chOff;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTPositiveSize2D chExt;
- @XmlAttribute(name = "rot")
+ @XmlAttribute
protected Integer rot;
- @XmlAttribute(name = "flipH")
+ @XmlAttribute
protected Boolean flipH;
- @XmlAttribute(name = "flipV")
+ @XmlAttribute
protected Boolean flipV;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the off property.
@@ -302,12 +293,4 @@ public class CTGroupTransform2D this.flipV = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java index 534a9b3700..c5bca5aeca 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -58,49 +54,45 @@ import org.xml.sax.Locator; @XmlType(name = "CT_HslColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTHslColor implements Locatable
-{
+public class CTHslColor {
@XmlElementRefs({
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "hue", required = true)
+ @XmlAttribute(required = true)
protected int hue;
- @XmlAttribute(name = "sat", required = true)
+ @XmlAttribute(required = true)
protected int sat;
- @XmlAttribute(name = "lum", required = true)
+ @XmlAttribute(required = true)
protected int lum;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -120,34 +112,34 @@ public class CTHslColor implements Locatable *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
*
*
*/
@@ -226,12 +218,4 @@ public class CTHslColor implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java index 571ff8b646..03e486af5d 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -61,33 +57,28 @@ import org.xml.sax.Locator; "snd",
"extLst"
})
-public class CTHyperlink
- implements Locatable
-{
+public class CTHyperlink {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTEmbeddedWAVAudioFile snd;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTOfficeArtExtensionList extLst;
- @XmlAttribute(name = "id", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")
+ @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")
protected String id;
- @XmlAttribute(name = "invalidUrl")
+ @XmlAttribute
protected String invalidUrl;
- @XmlAttribute(name = "action")
+ @XmlAttribute
protected String action;
- @XmlAttribute(name = "tgtFrame")
+ @XmlAttribute
protected String tgtFrame;
- @XmlAttribute(name = "tooltip")
+ @XmlAttribute
protected String tooltip;
- @XmlAttribute(name = "history")
+ @XmlAttribute
protected Boolean history;
- @XmlAttribute(name = "highlightClick")
+ @XmlAttribute
protected Boolean highlightClick;
- @XmlAttribute(name = "endSnd")
+ @XmlAttribute
protected Boolean endSnd;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the snd property.
@@ -409,12 +400,4 @@ public class CTHyperlink this.endSnd = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java index 091d6e2318..eaff064d70 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_InverseGammaTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTInverseGammaTransform implements Locatable
-{
+public class CTInverseGammaTransform {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java index e1de7b8b5a..84af625337 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_InverseTransform", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTInverseTransform implements Locatable
-{
+public class CTInverseTransform {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java index db1831fdf1..adb928fbe1 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java @@ -22,14 +22,10 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
import org.w3c.dom.Element;
-import org.xml.sax.Locator;
/**
@@ -56,27 +52,22 @@ import org.xml.sax.Locator; @XmlType(name = "CT_OfficeArtExtension", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"any"
})
-public class CTOfficeArtExtension
- implements Locatable
-{
+public class CTOfficeArtExtension {
@XmlAnyElement(lax = true)
protected Object any;
- @XmlAttribute(name = "uri")
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlSchemaType(name = "token")
protected String uri;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the any property.
*
* @return
* possible object is
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*/
public Object getAny() {
@@ -88,8 +79,8 @@ public class CTOfficeArtExtension *
* @param value
* allowed object is
- * {@link Object }
* {@link Element }
+ * {@link Object }
*
*/
public void setAny(Object value) {
@@ -128,12 +119,4 @@ public class CTOfficeArtExtension return (this.uri!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java index fc806911f0..f0b54cb180 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_OfficeArtExtensionList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"ext"
})
-public class CTOfficeArtExtensionList
- implements Locatable
-{
+public class CTOfficeArtExtensionList {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected List<CTOfficeArtExtension> ext;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the ext property.
@@ -99,12 +90,4 @@ public class CTOfficeArtExtensionList this.ext = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java index bcba3c8c8e..84b919843c 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java @@ -24,11 +24,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -64,32 +60,27 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"closeOrMoveToOrLnTo"
})
-public class CTPath2D
- implements Locatable
-{
+public class CTPath2D {
@XmlElements({
- @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class),
@XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DMoveTo.class),
- @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),
- @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),
@XmlElement(name = "quadBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DQuadBezierTo.class),
- @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class)
+ @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DCubicBezierTo.class),
+ @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DArcTo.class),
+ @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DLineTo.class),
+ @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = CTPath2DClose.class)
})
protected List<Object> closeOrMoveToOrLnTo;
- @XmlAttribute(name = "w")
+ @XmlAttribute
protected Long w;
- @XmlAttribute(name = "h")
+ @XmlAttribute
protected Long h;
- @XmlAttribute(name = "fill")
+ @XmlAttribute
protected STPathFillMode fill;
- @XmlAttribute(name = "stroke")
+ @XmlAttribute
protected Boolean stroke;
- @XmlAttribute(name = "extrusionOk")
+ @XmlAttribute
protected Boolean extrusionOk;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the closeOrMoveToOrLnTo property.
@@ -109,12 +100,12 @@ public class CTPath2D *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CTPath2DClose }
* {@link CTPath2DMoveTo }
- * {@link CTPath2DLineTo }
- * {@link CTPath2DArcTo }
* {@link CTPath2DQuadBezierTo }
* {@link CTPath2DCubicBezierTo }
+ * {@link CTPath2DArcTo }
+ * {@link CTPath2DLineTo }
+ * {@link CTPath2DClose }
*
*
*/
@@ -309,12 +300,4 @@ public class CTPath2D this.extrusionOk = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java index 225d87005a..a4c325aa1f 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -49,20 +45,16 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Path2DArcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPath2DArcTo implements Locatable
-{
+public class CTPath2DArcTo {
@XmlAttribute(name = "wR", required = true)
protected String wr;
@XmlAttribute(name = "hR", required = true)
protected String hr;
- @XmlAttribute(name = "stAng", required = true)
+ @XmlAttribute(required = true)
protected String stAng;
- @XmlAttribute(name = "swAng", required = true)
+ @XmlAttribute(required = true)
protected String swAng;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the wr property.
@@ -176,12 +168,4 @@ public class CTPath2DArcTo implements Locatable return (this.swAng!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java index f8f2514fac..a60f98bb67 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java @@ -19,11 +19,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -44,19 +40,7 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Path2DClose", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPath2DClose implements Locatable
-{
+public class CTPath2DClose {
- @XmlLocation
- @XmlTransient
- protected Locator locator;
-
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java index 0f27b0506a..e1818fa5db 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,14 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DCubicBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pt"
})
-public class CTPath2DCubicBezierTo implements Locatable
-{
+public class CTPath2DCubicBezierTo {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected List<CTAdjPoint2D> pt;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pt property.
@@ -98,12 +90,4 @@ public class CTPath2DCubicBezierTo implements Locatable this.pt = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java index 0cfeb7cd64..9c6d1b39a8 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -50,14 +46,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DLineTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pt"
})
-public class CTPath2DLineTo implements Locatable
-{
+public class CTPath2DLineTo {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTAdjPoint2D pt;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pt property.
@@ -87,12 +79,4 @@ public class CTPath2DLineTo implements Locatable return (this.pt!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java index c190710cf4..cd31a0ba57 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"path"
})
-public class CTPath2DList
- implements Locatable
-{
+public class CTPath2DList {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected List<CTPath2D> path;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the path property.
@@ -99,12 +90,4 @@ public class CTPath2DList this.path = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java index 6554a296dc..f5e210f768 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -50,14 +46,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DMoveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pt"
})
-public class CTPath2DMoveTo implements Locatable
-{
+public class CTPath2DMoveTo {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTAdjPoint2D pt;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pt property.
@@ -87,12 +79,4 @@ public class CTPath2DMoveTo implements Locatable return (this.pt!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java index 4db3737224..b588775245 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java @@ -22,11 +22,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,14 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DQuadBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pt"
})
-public class CTPath2DQuadBezierTo implements Locatable
-{
+public class CTPath2DQuadBezierTo {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected List<CTAdjPoint2D> pt;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pt property.
@@ -98,12 +90,4 @@ public class CTPath2DQuadBezierTo implements Locatable this.pt = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java index 1c07c22d94..7ca8c1fec5 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPercentage implements Locatable
-{
+public class CTPercentage {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTPercentage implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java index a178b26b19..ae87986035 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -47,17 +43,12 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPoint2D
- implements Locatable
-{
+public class CTPoint2D {
- @XmlAttribute(name = "x", required = true)
+ @XmlAttribute(required = true)
protected long x;
- @XmlAttribute(name = "y", required = true)
+ @XmlAttribute(required = true)
protected long y;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the x property.
@@ -99,12 +90,4 @@ public class CTPoint2D return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java index 641ad4611d..e14c6ba4f2 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -48,19 +44,14 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPoint3D
- implements Locatable
-{
+public class CTPoint3D {
- @XmlAttribute(name = "x", required = true)
+ @XmlAttribute(required = true)
protected long x;
- @XmlAttribute(name = "y", required = true)
+ @XmlAttribute(required = true)
protected long y;
- @XmlAttribute(name = "z", required = true)
+ @XmlAttribute(required = true)
protected long z;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the x property.
@@ -122,12 +113,4 @@ public class CTPoint3D return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java index 2c3f9b9923..9547ca9881 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java @@ -21,13 +21,9 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -59,28 +55,24 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PolarAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pos"
})
-public class CTPolarAdjustHandle implements Locatable
-{
+public class CTPolarAdjustHandle {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTAdjPoint2D pos;
- @XmlAttribute(name = "gdRefR")
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String gdRefR;
- @XmlAttribute(name = "minR")
+ @XmlAttribute
protected String minR;
- @XmlAttribute(name = "maxR")
+ @XmlAttribute
protected String maxR;
- @XmlAttribute(name = "gdRefAng")
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String gdRefAng;
- @XmlAttribute(name = "minAng")
+ @XmlAttribute
protected String minAng;
- @XmlAttribute(name = "maxAng")
+ @XmlAttribute
protected String maxAng;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pos property.
@@ -278,12 +270,4 @@ public class CTPolarAdjustHandle implements Locatable return (this.maxAng!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java index c544044ae3..94348d9bff 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveFixedAngle implements Locatable
-{
+public class CTPositiveFixedAngle {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTPositiveFixedAngle implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java index 475ae740c0..de659159e1 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveFixedPercentage implements Locatable
-{
+public class CTPositiveFixedPercentage {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTPositiveFixedPercentage implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java index 9d7b8b9750..7b377e1444 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -46,14 +42,10 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositivePercentage implements Locatable
-{
+public class CTPositivePercentage {
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected int val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the val property.
@@ -75,12 +67,4 @@ public class CTPositivePercentage implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java index f070ab75a6..210fd925a5 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -47,17 +43,12 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTPositiveSize2D
- implements Locatable
-{
+public class CTPositiveSize2D {
- @XmlAttribute(name = "cx", required = true)
+ @XmlAttribute(required = true)
protected long cx;
- @XmlAttribute(name = "cy", required = true)
+ @XmlAttribute(required = true)
protected long cy;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the cx property.
@@ -99,12 +90,4 @@ public class CTPositiveSize2D return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java index 5c8d53e107..991d232d03 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -56,45 +52,41 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PresetColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTPresetColor implements Locatable
-{
+public class CTPresetColor {
@XmlElementRefs({
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val")
+ @XmlAttribute
protected STPresetColorVal val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -114,34 +106,34 @@ public class CTPresetColor implements Locatable *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
*
*
*/
@@ -188,12 +180,4 @@ public class CTPresetColor implements Locatable return (this.val!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java index 0989d29f07..234bbd95f9 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,17 +48,12 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PresetGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"avLst"
})
-public class CTPresetGeometry2D
- implements Locatable
-{
+public class CTPresetGeometry2D {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTGeomGuideList avLst;
- @XmlAttribute(name = "prst", required = true)
+ @XmlAttribute(required = true)
protected STShapeType prst;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the avLst property.
@@ -120,12 +111,4 @@ public class CTPresetGeometry2D return (this.prst!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java index 77d5e3f251..0a6135fc90 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,17 +48,12 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PresetTextShape", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"avLst"
})
-public class CTPresetTextShape
- implements Locatable
-{
+public class CTPresetTextShape {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTGeomGuideList avLst;
- @XmlAttribute(name = "prst", required = true)
+ @XmlAttribute(required = true)
protected STTextShapeType prst;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the avLst property.
@@ -120,12 +111,4 @@ public class CTPresetTextShape return (this.prst!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java index 3ea12ebe5d..4a61b88cb9 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -47,17 +43,12 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTRatio
- implements Locatable
-{
+public class CTRatio {
- @XmlAttribute(name = "n", required = true)
+ @XmlAttribute(required = true)
protected long n;
- @XmlAttribute(name = "d", required = true)
+ @XmlAttribute(required = true)
protected long d;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the n property.
@@ -99,12 +90,4 @@ public class CTRatio return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java index 7d46b575ac..a8b82c4744 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -49,21 +45,16 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTRelativeRect
- implements Locatable
-{
+public class CTRelativeRect {
- @XmlAttribute(name = "l")
+ @XmlAttribute
protected Integer l;
- @XmlAttribute(name = "t")
+ @XmlAttribute
protected Integer t;
- @XmlAttribute(name = "r")
+ @XmlAttribute
protected Integer r;
- @XmlAttribute(name = "b")
+ @XmlAttribute
protected Integer b;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the l property.
@@ -209,12 +200,4 @@ public class CTRelativeRect this.b = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java index d74a3527c3..c48e8370b5 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java @@ -25,13 +25,9 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -58,46 +54,42 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTSRgbColor implements Locatable
-{
+public class CTSRgbColor {
@XmlElementRefs({
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
@XmlJavaTypeAdapter(HexBinaryAdapter.class)
protected byte[] val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -117,33 +109,33 @@ public class CTSRgbColor implements Locatable *
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
*
*
@@ -184,19 +176,11 @@ public class CTSRgbColor implements Locatable *
*/
public void setVal(byte[] value) {
- this.val = value;
+ this.val = ((byte[]) value);
}
public boolean isSetVal() {
return (this.val!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java index 80d88ccc60..4168027e0c 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -58,49 +54,45 @@ import org.xml.sax.Locator; @XmlType(name = "CT_ScRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTScRgbColor implements Locatable
-{
+public class CTScRgbColor {
@XmlElementRefs({
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "r", required = true)
+ @XmlAttribute(required = true)
protected int r;
- @XmlAttribute(name = "g", required = true)
+ @XmlAttribute(required = true)
protected int g;
- @XmlAttribute(name = "b", required = true)
+ @XmlAttribute(required = true)
protected int b;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -121,33 +113,33 @@ public class CTScRgbColor implements Locatable * <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
*
*
*/
@@ -226,12 +218,4 @@ public class CTScRgbColor implements Locatable return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java index 0f00fd8400..2e8eba1940 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -52,17 +48,12 @@ import org.xml.sax.Locator; "sx",
"sy"
})
-public class CTScale2D
- implements Locatable
-{
+public class CTScale2D {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTRatio sx;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTRatio sy;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the sx property.
@@ -120,12 +111,4 @@ public class CTScale2D return (this.sy!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java index 078e5793d3..b93a16668a 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -56,45 +52,41 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SchemeColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTSchemeColor implements Locatable
-{
+public class CTSchemeColor {
@XmlElementRefs({
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
protected STSchemeColorVal val;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -115,32 +107,32 @@ public class CTSchemeColor implements Locatable * <p>
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
*
*
@@ -188,12 +180,4 @@ public class CTSchemeColor implements Locatable return (this.val!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java index 4ea585716a..7f03d0dac2 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -48,19 +44,14 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTSphereCoords
- implements Locatable
-{
+public class CTSphereCoords {
- @XmlAttribute(name = "lat", required = true)
+ @XmlAttribute(required = true)
protected int lat;
- @XmlAttribute(name = "lon", required = true)
+ @XmlAttribute(required = true)
protected int lon;
- @XmlAttribute(name = "rev", required = true)
+ @XmlAttribute(required = true)
protected int rev;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the lat property.
@@ -122,12 +113,4 @@ public class CTSphereCoords return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java index f91a719507..de94cb2598 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java @@ -25,14 +25,10 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -60,49 +56,45 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SystemColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"egColorTransform"
})
-public class CTSystemColor implements Locatable
-{
+public class CTSystemColor {
@XmlElementRefs({
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
+ @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class),
+ @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class)
})
protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
+ @XmlAttribute(required = true)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String val;
- @XmlAttribute(name = "lastClr")
+ @XmlAttribute
@XmlJavaTypeAdapter(HexBinaryAdapter.class)
protected byte[] lastClr;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the egColorTransform property.
@@ -122,34 +114,34 @@ public class CTSystemColor implements Locatable *
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
* {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
* {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
*
*
*/
@@ -217,19 +209,11 @@ public class CTSystemColor implements Locatable *
*/
public void setLastClr(byte[] value) {
- this.lastClr = value;
+ this.lastClr = ((byte[]) value);
}
public boolean isSetLastClr() {
return (this.lastClr!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java index 2ba4704cfa..dd1dcb501e 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -56,23 +52,18 @@ import org.xml.sax.Locator; "off",
"ext"
})
-public class CTTransform2D
- implements Locatable
-{
+public class CTTransform2D {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTPoint2D off;
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
protected CTPositiveSize2D ext;
- @XmlAttribute(name = "rot")
+ @XmlAttribute
protected Integer rot;
- @XmlAttribute(name = "flipH")
+ @XmlAttribute
protected Boolean flipH;
- @XmlAttribute(name = "flipV")
+ @XmlAttribute
protected Boolean flipV;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the off property.
@@ -238,12 +229,4 @@ public class CTTransform2D this.flipV = null;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java index 53f4b8e038..d7f744ba6c 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java @@ -20,11 +20,7 @@ package org.apache.poi.sl.draw.binding; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -48,19 +44,14 @@ import org.xml.sax.Locator; */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main")
-public class CTVector3D
- implements Locatable
-{
+public class CTVector3D {
- @XmlAttribute(name = "dx", required = true)
+ @XmlAttribute(required = true)
protected long dx;
- @XmlAttribute(name = "dy", required = true)
+ @XmlAttribute(required = true)
protected long dy;
- @XmlAttribute(name = "dz", required = true)
+ @XmlAttribute(required = true)
protected long dz;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the dx property.
@@ -122,12 +113,4 @@ public class CTVector3D return true;
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java index e316f77832..2b22a58814 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java @@ -21,13 +21,9 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.sun.xml.internal.bind.Locatable;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
-import org.xml.sax.Locator;
/**
@@ -59,28 +55,24 @@ import org.xml.sax.Locator; @XmlType(name = "CT_XYAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", propOrder = {
"pos"
})
-public class CTXYAdjustHandle implements Locatable
-{
+public class CTXYAdjustHandle {
@XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", required = true)
protected CTAdjPoint2D pos;
- @XmlAttribute(name = "gdRefX")
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String gdRefX;
- @XmlAttribute(name = "minX")
+ @XmlAttribute
protected String minX;
- @XmlAttribute(name = "maxX")
+ @XmlAttribute
protected String maxX;
- @XmlAttribute(name = "gdRefY")
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String gdRefY;
- @XmlAttribute(name = "minY")
+ @XmlAttribute
protected String minY;
- @XmlAttribute(name = "maxY")
+ @XmlAttribute
protected String maxY;
- @XmlLocation
- @XmlTransient
- protected Locator locator;
/**
* Gets the value of the pos property.
@@ -278,12 +270,4 @@ public class CTXYAdjustHandle implements Locatable return (this.maxY!= null);
}
- public Locator sourceLocation() {
- return locator;
- }
-
- public void setSourceLocation(Locator newLocator) {
- locator = newLocator;
- }
-
}
diff --git a/src/scratchpad/src/org/apache/poi/sl/draw/binding/ObjectFactory.java b/src/scratchpad/src/org/apache/poi/sl/draw/binding/ObjectFactory.java index d5c0d65f81..c8c8c19d87 100644 --- a/src/scratchpad/src/org/apache/poi/sl/draw/binding/ObjectFactory.java +++ b/src/scratchpad/src/org/apache/poi/sl/draw/binding/ObjectFactory.java @@ -40,34 +40,34 @@ import javax.xml.namespace.QName; @XmlRegistry
public class ObjectFactory {
- private final static QName _CTHslColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");
- private final static QName _CTHslColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");
- private final static QName _CTHslColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");
- private final static QName _CTHslColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");
- private final static QName _CTHslColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");
- private final static QName _CTHslColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");
- private final static QName _CTHslColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");
- private final static QName _CTHslColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");
- private final static QName _CTHslColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");
- private final static QName _CTHslColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");
- private final static QName _CTHslColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");
- private final static QName _CTHslColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");
- private final static QName _CTHslColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");
- private final static QName _CTHslColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");
- private final static QName _CTHslColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");
- private final static QName _CTHslColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");
- private final static QName _CTHslColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");
- private final static QName _CTHslColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");
- private final static QName _CTHslColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");
- private final static QName _CTHslColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");
- private final static QName _CTHslColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");
- private final static QName _CTHslColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");
- private final static QName _CTHslColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");
- private final static QName _CTHslColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");
- private final static QName _CTHslColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");
- private final static QName _CTHslColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");
- private final static QName _CTHslColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");
- private final static QName _CTHslColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");
+ private final static QName _CTScRgbColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");
+ private final static QName _CTScRgbColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");
+ private final static QName _CTScRgbColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");
+ private final static QName _CTScRgbColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");
+ private final static QName _CTScRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");
+ private final static QName _CTScRgbColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");
+ private final static QName _CTScRgbColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");
+ private final static QName _CTScRgbColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");
+ private final static QName _CTScRgbColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");
+ private final static QName _CTScRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");
+ private final static QName _CTScRgbColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");
+ private final static QName _CTScRgbColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");
+ private final static QName _CTScRgbColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");
+ private final static QName _CTScRgbColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");
+ private final static QName _CTScRgbColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");
+ private final static QName _CTScRgbColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");
+ private final static QName _CTScRgbColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");
+ private final static QName _CTScRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");
+ private final static QName _CTScRgbColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");
+ private final static QName _CTScRgbColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");
+ private final static QName _CTScRgbColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");
+ private final static QName _CTScRgbColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");
+ private final static QName _CTScRgbColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");
+ private final static QName _CTScRgbColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");
+ private final static QName _CTScRgbColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");
+ private final static QName _CTScRgbColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");
+ private final static QName _CTScRgbColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");
+ private final static QName _CTScRgbColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.poi.sl.draw.binding
@@ -77,957 +77,957 @@ public class ObjectFactory { }
/**
- * Create an instance of {@link CTPath2DQuadBezierTo }
+ * Create an instance of {@link CTOfficeArtExtensionList }
*
*/
- public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {
- return new CTPath2DQuadBezierTo();
+ public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {
+ return new CTOfficeArtExtensionList();
}
/**
- * Create an instance of {@link CTCustomGeometry2D }
+ * Create an instance of {@link CTPresetGeometry2D }
*
*/
- public CTCustomGeometry2D createCTCustomGeometry2D() {
- return new CTCustomGeometry2D();
+ public CTPresetGeometry2D createCTPresetGeometry2D() {
+ return new CTPresetGeometry2D();
}
/**
- * Create an instance of {@link CTPolarAdjustHandle }
+ * Create an instance of {@link CTPath2D }
*
*/
- public CTPolarAdjustHandle createCTPolarAdjustHandle() {
- return new CTPolarAdjustHandle();
+ public CTPath2D createCTPath2D() {
+ return new CTPath2D();
}
/**
- * Create an instance of {@link CTPath2DClose }
+ * Create an instance of {@link CTVector3D }
*
*/
- public CTPath2DClose createCTPath2DClose() {
- return new CTPath2DClose();
+ public CTVector3D createCTVector3D() {
+ return new CTVector3D();
}
/**
- * Create an instance of {@link CTPoint2D }
+ * Create an instance of {@link CTGammaTransform }
*
*/
- public CTPoint2D createCTPoint2D() {
- return new CTPoint2D();
+ public CTGammaTransform createCTGammaTransform() {
+ return new CTGammaTransform();
}
/**
- * Create an instance of {@link CTInverseTransform }
+ * Create an instance of {@link CTColorMRU }
*
*/
- public CTInverseTransform createCTInverseTransform() {
- return new CTInverseTransform();
+ public CTColorMRU createCTColorMRU() {
+ return new CTColorMRU();
}
/**
- * Create an instance of {@link CTPercentage }
+ * Create an instance of {@link CTEmbeddedWAVAudioFile }
*
*/
- public CTPercentage createCTPercentage() {
- return new CTPercentage();
+ public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {
+ return new CTEmbeddedWAVAudioFile();
}
/**
- * Create an instance of {@link CTSystemColor }
+ * Create an instance of {@link CTPath2DQuadBezierTo }
*
*/
- public CTSystemColor createCTSystemColor() {
- return new CTSystemColor();
+ public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {
+ return new CTPath2DQuadBezierTo();
}
/**
- * Create an instance of {@link CTConnectionSite }
+ * Create an instance of {@link CTScRgbColor }
*
*/
- public CTConnectionSite createCTConnectionSite() {
- return new CTConnectionSite();
+ public CTScRgbColor createCTScRgbColor() {
+ return new CTScRgbColor();
}
/**
- * Create an instance of {@link CTColor }
+ * Create an instance of {@link CTPositiveFixedAngle }
*
*/
- public CTColor createCTColor() {
- return new CTColor();
+ public CTPositiveFixedAngle createCTPositiveFixedAngle() {
+ return new CTPositiveFixedAngle();
}
/**
- * Create an instance of {@link CTPositiveFixedAngle }
+ * Create an instance of {@link CTGeomGuide }
*
*/
- public CTPositiveFixedAngle createCTPositiveFixedAngle() {
- return new CTPositiveFixedAngle();
+ public CTGeomGuide createCTGeomGuide() {
+ return new CTGeomGuide();
}
/**
- * Create an instance of {@link CTFixedPercentage }
+ * Create an instance of {@link CTConnectionSiteList }
*
*/
- public CTFixedPercentage createCTFixedPercentage() {
- return new CTFixedPercentage();
+ public CTConnectionSiteList createCTConnectionSiteList() {
+ return new CTConnectionSiteList();
}
/**
- * Create an instance of {@link CTHslColor }
+ * Create an instance of {@link CTPercentage }
*
*/
- public CTHslColor createCTHslColor() {
- return new CTHslColor();
+ public CTPercentage createCTPercentage() {
+ return new CTPercentage();
}
/**
- * Create an instance of {@link CTConnection }
+ * Create an instance of {@link CTPositiveFixedPercentage }
*
*/
- public CTConnection createCTConnection() {
- return new CTConnection();
+ public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {
+ return new CTPositiveFixedPercentage();
}
/**
- * Create an instance of {@link CTPath2DLineTo }
+ * Create an instance of {@link CTPath2DMoveTo }
*
*/
- public CTPath2DLineTo createCTPath2DLineTo() {
- return new CTPath2DLineTo();
+ public CTPath2DMoveTo createCTPath2DMoveTo() {
+ return new CTPath2DMoveTo();
}
/**
- * Create an instance of {@link CTTransform2D }
+ * Create an instance of {@link CTPath2DList }
*
*/
- public CTTransform2D createCTTransform2D() {
- return new CTTransform2D();
+ public CTPath2DList createCTPath2DList() {
+ return new CTPath2DList();
}
/**
- * Create an instance of {@link CTPositivePercentage }
+ * Create an instance of {@link CTCustomGeometry2D }
*
*/
- public CTPositivePercentage createCTPositivePercentage() {
- return new CTPositivePercentage();
+ public CTCustomGeometry2D createCTCustomGeometry2D() {
+ return new CTCustomGeometry2D();
}
/**
- * Create an instance of {@link CTVector3D }
+ * Create an instance of {@link CTConnectionSite }
*
*/
- public CTVector3D createCTVector3D() {
- return new CTVector3D();
+ public CTConnectionSite createCTConnectionSite() {
+ return new CTConnectionSite();
}
/**
- * Create an instance of {@link CTSphereCoords }
+ * Create an instance of {@link CTGrayscaleTransform }
*
*/
- public CTSphereCoords createCTSphereCoords() {
- return new CTSphereCoords();
+ public CTGrayscaleTransform createCTGrayscaleTransform() {
+ return new CTGrayscaleTransform();
}
/**
- * Create an instance of {@link CTPath2D }
+ * Create an instance of {@link CTInverseTransform }
*
*/
- public CTPath2D createCTPath2D() {
- return new CTPath2D();
+ public CTInverseTransform createCTInverseTransform() {
+ return new CTInverseTransform();
}
/**
- * Create an instance of {@link CTGroupTransform2D }
+ * Create an instance of {@link CTPositiveSize2D }
*
*/
- public CTGroupTransform2D createCTGroupTransform2D() {
- return new CTGroupTransform2D();
+ public CTPositiveSize2D createCTPositiveSize2D() {
+ return new CTPositiveSize2D();
}
/**
- * Create an instance of {@link CTGrayscaleTransform }
+ * Create an instance of {@link CTRelativeRect }
*
*/
- public CTGrayscaleTransform createCTGrayscaleTransform() {
- return new CTGrayscaleTransform();
+ public CTRelativeRect createCTRelativeRect() {
+ return new CTRelativeRect();
}
/**
- * Create an instance of {@link CTRatio }
+ * Create an instance of {@link CTPolarAdjustHandle }
*
*/
- public CTRatio createCTRatio() {
- return new CTRatio();
+ public CTPolarAdjustHandle createCTPolarAdjustHandle() {
+ return new CTPolarAdjustHandle();
}
/**
- * Create an instance of {@link CTSRgbColor }
+ * Create an instance of {@link CTRatio }
*
*/
- public CTSRgbColor createCTSRgbColor() {
- return new CTSRgbColor();
+ public CTRatio createCTRatio() {
+ return new CTRatio();
}
/**
- * Create an instance of {@link CTGeomGuideList }
+ * Create an instance of {@link CTInverseGammaTransform }
*
*/
- public CTGeomGuideList createCTGeomGuideList() {
- return new CTGeomGuideList();
+ public CTInverseGammaTransform createCTInverseGammaTransform() {
+ return new CTInverseGammaTransform();
}
/**
- * Create an instance of {@link CTComplementTransform }
+ * Create an instance of {@link CTGroupTransform2D }
*
*/
- public CTComplementTransform createCTComplementTransform() {
- return new CTComplementTransform();
+ public CTGroupTransform2D createCTGroupTransform2D() {
+ return new CTGroupTransform2D();
}
/**
- * Create an instance of {@link CTPath2DCubicBezierTo }
+ * Create an instance of {@link CTGeomRect }
*
*/
- public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {
- return new CTPath2DCubicBezierTo();
+ public CTGeomRect createCTGeomRect() {
+ return new CTGeomRect();
}
/**
- * Create an instance of {@link CTXYAdjustHandle }
+ * Create an instance of {@link CTSystemColor }
*
*/
- public CTXYAdjustHandle createCTXYAdjustHandle() {
- return new CTXYAdjustHandle();
+ public CTSystemColor createCTSystemColor() {
+ return new CTSystemColor();
}
/**
- * Create an instance of {@link CTPresetColor }
+ * Create an instance of {@link CTAdjPoint2D }
*
*/
- public CTPresetColor createCTPresetColor() {
- return new CTPresetColor();
+ public CTAdjPoint2D createCTAdjPoint2D() {
+ return new CTAdjPoint2D();
}
/**
- * Create an instance of {@link CTOfficeArtExtension }
+ * Create an instance of {@link CTPath2DCubicBezierTo }
*
*/
- public CTOfficeArtExtension createCTOfficeArtExtension() {
- return new CTOfficeArtExtension();
+ public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {
+ return new CTPath2DCubicBezierTo();
}
/**
- * Create an instance of {@link CTSchemeColor }
+ * Create an instance of {@link CTPath2DArcTo }
*
*/
- public CTSchemeColor createCTSchemeColor() {
- return new CTSchemeColor();
+ public CTPath2DArcTo createCTPath2DArcTo() {
+ return new CTPath2DArcTo();
}
/**
- * Create an instance of {@link CTConnectionSiteList }
+ * Create an instance of {@link CTGeomGuideList }
*
*/
- public CTConnectionSiteList createCTConnectionSiteList() {
- return new CTConnectionSiteList();
+ public CTGeomGuideList createCTGeomGuideList() {
+ return new CTGeomGuideList();
}
/**
- * Create an instance of {@link CTPath2DArcTo }
+ * Create an instance of {@link CTAdjustHandleList }
*
*/
- public CTPath2DArcTo createCTPath2DArcTo() {
- return new CTPath2DArcTo();
+ public CTAdjustHandleList createCTAdjustHandleList() {
+ return new CTAdjustHandleList();
}
/**
- * Create an instance of {@link CTPath2DList }
+ * Create an instance of {@link CTPath2DClose }
*
*/
- public CTPath2DList createCTPath2DList() {
- return new CTPath2DList();
+ public CTPath2DClose createCTPath2DClose() {
+ return new CTPath2DClose();
}
/**
- * Create an instance of {@link CTAngle }
+ * Create an instance of {@link CTPresetTextShape }
*
*/
- public CTAngle createCTAngle() {
- return new CTAngle();
+ public CTPresetTextShape createCTPresetTextShape() {
+ return new CTPresetTextShape();
}
/**
- * Create an instance of {@link CTScale2D }
+ * Create an instance of {@link CTConnection }
*
*/
- public CTScale2D createCTScale2D() {
- return new CTScale2D();
+ public CTConnection createCTConnection() {
+ return new CTConnection();
}
/**
- * Create an instance of {@link CTPositiveSize2D }
+ * Create an instance of {@link CTSRgbColor }
*
*/
- public CTPositiveSize2D createCTPositiveSize2D() {
- return new CTPositiveSize2D();
+ public CTSRgbColor createCTSRgbColor() {
+ return new CTSRgbColor();
}
/**
- * Create an instance of {@link CTOfficeArtExtensionList }
+ * Create an instance of {@link CTPositivePercentage }
*
*/
- public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {
- return new CTOfficeArtExtensionList();
+ public CTPositivePercentage createCTPositivePercentage() {
+ return new CTPositivePercentage();
}
/**
- * Create an instance of {@link CTHyperlink }
+ * Create an instance of {@link CTComplementTransform }
*
*/
- public CTHyperlink createCTHyperlink() {
- return new CTHyperlink();
+ public CTComplementTransform createCTComplementTransform() {
+ return new CTComplementTransform();
}
/**
- * Create an instance of {@link CTPoint3D }
+ * Create an instance of {@link CTScale2D }
*
*/
- public CTPoint3D createCTPoint3D() {
- return new CTPoint3D();
+ public CTScale2D createCTScale2D() {
+ return new CTScale2D();
}
/**
- * Create an instance of {@link CTInverseGammaTransform }
+ * Create an instance of {@link CTFixedPercentage }
*
*/
- public CTInverseGammaTransform createCTInverseGammaTransform() {
- return new CTInverseGammaTransform();
+ public CTFixedPercentage createCTFixedPercentage() {
+ return new CTFixedPercentage();
}
/**
- * Create an instance of {@link CTPositiveFixedPercentage }
+ * Create an instance of {@link CTPoint2D }
*
*/
- public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {
- return new CTPositiveFixedPercentage();
+ public CTPoint2D createCTPoint2D() {
+ return new CTPoint2D();
}
/**
- * Create an instance of {@link CTGeomRect }
+ * Create an instance of {@link CTColor }
*
*/
- public CTGeomRect createCTGeomRect() {
- return new CTGeomRect();
+ public CTColor createCTColor() {
+ return new CTColor();
}
/**
- * Create an instance of {@link CTPresetTextShape }
+ * Create an instance of {@link CTPoint3D }
*
*/
- public CTPresetTextShape createCTPresetTextShape() {
- return new CTPresetTextShape();
+ public CTPoint3D createCTPoint3D() {
+ return new CTPoint3D();
}
/**
- * Create an instance of {@link CTColorMRU }
+ * Create an instance of {@link CTHslColor }
*
*/
- public CTColorMRU createCTColorMRU() {
- return new CTColorMRU();
+ public CTHslColor createCTHslColor() {
+ return new CTHslColor();
}
/**
- * Create an instance of {@link CTPath2DMoveTo }
+ * Create an instance of {@link CTTransform2D }
*
*/
- public CTPath2DMoveTo createCTPath2DMoveTo() {
- return new CTPath2DMoveTo();
+ public CTTransform2D createCTTransform2D() {
+ return new CTTransform2D();
}
/**
- * Create an instance of {@link CTEmbeddedWAVAudioFile }
+ * Create an instance of {@link CTOfficeArtExtension }
*
*/
- public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {
- return new CTEmbeddedWAVAudioFile();
+ public CTOfficeArtExtension createCTOfficeArtExtension() {
+ return new CTOfficeArtExtension();
}
/**
- * Create an instance of {@link CTScRgbColor }
+ * Create an instance of {@link CTSchemeColor }
*
*/
- public CTScRgbColor createCTScRgbColor() {
- return new CTScRgbColor();
+ public CTSchemeColor createCTSchemeColor() {
+ return new CTSchemeColor();
}
/**
- * Create an instance of {@link CTPresetGeometry2D }
+ * Create an instance of {@link CTSphereCoords }
*
*/
- public CTPresetGeometry2D createCTPresetGeometry2D() {
- return new CTPresetGeometry2D();
+ public CTSphereCoords createCTSphereCoords() {
+ return new CTSphereCoords();
}
/**
- * Create an instance of {@link CTGeomGuide }
+ * Create an instance of {@link CTXYAdjustHandle }
*
*/
- public CTGeomGuide createCTGeomGuide() {
- return new CTGeomGuide();
+ public CTXYAdjustHandle createCTXYAdjustHandle() {
+ return new CTXYAdjustHandle();
}
/**
- * Create an instance of {@link CTRelativeRect }
+ * Create an instance of {@link CTHyperlink }
*
*/
- public CTRelativeRect createCTRelativeRect() {
- return new CTRelativeRect();
+ public CTHyperlink createCTHyperlink() {
+ return new CTHyperlink();
}
/**
- * Create an instance of {@link CTAdjustHandleList }
+ * Create an instance of {@link CTPath2DLineTo }
*
*/
- public CTAdjustHandleList createCTAdjustHandleList() {
- return new CTAdjustHandleList();
+ public CTPath2DLineTo createCTPath2DLineTo() {
+ return new CTPath2DLineTo();
}
/**
- * Create an instance of {@link CTAdjPoint2D }
+ * Create an instance of {@link CTPresetColor }
*
*/
- public CTAdjPoint2D createCTAdjPoint2D() {
- return new CTAdjPoint2D();
+ public CTPresetColor createCTPresetColor() {
+ return new CTPresetColor();
}
/**
- * Create an instance of {@link CTGammaTransform }
+ * Create an instance of {@link CTAngle }
*
*/
- public CTGammaTransform createCTGammaTransform() {
- return new CTGammaTransform();
+ public CTAngle createCTAngle() {
+ return new CTAngle();
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)
- public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)
+ public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)
+ public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)
- public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)
- public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)
- public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)
- public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)
+ public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)
- public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)
+ public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)
+ public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)
- public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)
+ public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)
+ public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)
- public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)
+ public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)
+ public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)
+ public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)
- public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)
+ public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)
- public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)
+ public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)
- public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)
+ public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)
- public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)
+ public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)
+ public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)
+ public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)
+ public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)
+ public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1036,7 +1036,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)
public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);
}
/**
@@ -1045,25 +1045,25 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)
public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)
- public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)
+ public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)
+ public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
}
/**
@@ -1072,7 +1072,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)
public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1081,25 +1081,25 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)
+ public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);
}
/**
@@ -1108,7 +1108,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1117,25 +1117,25 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)
+ public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)
+ public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1144,7 +1144,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1153,7 +1153,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1162,7 +1162,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1171,7 +1171,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)
public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);
}
/**
@@ -1180,7 +1180,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)
public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1189,7 +1189,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1198,7 +1198,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)
public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);
}
/**
@@ -1207,7 +1207,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1216,7 +1216,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)
public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1225,7 +1225,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1234,7 +1234,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)
public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);
}
/**
@@ -1243,7 +1243,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)
public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
}
/**
@@ -1252,7 +1252,7 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)
public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
}
/**
@@ -1261,763 +1261,763 @@ public class ObjectFactory { */
@XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)
public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)
- public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)
+ public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)
+ public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)
- public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)
+ public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)
+ public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)
- public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)
- public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)
+ public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)
- public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)
+ public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)
+ public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)
+ public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)
+ public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)
- public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)
+ public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)
+ public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)
- public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)
- public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)
- public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)
+ public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)
- public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)
+ public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)
+ public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)
+ public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)
+ public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)
- public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {
- return new JAXBElement<CTGammaTransform>(_CTHslColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)
+ public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {
+ return new JAXBElement<CTGammaTransform>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<CTInverseGammaTransform>(_CTHslColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)
+ public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {
+ return new JAXBElement<CTInverseGammaTransform>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)
- public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)
- public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<CTFixedPercentage>(_CTHslColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {
+ return new JAXBElement<CTFixedPercentage>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<CTPositiveFixedAngle>(_CTHslColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {
+ return new JAXBElement<CTPositiveFixedAngle>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)
- public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {
- return new JAXBElement<CTAngle>(_CTHslColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {
+ return new JAXBElement<CTAngle>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)
- public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {
- return new JAXBElement<CTInverseTransform>(_CTHslColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)
+ public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {
+ return new JAXBElement<CTInverseTransform>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<CTPositiveFixedPercentage>(_CTHslColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {
+ return new JAXBElement<CTPositiveFixedPercentage>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)
- public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {
- return new JAXBElement<CTComplementTransform>(_CTHslColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)
+ public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {
+ return new JAXBElement<CTComplementTransform>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {
- return new JAXBElement<CTPercentage>(_CTHslColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)
+ public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {
+ return new JAXBElement<CTPercentage>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)
- public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<CTPositivePercentage>(_CTHslColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)
+ public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {
+ return new JAXBElement<CTPositivePercentage>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<CTGrayscaleTransform>(_CTHslColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);
+ @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)
+ public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {
+ return new JAXBElement<CTGrayscaleTransform>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);
}
}
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 index 0000000000..3a68313499 --- /dev/null +++ b/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoNumberingScheme.java @@ -0,0 +1,287 @@ +/* ====================================================================
+ 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.sl.usermodel;
+
+public enum AutoNumberingScheme {
+ /** Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ... */
+ alphaLcParenBoth(0x0008, 1),
+ /** Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ... */
+ alphaUcParenBoth(0x000A, 2),
+ /** Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ... */
+ alphaLcParenRight(0x0009, 3),
+ /** Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ... */
+ alphaUcParenRight(0x000B, 4),
+ /** Lowercase Latin character followed by a period. Example: a., b., c., ... */
+ alphaLcPeriod(0x0000, 5),
+ /** Uppercase Latin character followed by a period. Example: A., B., C., ... */
+ alphaUcPeriod(0x0001, 6),
+ /** Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ... */
+ arabicParenBoth(0x000C, 7),
+ /** Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ... */
+ arabicParenRight(0x0002, 8),
+ /** Arabic numeral followed by a period. Example: 1., 2., 3., ... */
+ arabicPeriod(0x0003, 9),
+ /** Arabic numeral. Example: 1, 2, 3, ... */
+ arabicPlain(0x000D, 10),
+ /** Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ... */
+ romanLcParenBoth(0x0004, 11),
+ /** Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ... */
+ romanUcParenBoth(0x000E, 12),
+ /** Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ... */
+ romanLcParenRight(0x0005, 13),
+ /** Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), .... */
+ romanUcParenRight(0x000F, 14),
+ /** Lowercase Roman numeral followed by a period. Example: i., ii., iii., ... */
+ romanLcPeriod(0x0006, 15),
+ /** Uppercase Roman numeral followed by a period. Example: I., II., III., ... */
+ romanUcPeriod(0x0007, 16),
+ /** Double byte circle numbers. */
+ circleNumDbPlain(0x0012, 17),
+ /** Wingdings black circle numbers. */
+ circleNumWdBlackPlain(0x0014, 18),
+ /** Wingdings white circle numbers. */
+ circleNumWdWhitePlain(0x0013, 19),
+ /** Double-byte Arabic numbers with double-byte period. */
+ arabicDbPeriod(0x001D, 20),
+ /** Double-byte Arabic numbers. */
+ arabicDbPlain(0x001C, 21),
+ /** Simplified Chinese with single-byte period. */
+ ea1ChsPeriod(0x0011, 22),
+ /** Simplified Chinese. */
+ ea1ChsPlain(0x0010, 23),
+ /** Traditional Chinese with single-byte period. */
+ ea1ChtPeriod(0x0015, 24),
+ /** Traditional Chinese. */
+ ea1ChtPlain(0x0014, 25),
+ /** Japanese with double-byte period. */
+ ea1JpnChsDbPeriod(0x0026, 26),
+ /** Japanese/Korean. */
+ ea1JpnKorPlain(0x001A, 27),
+ /** Japanese/Korean with single-byte period. */
+ ea1JpnKorPeriod(0x001B, 28),
+ /** Bidi Arabic 1 (AraAlpha) with ANSI minus symbol. */
+ arabic1Minus(0x0017, 29),
+ /** Bidi Arabic 2 (AraAbjad) with ANSI minus symbol. */
+ arabic2Minus(0x0018, 30),
+ /** Bidi Hebrew 2 with ANSI minus symbol. */
+ hebrew2Minus(0x0019, 31),
+ /** Thai alphabetic character followed by a period. */
+ thaiAlphaPeriod(0x001E, 32),
+ /** Thai alphabetic character followed by a closing parenthesis. */
+ thaiAlphaParenRight(0x001F, 33),
+ /** Thai alphabetic character enclosed by parentheses. */
+ thaiAlphaParenBoth(0x0020, 34),
+ /** Thai numeral followed by a period. */
+ thaiNumPeriod(0x0021, 35),
+ /** Thai numeral followed by a closing parenthesis. */
+ thaiNumParenRight(0x0022, 36),
+ /** Thai numeral enclosed in parentheses. */
+ thaiNumParenBoth(0x0023, 37),
+ /** Hindi alphabetic character followed by a period. */
+ hindiAlphaPeriod(0x0024, 38),
+ /** Hindi numeric character followed by a period. */
+ hindiNumPeriod(0x0025, 39),
+ /** Hindi numeric character followed by a closing parenthesis. */
+ hindiNumParenRight(0x0027, 40),
+ /** Hindi alphabetic character followed by a period. */
+ hindiAlpha1Period(0x0027, 41);
+
+ public final int nativeId, ooxmlId;
+
+ AutoNumberingScheme(int nativeId, int ooxmlId) {
+ this.nativeId = nativeId;
+ this.ooxmlId = ooxmlId;
+ }
+
+ public static AutoNumberingScheme forNativeID(int nativeId) {
+ for (AutoNumberingScheme ans : values()) {
+ if (ans.nativeId == nativeId) return ans;
+ }
+ return null;
+ }
+
+ public static AutoNumberingScheme forOoxmlID(int ooxmlId) {
+ for (AutoNumberingScheme ans : values()) {
+ if (ans.ooxmlId == ooxmlId) return ans;
+ }
+ return null;
+ }
+
+ public String getDescription() {
+ switch (this) {
+ case alphaLcPeriod : return "Lowercase Latin character followed by a period. Example: a., b., c., ...";
+ case alphaUcPeriod : return "Uppercase Latin character followed by a period. Example: A., B., C., ...";
+ case arabicParenRight : return "Arabic numeral followed by a closing parenthesis. Example: 1), 2), 3), ...";
+ case arabicPeriod : return "Arabic numeral followed by a period. Example: 1., 2., 3., ...";
+ case romanLcParenBoth : return "Lowercase Roman numeral enclosed in parentheses. Example: (i), (ii), (iii), ...";
+ case romanLcParenRight : return "Lowercase Roman numeral followed by a closing parenthesis. Example: i), ii), iii), ...";
+ case romanLcPeriod : return "Lowercase Roman numeral followed by a period. Example: i., ii., iii., ...";
+ case romanUcPeriod : return "Uppercase Roman numeral followed by a period. Example: I., II., III., ...";
+ case alphaLcParenBoth : return "Lowercase alphabetic character enclosed in parentheses. Example: (a), (b), (c), ...";
+ case alphaLcParenRight : return "Lowercase alphabetic character followed by a closing parenthesis. Example: a), b), c), ...";
+ case alphaUcParenBoth : return "Uppercase alphabetic character enclosed in parentheses. Example: (A), (B), (C), ...";
+ case alphaUcParenRight : return "Uppercase alphabetic character followed by a closing parenthesis. Example: A), B), C), ...";
+ case arabicParenBoth : return "Arabic numeral enclosed in parentheses. Example: (1), (2), (3), ...";
+ case arabicPlain : return "Arabic numeral. Example: 1, 2, 3, ...";
+ case romanUcParenBoth : return "Uppercase Roman numeral enclosed in parentheses. Example: (I), (II), (III), ...";
+ case romanUcParenRight : return "Uppercase Roman numeral followed by a closing parenthesis. Example: I), II), III), ...";
+ case ea1ChsPlain : return "Simplified Chinese.";
+ case ea1ChsPeriod : return "Simplified Chinese with single-byte period.";
+ case circleNumDbPlain : return "Double byte circle numbers.";
+ case circleNumWdWhitePlain : return "Wingdings white circle numbers.";
+ case circleNumWdBlackPlain : return "Wingdings black circle numbers.";
+ case ea1ChtPlain : return "Traditional Chinese.";
+ case ea1ChtPeriod : return "Traditional Chinese with single-byte period.";
+ case arabic1Minus : return "Bidi Arabic 1 (AraAlpha) with ANSI minus symbol.";
+ case arabic2Minus : return "Bidi Arabic 2 (AraAbjad) with ANSI minus symbol.";
+ case hebrew2Minus : return "Bidi Hebrew 2 with ANSI minus symbol.";
+ case ea1JpnKorPlain : return "Japanese/Korean.";
+ case ea1JpnKorPeriod : return "Japanese/Korean with single-byte period.";
+ case arabicDbPlain : return "Double-byte Arabic numbers.";
+ case arabicDbPeriod : return "Double-byte Arabic numbers with double-byte period.";
+ case thaiAlphaPeriod : return "Thai alphabetic character followed by a period.";
+ case thaiAlphaParenRight : return "Thai alphabetic character followed by a closing parenthesis.";
+ case thaiAlphaParenBoth : return "Thai alphabetic character enclosed by parentheses.";
+ case thaiNumPeriod : return "Thai numeral followed by a period.";
+ case thaiNumParenRight : return "Thai numeral followed by a closing parenthesis.";
+ case thaiNumParenBoth : return "Thai numeral enclosed in parentheses.";
+ case hindiAlphaPeriod : return "Hindi alphabetic character followed by a period.";
+ case hindiNumPeriod : return "Hindi numeric character followed by a period.";
+ case ea1JpnChsDbPeriod : return "Japanese with double-byte period.";
+ case hindiNumParenRight : return "Hindi numeric character followed by a closing parenthesis.";
+ case hindiAlpha1Period : return "Hindi alphabetic character followed by a period.";
+ default : return "Unknown Numbered Scheme";
+ }
+ }
+
+ public String format(int value) {
+ String index = formatIndex(value);
+ String cased = formatCase(index);
+ String seperated = formatSeperator(cased);
+ return seperated;
+ }
+
+ private String formatSeperator(String cased) {
+ String name = name().toLowerCase();
+ if (name.contains("plain")) return cased;
+ if (name.contains("parenright")) return cased+")";
+ if (name.contains("parenboth")) return "("+cased+")";
+ if (name.contains("period")) return cased+".";
+ if (name.contains("minus")) return cased+"-"; // ???
+ return cased;
+ }
+
+ private String formatCase(String index) {
+ String name = name().toLowerCase();
+ if (name.contains("lc")) return index.toLowerCase();
+ if (name.contains("uc")) return index.toUpperCase();
+ return index;
+ }
+
+ private static final String ARABIC_LIST = "0123456789";
+ private static final String ALPHA_LIST = "abcdefghijklmnopqrstuvwxyz";
+ private static final String WINGDINGS_WHITE_LIST =
+ "\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089";
+ private static final String WINGDINGS_BLACK_LIST =
+ "\u008B\u008C\u008D\u008E\u008F\u0090\u0091\u0092\u0093\u0094";
+ private static final String CIRCLE_DB_LIST =
+ "\u2776\u2777\u2778\u2779\u277A\u277B\u277C\u277D\u277E";
+
+ private String formatIndex(int value) {
+ String name = name().toLowerCase();
+ if (name.startsWith("roman")) {
+ return formatRomanIndex(value);
+ } else if (name.startsWith("arabic") && !name.contains("db")) {
+ return getIndexedList(value, ARABIC_LIST, false);
+ } else if (name.startsWith("alpha")) {
+ return getIndexedList(value, ALPHA_LIST, true);
+ } else if (name.contains("WdWhite")) {
+ return (value == 10) ? "\u008A"
+ : getIndexedList(value, WINGDINGS_WHITE_LIST, false);
+ } else if (name.contains("WdBlack")) {
+ return (value == 10) ? "\u0095"
+ : getIndexedList(value, WINGDINGS_BLACK_LIST, false);
+ } else if (name.contains("NumDb")) {
+ return (value == 10) ? "\u277F"
+ : getIndexedList(value, CIRCLE_DB_LIST, true);
+ } else {
+ return "?";
+ }
+ }
+
+ private static String getIndexedList(int val, String list, boolean oneBased) {
+ StringBuilder sb = new StringBuilder();
+ addIndexedChar(val, list, oneBased, sb);
+ return sb.toString();
+ }
+
+ private static void addIndexedChar(int val, String list, boolean oneBased, StringBuilder sb) {
+ if (oneBased) val -= 1;
+ final int len = list.length();
+ if (val >= len) {
+ addIndexedChar(val/len, list, oneBased, sb);
+ }
+ sb.append(list.charAt(val%len));
+ }
+
+
+ private String formatRomanIndex(int value) {
+ //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).
+ final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
+ final String[] ROMAN = new String[]{"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
+ final String conciseList[][] = {
+ {"XLV", "VL"}, //45
+ {"XCV", "VC"}, //95
+ {"CDL", "LD"}, //450
+ {"CML", "LM"}, //950
+ {"CMVC", "LMVL"}, //995
+ {"CDXC", "LDXL"}, //490
+ {"CDVC", "LDVL"}, //495
+ {"CMXC", "LMXL"}, //990
+ {"XCIX", "VCIV"}, //99
+ {"XLIX", "VLIV"}, //49
+ {"XLIX", "IL"}, //49
+ {"XCIX", "IC"}, //99
+ {"CDXC", "XD"}, //490
+ {"CDVC", "XDV"}, //495
+ {"CDIC", "XDIX"}, //499
+ {"LMVL", "XMV"}, //995
+ {"CMIC", "XMIX"}, //999
+ {"CMXC", "XM"}, // 990
+ {"XDV", "VD"}, //495
+ {"XDIX", "VDIV"}, //499
+ {"XMV", "VM"}, // 995
+ {"XMIX", "VMIV"}, //999
+ {"VDIV", "ID"}, //499
+ {"VMIV", "IM"} //999
+ };
+
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 13; i++) {
+ while (value >= VALUES[i]) {
+ value -= VALUES[i];
+ sb.append(ROMAN[i]);
+ }
+ }
+ String result = sb.toString();
+ for (String cc[] : conciseList) {
+ result = result.replace(cc[0], cc[1]);
+ }
+ return result;
+ }
+}
\ No newline at end of file diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java index e85eee140b..a914dd7cb3 100644 --- a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java +++ b/src/scratchpad/src/org/apache/poi/sl/usermodel/TextParagraph.java @@ -114,6 +114,13 @@ public interface TextParagraph<T extends TextRun> extends Iterable<T> { */
Double getBulletFontSize();
Color getBulletFontColor();
+
+ AutoNumberingScheme getAutoNumberingScheme();
+ /**
+ * Index (1-based) of the first auto number value, or null if auto numbering scheme
+ * wasn't assigned.
+ */
+ Integer getAutoNumberingStartAt();
}
/**
@@ -218,13 +225,28 @@ public interface TextParagraph<T extends TextRun> extends Iterable<T> { * or null, if unset
*/
Double getIndent();
-
+
/**
* Specifies the indent size that will be applied to the first line of text in the paragraph.
*
* @param indent the indent (in points) applied to the first line of text in the paragraph
*/
void setIndent(Double indent);
+
+
+ /**
+ * @return the text level of this paragraph (0-based). Default is 0.
+ */
+ int getIndentLevel();
+
+ /**
+ * Specifies the particular level text properties that this paragraph will follow.
+ * The value for this attribute formats the text according to the corresponding level
+ * paragraph properties defined in the SlideMaster.
+ *
+ * @param level the level (0 ... 4)
+ */
+ void setIndentLevel(int level);
/**
* Returns the vertical line spacing that is to be used within a paragraph.
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java index 55a4ca8bbd..e17e2bea9a 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java @@ -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)); } diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java index 9695a9d053..e54da298ff 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java @@ -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()); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java index 9a096c18ed..297f57c61c 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java @@ -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()); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java index 5ad2bac1c4..70b712b761 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java @@ -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)) { diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java index 4733999d49..14200d5018 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java @@ -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; |