poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kiwiwi...@apache.org
Subject svn commit: r1692593 [1/17] - in /poi: site/src/documentation/content/xdocs/ trunk/ trunk/src/examples/src/org/apache/poi/hslf/examples/ trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/ trunk/src/examples/src/org/apache/poi/xslf/usermodel...
Date Fri, 24 Jul 2015 21:47:58 GMT
Author: kiwiwings
Date: Fri Jul 24 21:47:55 2015
New Revision: 1692593

URL: http://svn.apache.org/r1692593
Log:
merged common_sl branch to trunk

Added:
    poi/trunk/src/java/org/apache/poi/sl/draw/
      - copied from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/draw/
    poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ColorStyle.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/ColorStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/FillStyle.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/FillStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/GroupShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Insets2D.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/Insets2D.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/LineDecoration.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/LineDecoration.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/PaintStyle.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/PaintStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/PictureShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/Shadow.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeType.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/ShapeType.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/TableShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TextParagraph.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/TextParagraph.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/TextShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
    poi/trunk/src/resources/main/org/apache/poi/sl/
      - copied from r1691849, poi/branches/common_sl/src/resources/scratchpad/org/apache/poi/sl/
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
      - copied unchanged from r1691849, poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
      - copied, changed from r1691849, poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
    poi/trunk/src/types/definitions/dml-shapeGeometry.xjb
      - copied, changed from r1691849, poi/branches/common_sl/src/types/definitions/dml-shapeGeometry.xjb
    poi/trunk/test-data/slideshow/54541_cropped_bitmap2.ppt
      - copied unchanged from r1691849, poi/branches/common_sl/test-data/slideshow/54541_cropped_bitmap2.ppt
    poi/trunk/test-data/slideshow/alterman_security2.pptx
      - copied unchanged from r1691849, poi/branches/common_sl/test-data/slideshow/alterman_security2.pptx
    poi/trunk/test-data/slideshow/sample_pptx_grouping_issues.pptx
      - copied unchanged from r1691849, poi/branches/common_sl/test-data/slideshow/sample_pptx_grouping_issues.pptx
Removed:
    poi/trunk/src/java/org/apache/poi/common/usermodel/Fill.java
    poi/trunk/src/java/org/apache/poi/common/usermodel/LineStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Fill.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/LineStyle.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Picture.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeGroup.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeTypes.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TextPainter.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/model/geom/
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/LineCap.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/LineDash.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/LineDecoration.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndLength.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndWidth.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/RenderableShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/TextAlign.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/TextAutofit.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/TextCap.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/TextDirection.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/TextFragment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/VerticalAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeType.java
    poi/trunk/src/resources/ooxml/org/apache/poi/xslf/usermodel/presetShapeDefinitions.xml
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/BitmapPainter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/ImagePainter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/AutoShapes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Background.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/MasterSheet.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Notes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeOutline.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapePainter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeTypes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/SlideMaster.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Table.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TableCell.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextPainter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TitleMaster.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/AlignmentTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/SoundData.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestImagePainter.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java
Modified:
    poi/site/src/documentation/content/xdocs/status.xml
    poi/trunk/   (props changed)
    poi/trunk/build.xml
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java
    poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
    poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/MergePresentations.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/PieChartDemo.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial1.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial3.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial5.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial6.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial7.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step1.java
    poi/trunk/src/examples/src/org/apache/poi/xslf/usermodel/tutorial/Step2.java
    poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java
    poi/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
    poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
    poi/trunk/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java   (contents, props changed)
    poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
    poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
    poi/trunk/src/java/org/apache/poi/ddf/EscherProperties.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
    poi/trunk/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
    poi/trunk/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
    poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
    poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextShape.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
    poi/trunk/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Background.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Line.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureData.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java
    poi/trunk/src/java/org/apache/poi/sl/usermodel/TextRun.java
    poi/trunk/src/java/org/apache/poi/util/HexDump.java
    poi/trunk/src/java/org/apache/poi/util/Units.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/geom/TestPresetGeometries.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Line.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Placeholder.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java

Modified: poi/site/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Fri Jul 24 21:47:55 2015
@@ -39,6 +39,7 @@
     </devs>
 
     <release version="3.13-beta2" date="2015-10-??">
+        <action dev="PD" type="add">Merged common_sl branch to trunk</action>
         <action dev="PD" type="fix" fixes-bug="57571">Fix creating comments for XSSF/SXSSF, regression was introduced via bug 54920</action>
         <action dev="PD" type="fix" fixes-bug="58175">Fix creating comments for XSSF/SXSSF, regression was introduced via bug 54920</action>
         <action dev="PD" type="fix" fixes-bug="58156">Possible data corruption in hasPOIFSHeader and hasOOXMLHeader</action>

Propchange: poi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 24 21:47:55 2015
@@ -1,3 +1,4 @@
+/poi/branches/common_sl:1661320-1691849
 /poi/branches/excelant:1069732-1073692
 /poi/branches/gsoc2012:1341450-1371650
 /poi/branches/xml_signature:1617139-1628347

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Jul 24 21:47:55 2015
@@ -107,6 +107,11 @@ under the License.
     <property name="scratchpad.output.test.dir" location="build/scratchpad-test-classes"/>
     <property name="scratchpad.testokfile" location="build/scratchpad-testokfile.txt"/>
 
+    <!-- Scratchpad/Geometry -->
+	<property name="geometry.pkg" value="org.apache.poi.sl.draw.binding"/>
+	<property name="geometry.output.tmpdir" value="build/geometry-java"/>
+	
+	
     <!-- Examples: -->
     <property name="examples.src" location="src/examples/src"/>
     <property name="examples.output.dir" location="build/examples-classes"/>
@@ -378,6 +383,7 @@ under the License.
         <mkdir dir="${scratchpad.output.dir}"/>
         <mkdir dir="${scratchpad.output.test.dir}"/>
         <mkdir dir="${scratchpad.reports.test}"/>
+    	<mkdir dir="${geometry.output.tmpdir}"/>
         <mkdir dir="${ooxml.output.dir}"/>
         <mkdir dir="${ooxml.output.test.dir}"/>
         <mkdir dir="${ooxml.reports.test}"/>
@@ -702,7 +708,39 @@ under the License.
         </copy>
     </target>
 
-    <target name="compile-scratchpad" depends="compile-main">
+	<target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
+		<delete dir="${geometry.output.tmpdir}"/>
+		<!-- taskdef xjc -->
+		<!-- "D:\Program Files\Java\jdk1.6.0_45\bin\xjc" -p org.apache.poi.sl.model.geom.binding -readOnly -Xlocator -mark-generated ooxml-schemas\dml-shapeGeometry.xsd -->
+		<unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${geometry.output.tmpdir}"/>
+		<exec executable="${env.JAVA_HOME}/bin/xjc">
+			<arg value="-p"/>
+			<arg value="${geometry.pkg}"/>
+			<arg value="-b"/>
+			<arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
+			<arg value="-readOnly"/>
+			<arg value="-npa"/>
+			<arg value="-no-header"/>
+			<!--arg value="-mark-generated"/ -->
+			<!--arg value="-Xlocator"/ -->
+			<arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
+			<arg value="-d"/>
+			<arg file="${geometry.output.tmpdir}"/>
+		</exec>
+		<copy file="src/java/org/apache/poi/POIDocument.java" tofile="${geometry.output.tmpdir}/apache-license.txt">
+			<filterchain>
+			<headfilter lines="16"/>
+			</filterchain>
+		</copy>
+		<copy todir="${main.src}">
+			<fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
+		     <filterchain>
+		         <concatfilter prepend="${geometry.output.tmpdir}/apache-license.txt"/>
+		     </filterchain>
+		</copy>
+	</target>
+	
+	<target name="compile-scratchpad" depends="compile-main,generate-geometry">
         <javac target="${jdk.version.class}"
                source="${jdk.version.source}"
                destdir="${scratchpad.output.dir}"
@@ -1669,7 +1707,7 @@ under the License.
               <exclude name="contrib/testcases/dummy.txt" />
               <exclude name="examples/lib/dummy.txt" />
               <exclude name="resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml" />
-              <exclude name="resources/ooxml/org/apache/poi/xslf/usermodel/presetShapeDefinitions.xml" />
+              <exclude name="resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml" />
               <exclude name="examples/src/org/apache/poi/xslf/usermodel/pie-chart-data.txt" />
            </fileset>
        </rat:report>

Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java Fri Jul 24 21:47:55 2015
@@ -17,13 +17,29 @@
 
 package org.apache.poi.hslf.examples;
 
-import org.apache.poi.hslf.usermodel.*;
-import org.apache.poi.hslf.model.*;
-import org.apache.poi.hslf.record.TextHeaderAtom;
-
-import java.io.IOException;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.io.FileOutputStream;
-import java.awt.*;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.poi.hslf.model.Line;
+import org.apache.poi.hslf.model.PPGraphics2D;
+import org.apache.poi.hslf.record.TextHeaderAtom;
+import org.apache.poi.hslf.usermodel.HSLFAutoShape;
+import org.apache.poi.hslf.usermodel.HSLFGroupShape;
+import org.apache.poi.hslf.usermodel.HSLFSlide;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFTable;
+import org.apache.poi.hslf.usermodel.HSLFTableCell;
+import org.apache.poi.hslf.usermodel.HSLFTextBox;
+import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
+import org.apache.poi.hslf.usermodel.HSLFTextRun;
+import org.apache.poi.sl.usermodel.ShapeType;
+import org.apache.poi.sl.usermodel.VerticalAlignment;
 
 /**
  * Presentation for Fast Feather Track on ApacheconEU 2008
@@ -33,7 +49,7 @@ import java.awt.*;
 public final class ApacheconEU08 {
 
     public static void main(String[] args) throws IOException {
-        SlideShow ppt = new SlideShow();
+        HSLFSlideShow ppt = new HSLFSlideShow();
         ppt.setPageSize(new Dimension(720, 540));
 
         slide1(ppt);
@@ -55,48 +71,43 @@ public final class ApacheconEU08 {
 
     }
 
-    public static void slide1(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide1(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
-        tr1.setText("POI-HSLF");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
+        box1.setText("POI-HSLF");
         box1.setAnchor(new Rectangle(54, 78, 612, 115));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
-        tr2.setText("Java API To Access Microsoft PowerPoint Format Files");
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
+        box2.setText("Java API To Access Microsoft PowerPoint Format Files");
         box2.setAnchor(new Rectangle(108, 204, 504, 138));
         slide.addShape(box2);
 
-        TextBox box3 = new TextBox();
-        TextRun tr3 = box3.getTextRun();
-        tr3.getRichTextRuns()[0].setFontSize(32);
-        box3.setHorizontalAlignment(TextBox.AlignCenter);
-        tr3.setText(
+        HSLFTextBox box3 = new HSLFTextBox();
+        box3.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(32d);
+        box3.setText(
                 "Yegor Kozlov\r" +
                 "yegor - apache - org");
+        box3.setHorizontalCentered(true);
         box3.setAnchor(new Rectangle(206, 348, 310, 84));
         slide.addShape(box3);
     }
 
-    public static void slide2(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide2(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("What is HSLF?");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("What is HSLF?");
         box1.setAnchor(new Rectangle(36, 21, 648, 90));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr2.setText("HorribleSLideshowFormat is the POI Project's pure Java implementation " +
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.BODY_TYPE);
+        box2.setText("HorribleSLideshowFormat is the POI Project's pure Java implementation " +
                 "of the Powerpoint binary file format. \r" +
                 "POI sub-project since 2005\r" +
                 "Started by Nick Birch, Yegor Kozlov joined soon after");
@@ -106,74 +117,66 @@ public final class ApacheconEU08 {
 
     }
 
-    public static void slide3(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide3(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("HSLF in a Nutshell");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("HSLF in a Nutshell");
         box1.setAnchor(new Rectangle(36, 15, 648, 65));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr2.setText(
-                "HSLF provides a way to read, create and modify MS PowerPoint presentations\r" +
-                "Pure Java API - you don't need PowerPoint to read and write *.ppt files\r" +
-                "Comprehensive support of PowerPoint objects");
-        tr2.getRichTextRuns()[0].setFontSize(28);
-        box2.setAnchor(new Rectangle(36, 80, 648, 200));
-        slide.addShape(box2);
-
-        TextBox box3 = new TextBox();
-        TextRun tr3 = box3.getTextRun();
-        tr3.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr3.setText(
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.BODY_TYPE);
+        box2.setText(
+            "HSLF provides a way to read, create and modify MS PowerPoint presentations\r" +
+            "Pure Java API - you don't need PowerPoint to read and write *.ppt files\r" +
+            "Comprehensive support of PowerPoint objects\r" +
                 "Rich text\r" +
                 "Tables\r" +
                 "Shapes\r" +
                 "Pictures\r" +
-                "Master slides");
-        tr3.getRichTextRuns()[0].setFontSize(24);
-        tr3.getRichTextRuns()[0].setIndentLevel(1);
-        box3.setAnchor(new Rectangle(36, 265, 648, 150));
-        slide.addShape(box3);
-
-        TextBox box4 = new TextBox();
-        TextRun tr4 = box4.getTextRun();
-        tr4.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr4.setText("Access to low level data structures");
-        box4.setAnchor(new Rectangle(36, 430, 648, 50));
-        slide.addShape(box4);
+                "Master slides\r" +
+            "Access to low level data structures"
+        );
+
+        List<HSLFTextParagraph> tp = box2.getTextParagraphs();
+        for (int i : new byte[]{0,1,2,8}) {
+            tp.get(i).getTextRuns().get(0).setFontSize(28d);
+        }
+        for (int i : new byte[]{3,4,5,6,7}) {
+            tp.get(i).getTextRuns().get(0).setFontSize(24d);
+            tp.get(i).setIndentLevel(1);
+        }
+        box2.setAnchor(new Rectangle(36, 80, 648, 400));
+        slide.addShape(box2);
     }
 
-    public static void slide4(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide4(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
         String[][] txt1 = {
             {"Note"},
             {"This presentation was created programmatically using POI HSLF"}
         };
-        Table table1 = new Table(2, 1);
+        HSLFTable table1 = new HSLFTable(2, 1);
         for (int i = 0; i < txt1.length; i++) {
             for (int j = 0; j < txt1[i].length; j++) {
-                TableCell cell = table1.getCell(i, j);
+                HSLFTableCell cell = table1.getCell(i, j);
                 cell.setText(txt1[i][j]);
-                cell.getTextRun().getRichTextRuns()[0].setFontSize(10);
-                RichTextRun rt = cell.getTextRun().getRichTextRuns()[0];
-                rt.setFontName("Arial");
+                HSLFTextRun rt = cell.getTextParagraphs().get(0).getTextRuns().get(0);
+                rt.setFontSize(10d);
+                rt.setFontFamily("Arial");
                 rt.setBold(true);
                 if(i == 0){
-                    rt.setFontSize(32);
+                    rt.setFontSize(32d);
                     rt.setFontColor(Color.white);
                     cell.getFill().setForegroundColor(new Color(0, 153, 204));
                 } else {
-                    rt.setFontSize(28);
+                    rt.setFontSize(28d);
                     cell.getFill().setForegroundColor(new Color(235, 239, 241));
                 }
-                cell.setVerticalAlignment(TextBox.AnchorMiddle);
+                cell.setVerticalAlignment(VerticalAlignment.MIDDLE);
             }
         }
 
@@ -194,32 +197,28 @@ public final class ApacheconEU08 {
 
         table1.moveTo(100, 100);
 
-        TextBox box1 = new TextBox();
-        box1.setHorizontalAlignment(TextBox.AlignCenter);
-        TextRun tr1 = box1.getTextRun();
-        tr1.setText("The source code is available at\r" +
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setHorizontalCentered(true);
+        box1.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(24d);
+        box1.setText("The source code is available at\r" +
                 "http://people.apache.org/~yegor/apachecon_eu08/");
-        RichTextRun rt = tr1.getRichTextRuns()[0];
-        rt.setFontSize(24);
         box1.setAnchor(new Rectangle(80, 356, 553, 65));
         slide.addShape(box1);
 
     }
 
-    public static void slide5(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide5(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("HSLF in Action - 1\rData Extraction");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("HSLF in Action - 1\rData Extraction");
         box1.setAnchor(new Rectangle(36, 21, 648, 100));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr2.setText(
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.BODY_TYPE);
+        box2.setText(
                 "Text from slides and notes\r" +
                 "Images\r" +
                 "Shapes and their properties (type, position in the slide, color, font, etc.)");
@@ -229,90 +228,88 @@ public final class ApacheconEU08 {
 
     }
 
-    public static void slide6(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide6(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("HSLF in Action - 2");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("HSLF in Action - 2");
         box1.setAnchor(new Rectangle(36, 20, 648, 90));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.getRichTextRuns()[0].setFontSize(18);
-        tr2.setText("Creating a simple presentation from scratch");
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(18d);
+        box2.setText("Creating a simple presentation from scratch");
         box2.setAnchor(new Rectangle(170, 100, 364, 30));
         slide.addShape(box2);
 
-        TextBox box3 = new TextBox();
-        TextRun tr3 = box3.getTextRun();
-        RichTextRun rt3 = tr3.getRichTextRuns()[0];
-        rt3.setFontName("Courier New");
-        rt3.setFontSize(8);
-        tr3.setText(
-                "        SlideShow ppt = new SlideShow();\r" +
-                "        Slide slide = ppt.createSlide();\r" +
-                "\r" +
-                "        TextBox box2 = new TextBox();\r" +
-                "        box2.setHorizontalAlignment(TextBox.AlignCenter);\r" +
-                "        box2.setVerticalAlignment(TextBox.AnchorMiddle);\r" +
-                "        box2.getTextRun().setText(\"Java Code\");\r" +
-                "        box2.getFill().setForegroundColor(new Color(187, 224, 227));\r" +
-                "        box2.setLineColor(Color.black);\r" +
-                "        box2.setLineWidth(0.75);\r" +
-                "        box2.setAnchor(new Rectangle(66, 243, 170, 170));\r" +
-                "        slide.addShape(box2);\r" +
-                "\r" +
-                "        TextBox box3 = new TextBox();\r" +
-                "        box3.setHorizontalAlignment(TextBox.AlignCenter);\r" +
-                "        box3.setVerticalAlignment(TextBox.AnchorMiddle);\r" +
-                "        box3.getTextRun().setText(\"*.ppt file\");\r" +
-                "        box3.setLineWidth(0.75);\r" +
-                "        box3.setLineColor(Color.black);\r" +
-                "        box3.getFill().setForegroundColor(new Color(187, 224, 227));\r" +
-                "        box3.setAnchor(new Rectangle(473, 243, 170, 170));\r" +
-                "        slide.addShape(box3);\r" +
-                "\r" +
-                "        AutoShape box4 = new AutoShape(ShapeTypes.Arrow);\r" +
-                "        box4.getFill().setForegroundColor(new Color(187, 224, 227));\r" +
-                "        box4.setLineWidth(0.75);\r" +
-                "        box4.setLineColor(Color.black);\r" +
-                "        box4.setAnchor(new Rectangle(253, 288, 198, 85));\r" +
-                "        slide.addShape(box4);\r" +
-                "\r" +
-                "        FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\r" +
-                "        ppt.write(out);\r" +
-                "        out.close();");
+        HSLFTextBox box3 = new HSLFTextBox();
+        HSLFTextRun rt3 = box3.getTextParagraphs().get(0).getTextRuns().get(0);
+        rt3.setFontFamily("Courier New");
+        rt3.setFontSize(8d);
+        box3.setText(
+                "SlideShow ppt = new SlideShow();\u000b" +
+                "Slide slide = ppt.createSlide();\u000b" +
+                "\u000b" +
+                "TextBox box2 = new TextBox();\u000b" +
+                "box2.setHorizontalAlignment(TextBox.AlignCenter);\u000b" +
+                "box2.setVerticalAlignment(TextBox.AnchorMiddle);\u000b" +
+                "box2.getTextRun().setText(\"Java Code\");\u000b" +
+                "box2.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
+                "box2.setLineColor(Color.black);\u000b" +
+                "box2.setLineWidth(0.75);\u000b" +
+                "box2.setAnchor(new Rectangle(66, 243, 170, 170));\u000b" +
+                "slide.addShape(box2);\u000b" +
+                "\u000b" +
+                "TextBox box3 = new TextBox();\u000b" +
+                "box3.setHorizontalAlignment(TextBox.AlignCenter);\u000b" +
+                "box3.setVerticalAlignment(TextBox.AnchorMiddle);\u000b" +
+                "box3.getTextRun().setText(\"*.ppt file\");\u000b" +
+                "box3.setLineWidth(0.75);\u000b" +
+                "box3.setLineColor(Color.black);\u000b" +
+                "box3.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
+                "box3.setAnchor(new Rectangle(473, 243, 170, 170));\u000b" +
+                "slide.addShape(box3);\u000b" +
+                "\u000b" +
+                "AutoShape box4 = new AutoShape(ShapeTypes.Arrow);\u000b" +
+                "box4.getFill().setForegroundColor(new Color(187, 224, 227));\u000b" +
+                "box4.setLineWidth(0.75);\u000b" +
+                "box4.setLineColor(Color.black);\u000b" +
+                "box4.setAnchor(new Rectangle(253, 288, 198, 85));\u000b" +
+                "slide.addShape(box4);\u000b" +
+                "\u000b" +
+                "FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\u000b" +
+                "ppt.write(out);\u000b" +
+                "out.close();");
         box3.setAnchor(new Rectangle(30, 150, 618, 411));
+        box3.setHorizontalCentered(true);
         slide.addShape(box3);
     }
 
-    public static void slide7(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide7(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box2 = new TextBox();
-        box2.setHorizontalAlignment(TextBox.AlignCenter);
-        box2.setVerticalAlignment(TextBox.AnchorMiddle);
-        box2.getTextRun().setText("Java Code");
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setHorizontalCentered(true);
+        box2.setVerticalAlignment(VerticalAlignment.MIDDLE);
+        box2.setText("Java Code");
         box2.getFill().setForegroundColor(new Color(187, 224, 227));
         box2.setLineColor(Color.black);
         box2.setLineWidth(0.75);
         box2.setAnchor(new Rectangle(66, 243, 170, 170));
         slide.addShape(box2);
 
-        TextBox box3 = new TextBox();
-        box3.setHorizontalAlignment(TextBox.AlignCenter);
-        box3.setVerticalAlignment(TextBox.AnchorMiddle);
-        box3.getTextRun().setText("*.ppt file");
+        HSLFTextBox box3 = new HSLFTextBox();
+        box3.setHorizontalCentered(true);
+        box3.setVerticalAlignment(VerticalAlignment.MIDDLE);
+        box3.setText("*.ppt file");
         box3.setLineWidth(0.75);
         box3.setLineColor(Color.black);
         box3.getFill().setForegroundColor(new Color(187, 224, 227));
         box3.setAnchor(new Rectangle(473, 243, 170, 170));
         slide.addShape(box3);
 
-        AutoShape box4 = new AutoShape(ShapeTypes.Arrow);
+        HSLFAutoShape box4 = new HSLFAutoShape(ShapeType.RIGHT_ARROW);
         box4.getFill().setForegroundColor(new Color(187, 224, 227));
         box4.setLineWidth(0.75);
         box4.setLineColor(Color.black);
@@ -320,20 +317,18 @@ public final class ApacheconEU08 {
         slide.addShape(box4);
     }
 
-    public static void slide8(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide8(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("Wait, there is more!");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("Wait, there is more!");
         box1.setAnchor(new Rectangle(36, 21, 648, 90));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr2.setText(
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.BODY_TYPE);
+        box2.setText(
                 "Rich text\r" +
                 "Tables\r" +
                 "Pictures (JPEG, PNG, BMP, WMF, PICT)\r" +
@@ -342,72 +337,70 @@ public final class ApacheconEU08 {
         slide.addShape(box2);
     }
 
-    public static void slide9(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide9(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("HSLF in Action - 3");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("HSLF in Action - 3");
         box1.setAnchor(new Rectangle(36, 20, 648, 50));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.getRichTextRuns()[0].setFontSize(18);
-        tr2.setText("PPGraphics2D: PowerPoint Graphics2D driver");
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.getTextParagraphs().get(0).getTextRuns().get(0).setFontSize(18d);
+        box2.setText("PPGraphics2D: PowerPoint Graphics2D driver");
         box2.setAnchor(new Rectangle(178, 70, 387, 30));
         slide.addShape(box2);
 
-        TextBox box3 = new TextBox();
-        TextRun tr3 = box3.getTextRun();
-        RichTextRun rt3 = tr3.getRichTextRuns()[0];
-        rt3.setFontName("Courier New");
-        rt3.setFontSize(8);
-        tr3.setText(
-                "        //bar chart data. The first value is the bar color, the second is the width\r" +
-                "        Object[] def = new Object[]{\r" +
-                "            Color.yellow, new Integer(100),\r" +
-                "            Color.green, new Integer(150),\r" +
-                "            Color.gray, new Integer(75),\r" +
-                "            Color.red, new Integer(200),\r" +
-                "        };\r" +
-                "\r" +
-                "        SlideShow ppt = new SlideShow();\r" +
-                "        Slide slide = ppt.createSlide();\r" +
-                "\r" +
-                "        ShapeGroup group = new ShapeGroup();\r" +
-                "        //define position of the drawing in the slide\r" +
-                "        Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);\r" +
-                "        group.setAnchor(bounds);\r" +
-                "        slide.addShape(group);\r" +
-                "        Graphics2D graphics = new PPGraphics2D(group);\r" +
-                "\r" +
-                "        //draw a simple bar graph\r" +
-                "        int x = bounds.x + 50, y = bounds.y + 50;\r" +
-                "        graphics.setFont(new Font(\"Arial\", Font.BOLD, 10));\r" +
-                "        for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {\r" +
-                "            graphics.setColor(Color.black);\r" +
-                "            int width = ((Integer)def[i+1]).intValue();\r" +
-                "            graphics.drawString(\"Q\" + idx, x-20, y+20);\r" +
-                "            graphics.drawString(width + \"%\", x + width + 10, y + 20);\r" +
-                "            graphics.setColor((Color)def[i]);\r" +
-                "            graphics.fill(new Rectangle(x, y, width, 30));\r" +
-                "            y += 40;\r" +
-                "        }\r" +
-                "        graphics.setColor(Color.black);\r" +
-                "        graphics.setFont(new Font(\"Arial\", Font.BOLD, 14));\r" +
-                "        graphics.draw(bounds);\r" +
-                "        graphics.drawString(\"Performance\", x + 70, y + 40);\r" +
-                "\r" +
-                "        FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\r" +
-                "        ppt.write(out);\r" +
-                "        out.close();");
+        HSLFTextBox box3 = new HSLFTextBox();
+        HSLFTextRun rt3 = box3.getTextParagraphs().get(0).getTextRuns().get(0);
+        rt3.setFontFamily("Courier New");
+        rt3.setFontSize(8d);
+        box3.setText(
+                "//bar chart data. The first value is the bar color, the second is the width\u000b" +
+                "Object[] def = new Object[]{\u000b" +
+                "    Color.yellow, new Integer(100),\u000b" +
+                "    Color.green, new Integer(150),\u000b" +
+                "    Color.gray, new Integer(75),\u000b" +
+                "    Color.red, new Integer(200),\u000b" +
+                "};\u000b" +
+                "\u000b" +
+                "SlideShow ppt = new SlideShow();\u000b" +
+                "Slide slide = ppt.createSlide();\u000b" +
+                "\u000b" +
+                "ShapeGroup group = new ShapeGroup();\u000b" +
+                "//define position of the drawing in the slide\u000b" +
+                "Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);\u000b" +
+                "group.setAnchor(bounds);\u000b" +
+                "slide.addShape(group);\u000b" +
+                "Graphics2D graphics = new PPGraphics2D(group);\u000b" +
+                "\u000b" +
+                "//draw a simple bar graph\u000b" +
+                "int x = bounds.x + 50, y = bounds.y + 50;\u000b" +
+                "graphics.setFont(new Font(\"Arial\", Font.BOLD, 10));\u000b" +
+                "for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {\u000b" +
+                "    graphics.setColor(Color.black);\u000b" +
+                "    int width = ((Integer)def[i+1]).intValue();\u000b" +
+                "    graphics.drawString(\"Q\" + idx, x-20, y+20);\u000b" +
+                "    graphics.drawString(width + \"%\", x + width + 10, y + 20);\u000b" +
+                "    graphics.setColor((Color)def[i]);\u000b" +
+                "    graphics.fill(new Rectangle(x, y, width, 30));\u000b" +
+                "    y += 40;\u000b" +
+                "}\u000b" +
+                "graphics.setColor(Color.black);\u000b" +
+                "graphics.setFont(new Font(\"Arial\", Font.BOLD, 14));\u000b" +
+                "graphics.draw(bounds);\u000b" +
+                "graphics.drawString(\"Performance\", x + 70, y + 40);\u000b" +
+                "\u000b" +
+                "FileOutputStream out = new FileOutputStream(\"hslf-demo.ppt\");\u000b" +
+                "ppt.write(out);\u000b" +
+                "out.close();");
         box3.setAnchor(new Rectangle(96, 110, 499, 378));
+        box3.setHorizontalCentered(true);
         slide.addShape(box3);
     }
 
-    public static void slide10(SlideShow ppt) throws IOException {
+    public static void slide10(HSLFSlideShow ppt) throws IOException {
         //bar chart data. The first value is the bar color, the second is the width
         Object[] def = new Object[]{
             Color.yellow, new Integer(100),
@@ -416,9 +409,9 @@ public final class ApacheconEU08 {
             Color.red, new Integer(200),
         };
 
-        Slide slide = ppt.createSlide();
+        HSLFSlide slide = ppt.createSlide();
 
-        ShapeGroup group = new ShapeGroup();
+        HSLFGroupShape group = new HSLFGroupShape();
         //define position of the drawing in the slide
         Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);
         group.setAnchor(bounds);
@@ -444,69 +437,51 @@ public final class ApacheconEU08 {
 
     }
 
-    public static void slide11(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
+    public static void slide11(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
-        tr1.setText("HSLF Development Plans");
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.TITLE_TYPE);
+        box1.setText("HSLF Development Plans");
         box1.setAnchor(new Rectangle(36, 21, 648, 90));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr2.getRichTextRuns()[0].setFontSize(32);
-        tr2.setText(
-                "Support for more PowerPoint functionality\r" +
-                "Rendering slides into java.awt.Graphics2D");
-        box2.setAnchor(new Rectangle(36, 126, 648, 100));
-        slide.addShape(box2);
-
-        TextBox box3 = new TextBox();
-        TextRun tr3 = box3.getTextRun();
-        tr3.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr3.getRichTextRuns()[0].setIndentLevel(1);
-        tr3.setText(
-                "A way to export slides into images or other formats");
-        box3.setAnchor(new Rectangle(36, 220, 648, 70));
-        slide.addShape(box3);
-
-        TextBox box4 = new TextBox();
-        TextRun tr4 = box4.getTextRun();
-        tr4.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr4.getRichTextRuns()[0].setFontSize(32);
-        tr4.setText(
-                "Integration with Apache FOP - Formatting Objects Processor");
-        box4.setAnchor(new Rectangle(36, 290, 648, 90));
-        slide.addShape(box4);
-
-        TextBox box5 = new TextBox();
-        TextRun tr5 = box5.getTextRun();
-        tr5.setRunType(TextHeaderAtom.BODY_TYPE);
-        tr5.getRichTextRuns()[0].setIndentLevel(1);
-        tr5.setText(
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.BODY_TYPE);
+        box2.setText(
+            "Support for more PowerPoint functionality\r" +
+            "Rendering slides into java.awt.Graphics2D\r" +
+                "A way to export slides into images or other formats\r" +
+            "Integration with Apache FOP - Formatting Objects Processor\r" +
                 "Transformation of XSL-FO into PPT\r" +
-                "PPT2PDF transcoder");
-        box5.setAnchor(new Rectangle(36, 380, 648, 100));
-        slide.addShape(box5);
+                "PPT2PDF transcoder"
+        );
+
+        List<HSLFTextParagraph> tp = box2.getTextParagraphs();
+        for (int i : new byte[]{0,1,3}) {
+            tp.get(i).getTextRuns().get(0).setFontSize(28d);
+        }
+        for (int i : new byte[]{2,4,5}) {
+            tp.get(i).getTextRuns().get(0).setFontSize(24d);
+            tp.get(i).setIndentLevel(1);
+        }
+        
+        box2.setAnchor(new Rectangle(36, 126, 648, 400));
+        slide.addShape(box2);
     }
 
-    public static void slide12(SlideShow ppt) throws IOException {
-        Slide slide = ppt.createSlide();
-
-        TextBox box1 = new TextBox();
-        TextRun tr1 = box1.getTextRun();
-        tr1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
-        tr1.setText("Questions?");
+    public static void slide12(HSLFSlideShow ppt) throws IOException {
+        HSLFSlide slide = ppt.createSlide();
+
+        HSLFTextBox box1 = new HSLFTextBox();
+        box1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
+        box1.setText("Questions?");
         box1.setAnchor(new Rectangle(54, 167, 612, 115));
         slide.addShape(box1);
 
-        TextBox box2 = new TextBox();
-        TextRun tr2 = box2.getTextRun();
-        tr2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
-        tr2.setText(
+        HSLFTextBox box2 = new HSLFTextBox();
+        box2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
+        box2.setText(
                 "http://poi.apache.org/hslf/\r" +
                 "http://people.apache.org/~yegor");
         box2.setAnchor(new Rectangle(108, 306, 504, 138));

Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java Fri Jul 24 21:47:55 2015
@@ -17,13 +17,13 @@
 
 package org.apache.poi.hslf.examples;
 
-import org.apache.poi.hslf.usermodel.SlideShow;
-import org.apache.poi.hslf.usermodel.RichTextRun;
-import org.apache.poi.hslf.model.Slide;
-import org.apache.poi.hslf.model.TextBox;
-
 import java.io.FileOutputStream;
 
+import org.apache.poi.hslf.usermodel.HSLFSlide;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFTextBox;
+import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
+
 /**
  * How to create a single-level bulleted list
  * and change some of the bullet attributes
@@ -34,22 +34,22 @@ public final class BulletsDemo {
 
     public static void main(String[] args) throws Exception {
 
-        SlideShow ppt = new SlideShow();
+        HSLFSlideShow ppt = new HSLFSlideShow();
 
-        Slide slide = ppt.createSlide();
+        HSLFSlide slide = ppt.createSlide();
 
-        TextBox shape = new TextBox();
-        RichTextRun rt = shape.getTextRun().getRichTextRuns()[0];
+        HSLFTextBox shape = new HSLFTextBox();
+        HSLFTextParagraph rt = shape.getTextParagraphs().get(0);
+        rt.getTextRuns().get(0).setFontSize(42d);
+        rt.setBullet(true);
+        rt.setIndent(0d);  //bullet offset
+        rt.setLeftMargin(50d);   //text offset (should be greater than bullet offset)
+        rt.setBulletChar('\u263A'); //bullet character
         shape.setText(
                 "January\r" +
                 "February\r" +
                 "March\r" +
                 "April");
-        rt.setFontSize(42);
-        rt.setBullet(true);
-        rt.setBulletOffset(0);  //bullet offset
-        rt.setTextOffset(50);   //text offset (should be greater than bullet offset)
-        rt.setBulletChar('\u263A'); //bullet character
         slide.addShape(shape);
 
         shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));  //position of the text box in the slide

Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java Fri Jul 24 21:47:55 2015
@@ -17,11 +17,13 @@
 
 package org.apache.poi.hslf.examples;
 
-import org.apache.poi.hslf.usermodel.SlideShow;
-import org.apache.poi.hslf.model.*;
-
+import java.awt.Rectangle;
 import java.io.FileOutputStream;
-import java.awt.*;
+
+import org.apache.poi.hslf.usermodel.HSLFHyperlink;
+import org.apache.poi.hslf.usermodel.HSLFSlide;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFTextBox;
 
 /**
  * Demonstrates how to create hyperlinks in PowerPoint presentations
@@ -30,20 +32,21 @@ import java.awt.*;
  */
 public final class CreateHyperlink {
 
+    @SuppressWarnings("unused")
     public static void main(String[] args) throws Exception {
-        SlideShow ppt = new SlideShow();
+        HSLFSlideShow ppt = new HSLFSlideShow();
 
-        Slide slideA = ppt.createSlide();
-        Slide slideB = ppt.createSlide();
-        Slide slideC = ppt.createSlide();
+        HSLFSlide slideA = ppt.createSlide();
+        HSLFSlide slideB = ppt.createSlide();
+        HSLFSlide slideC = ppt.createSlide();
 
         // link to a URL
-        TextBox textBox1 = new TextBox();
+        HSLFTextBox textBox1 = new HSLFTextBox();
         textBox1.setText("Apache POI");
         textBox1.setAnchor(new Rectangle(100, 100, 200, 50));
 
         String text = textBox1.getText();
-        Hyperlink link = new Hyperlink();
+        HSLFHyperlink link = new HSLFHyperlink();
         link.setAddress("http://www.apache.org");
         link.setTitle(textBox1.getText());
         int linkId = ppt.addHyperlink(link);
@@ -54,11 +57,11 @@ public final class CreateHyperlink {
         slideA.addShape(textBox1);
 
         // link to another slide
-        TextBox textBox2 = new TextBox();
+        HSLFTextBox textBox2 = new HSLFTextBox();
         textBox2.setText("Go to slide #3");
         textBox2.setAnchor(new Rectangle(100, 300, 200, 50));
 
-        Hyperlink link2 = new Hyperlink();
+        HSLFHyperlink link2 = new HSLFHyperlink();
         link2.setAddress(slideC);
         ppt.addHyperlink(link2);
 

Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java Fri Jul 24 21:47:55 2015
@@ -17,14 +17,22 @@
 
 package org.apache.poi.hslf.examples;
 
-import org.apache.poi.hslf.usermodel.*;
-import org.apache.poi.hslf.model.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+import org.apache.poi.hslf.model.OLEShape;
+import org.apache.poi.hslf.usermodel.HSLFObjectData;
+import org.apache.poi.hslf.usermodel.HSLFPictureData;
+import org.apache.poi.hslf.usermodel.HSLFPictureShape;
+import org.apache.poi.hslf.usermodel.HSLFShape;
+import org.apache.poi.hslf.usermodel.HSLFSlide;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSoundData;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.hwpf.usermodel.Paragraph;
-
-import java.io.*;
+import org.apache.poi.hwpf.usermodel.Range;
 
 /**
  * Demonstrates how you can extract misc embedded data from a ppt file
@@ -41,11 +49,11 @@ public final class DataExtraction {
         }
 
         FileInputStream is = new FileInputStream(args[0]);
-        SlideShow ppt = new SlideShow(is);
+        HSLFSlideShow ppt = new HSLFSlideShow(is);
         is.close();
 
         //extract all sound files embedded in this presentation
-        SoundData[] sound = ppt.getSoundData();
+        HSLFSoundData[] sound = ppt.getSoundData();
         for (int i = 0; i < sound.length; i++) {
             String type = sound[i].getSoundType();  //*.wav
             String name = sound[i].getSoundName();  //typically file name
@@ -57,14 +65,14 @@ public final class DataExtraction {
             out.close();
         }
 
-        //extract embedded OLE documents
-        Slide[] slide = ppt.getSlides();
-        for (int i = 0; i < slide.length; i++) {
-            Shape[] shape = slide[i].getShapes();
-            for (int j = 0; j < shape.length; j++) {
-                if (shape[j] instanceof OLEShape) {
-                    OLEShape ole = (OLEShape) shape[j];
-                    ObjectData data = ole.getObjectData();
+        int oleIdx=-1, picIdx=-1;
+        for (HSLFSlide slide : ppt.getSlides()) {
+            //extract embedded OLE documents
+            for (HSLFShape shape : slide.getShapes()) {
+                if (shape instanceof OLEShape) {
+                    oleIdx++;
+                    OLEShape ole = (OLEShape) shape;
+                    HSLFObjectData data = ole.getObjectData();
                     String name = ole.getInstanceName();
                     if ("Worksheet".equals(name)) {
 
@@ -81,11 +89,11 @@ public final class DataExtraction {
                          }
 
                         //save on disk
-                        FileOutputStream out = new FileOutputStream(name + "-("+(j)+").doc");
+                        FileOutputStream out = new FileOutputStream(name + "-("+(oleIdx)+").doc");
                         doc.write(out);
                         out.close();
                      }  else {
-                        FileOutputStream out = new FileOutputStream(ole.getProgID() + "-"+(j+1)+".dat");
+                        FileOutputStream out = new FileOutputStream(ole.getProgID() + "-"+(oleIdx+1)+".dat");
                         InputStream dis = data.getData();
                         byte[] chunk = new byte[2048];
                         int count;
@@ -96,50 +104,44 @@ public final class DataExtraction {
                         out.close();
                     }
                 }
-
-            }
-        }
-
-        //Pictures
-        for (int i = 0; i < slide.length; i++) {
-            Shape[] shape = slide[i].getShapes();
-            for (int j = 0; j < shape.length; j++) {
-                if (shape[j] instanceof Picture) {
-                    Picture p = (Picture) shape[j];
-                    PictureData data = p.getPictureData();
+                
+                //Pictures
+                else if (shape instanceof HSLFPictureShape) {
+                    picIdx++;
+                    HSLFPictureShape p = (HSLFPictureShape) shape;
+                    HSLFPictureData data = p.getPictureData();
                     String name = p.getPictureName();
                     int type = data.getType();
                     String ext;
                     switch (type) {
-                        case Picture.JPEG:
+                        case HSLFPictureShape.JPEG:
                             ext = ".jpg";
                             break;
-                        case Picture.PNG:
+                        case HSLFPictureShape.PNG:
                             ext = ".png";
                             break;
-                        case Picture.WMF:
+                        case HSLFPictureShape.WMF:
                             ext = ".wmf";
                             break;
-                        case Picture.EMF:
+                        case HSLFPictureShape.EMF:
                             ext = ".emf";
                             break;
-                        case Picture.PICT:
+                        case HSLFPictureShape.PICT:
                             ext = ".pict";
                             break;
-                        case Picture.DIB:
+                        case HSLFPictureShape.DIB:
                             ext = ".dib";
                             break;
                         default:
                             continue;
                     }
-                    FileOutputStream out = new FileOutputStream("pict-" + j + ext);
+                    FileOutputStream out = new FileOutputStream("pict-" + picIdx + ext);
                     out.write(data.getData());
                     out.close();
                 }
-
             }
-        }
 
+        }
     }
 
     private static void usage(){

Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java?rev=1692593&r1=1692592&r2=1692593&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java Fri Jul 24 21:47:55 2015
@@ -17,12 +17,17 @@
 
 package org.apache.poi.hslf.examples;
 
-import org.apache.poi.hslf.usermodel.SlideShow;
-import org.apache.poi.hslf.model.*;
-
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.io.FileOutputStream;
 
+import org.apache.poi.hslf.model.PPGraphics2D;
+import org.apache.poi.hslf.usermodel.HSLFGroupShape;
+import org.apache.poi.hslf.usermodel.HSLFSlide;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+
 /**
  * Demonstrates how to draw into a slide using the HSLF Graphics2D driver.
  *
@@ -34,7 +39,7 @@ public final class Graphics2DDemo {
      * A simple bar chart demo
      */
     public static void main(String[] args) throws Exception {
-        SlideShow ppt = new SlideShow();
+        HSLFSlideShow ppt = new HSLFSlideShow();
 
         //bar chart data. The first value is the bar color, the second is the width
         Object[] def = new Object[]{
@@ -44,13 +49,13 @@ public final class Graphics2DDemo {
             Color.red, new Integer(80),
         };
 
-        Slide slide = ppt.createSlide();
+        HSLFSlide slide = ppt.createSlide();
 
-        ShapeGroup group = new ShapeGroup();
+        HSLFGroupShape group = new HSLFGroupShape();
         //define position of the drawing in the slide
         Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);
         group.setAnchor(bounds);
-        group.setCoordinates(new java.awt.Rectangle(0, 0, 100, 100));
+        group.setInteriorAnchor(new java.awt.Rectangle(0, 0, 100, 100));
         slide.addShape(group);
         Graphics2D graphics = new PPGraphics2D(group);
 
@@ -68,7 +73,7 @@ public final class Graphics2DDemo {
         }
         graphics.setColor(Color.black);
         graphics.setFont(new Font("Arial", Font.BOLD, 14));
-        graphics.draw(group.getCoordinates());
+        graphics.draw(group.getInteriorAnchor());
         graphics.drawString("Performance", x + 30, y + 10);
 
         FileOutputStream out = new FileOutputStream("hslf-graphics.ppt");



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message