Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java Wed Jul 8 00:09:34 2015 @@ -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;
Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java Wed Jul 8 00:09:34 2015 @@ -275,15 +275,7 @@ public abstract class HSLFSheet implemen 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); } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java Wed Jul 8 00:09:34 2015 @@ -263,7 +263,7 @@ public abstract class HSLFSimpleShape ex 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; } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java Wed Jul 8 00:09:34 2015 @@ -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 HSL : 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; Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java Wed Jul 8 00:09:34 2015 @@ -153,15 +153,30 @@ public final class HSLFTable extends HSL 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>>(); Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Wed Jul 8 00:09:34 2015 @@ -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 imp private HSLFSheet _sheet; private int shapeId; - // private StyleTextPropAtom styleTextPropAtom; private StyleTextProp9Atom styleTextProp9Atom; /** @@ -230,7 +230,8 @@ public final class HSLFTextParagraph imp 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 imp } } + 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 imp _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 imp 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 imp 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 imp 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 imp 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()); + } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java Wed Jul 8 00:09:34 2015 @@ -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 implement */ 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()); } /** Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java Wed Jul 8 00:09:34 2015 @@ -516,7 +516,7 @@ public abstract class HSLFTextShape exte } /** - * @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 exte _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 exte // (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); + } } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextParagraph.java Wed Jul 8 00:09:34 2015 @@ -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 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 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 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 // 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 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 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 // 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; Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java Wed Jul 8 00:09:34 2015 @@ -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 Tex 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); Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java Wed Jul 8 00:09:34 2015 @@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTAngle.java Wed Jul 8 00:09:34 2015 @@ -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 Locatabl return true; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColor.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTColorMRU.java Wed Jul 8 00:09:34 2015 @@ -23,11 +23,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTComplementTransform.java Wed Jul 8 00:09:34 2015 @@ -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; - } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnection.java Wed Jul 8 00:09:34 2015 @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSite.java Wed Jul 8 00:09:34 2015 @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTFixedPercentage.java Wed Jul 8 00:09:34 2015 @@ -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 implement return true; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGammaTransform.java Wed Jul 8 00:09:34 2015 @@ -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; - } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuide.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomGuideList.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGeomRect.java Wed Jul 8 00:09:34 2015 @@ -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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java Wed Jul 8 00:09:34 2015 @@ -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; - } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java Wed Jul 8 00:09:34 2015 @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHslColor.java Wed Jul 8 00:09:34 2015 @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAcce 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 Locat * * <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 Locat return true; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTHyperlink.java Wed Jul 8 00:09:34 2015 @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java Wed Jul 8 00:09:34 2015 @@ -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; - } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTInverseTransform.java Wed Jul 8 00:09:34 2015 @@ -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; - } } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java Wed Jul 8 00:09:34 2015 @@ -22,14 +22,10 @@ import javax.xml.bind.annotation.XmlAcce 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; - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
