You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/03/20 00:44:25 UTC
svn commit: r1667902 [1/8] - in /poi/branches/common_sl/src:
examples/src/org/apache/poi/hslf/examples/
examples/src/org/apache/poi/hssf/usermodel/examples/
examples/src/org/apache/poi/xslf/usermodel/
examples/src/org/apache/poi/xssf/usermodel/examples...
Author: kiwiwings
Date: Thu Mar 19 23:44:23 2015
New Revision: 1667902
URL: http://svn.apache.org/r1667902
Log:
Snapshot commit - still lots of errors, xslf rendering works, started work on hslf
Added:
poi/branches/common_sl/src/resources/scratchpad/org/apache/poi/sl/draw/
poi/branches/common_sl/src/resources/scratchpad/org/apache/poi/sl/draw/geom/
poi/branches/common_sl/src/resources/scratchpad/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
- copied unchanged from r1662967, poi/branches/common_sl/src/resources/scratchpad/org/apache/poi/sl/draw/presetShapeDefinitions.xml
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFAutoShape.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFBackground.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Background.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFFill.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFFreeformShape.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMasterSheet.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/MasterSheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFNotes.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Notes.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFPictureShape.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFSheet.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFSimpleShape.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFSlide.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFSlideShowEncrypted.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFSlideShowImpl.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFTextBox.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFTextParagraph.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFTextShape.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
- copied, changed from r1662967, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/SoundData.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
- copied, changed from r1664935, poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
Removed:
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Background.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/MasterSheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Notes.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/usermodel/SoundData.java
Modified:
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
poi/branches/common_sl/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java
poi/branches/common_sl/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java
poi/branches/common_sl/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/BitmapPainter.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/ImagePainter.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFGroupShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HSLFShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Line.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Placeholder.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/ShapePainter.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/SlideMaster.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/Table.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TableCell.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TextPainter.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/hslf/model/TitleMaster.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawAutoShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawFactory.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawMasterSheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawPaint.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawShapeGroup.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawSheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawSimpleShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawSlide.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextFragment.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/DrawTextShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/geom/PresetGeometries.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/FreeformShape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/PaintStyle.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/StrokeStyle.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java
poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/usermodel/TextShape.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestImagePainter.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java Thu Mar 19 23:44:23 2015
@@ -34,7 +34,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);
@@ -56,27 +56,27 @@ 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
tr1.setText("POI-HSLF");
box1.setAnchor(new Rectangle(54, 78, 612, 115));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
tr2.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();
+ HSLFTextBox box3 = new HSLFTextBox();
+ HSLFTextParagraph tr3 = box3.getTextParagraph();
tr3.getRichTextRuns()[0].setFontSize(32);
- box3.setHorizontalAlignment(TextBox.AlignCenter);
+ box3.setHorizontalAlignment(HSLFTextBox.AlignCenter);
tr3.setText(
"Yegor Kozlov\r" +
"yegor - apache - org");
@@ -84,18 +84,18 @@ public final class ApacheconEU08 {
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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("What is HSLF?");
box1.setAnchor(new Rectangle(36, 21, 648, 90));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.BODY_TYPE);
tr2.setText("HorribleSLideshowFormat is the POI Project's pure Java implementation " +
"of the Powerpoint binary file format. \r" +
@@ -107,18 +107,18 @@ 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("HSLF in a Nutshell");
box1.setAnchor(new Rectangle(36, 15, 648, 65));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.BODY_TYPE);
tr2.setText(
"HSLF provides a way to read, create and modify MS PowerPoint presentations\r" +
@@ -128,8 +128,8 @@ public final class ApacheconEU08 {
box2.setAnchor(new Rectangle(36, 80, 648, 200));
slide.addShape(box2);
- TextBox box3 = new TextBox();
- TextRun tr3 = box3.getTextRun();
+ HSLFTextBox box3 = new HSLFTextBox();
+ HSLFTextParagraph tr3 = box3.getTextParagraph();
tr3.setRunType(TextHeaderAtom.BODY_TYPE);
tr3.setText(
"Rich text\r" +
@@ -142,16 +142,16 @@ public final class ApacheconEU08 {
box3.setAnchor(new Rectangle(36, 265, 648, 150));
slide.addShape(box3);
- TextBox box4 = new TextBox();
- TextRun tr4 = box4.getTextRun();
+ HSLFTextBox box4 = new HSLFTextBox();
+ HSLFTextParagraph tr4 = box4.getTextParagraph();
tr4.setRunType(TextHeaderAtom.BODY_TYPE);
tr4.setText("Access to low level data structures");
box4.setAnchor(new Rectangle(36, 430, 648, 50));
slide.addShape(box4);
}
- 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"},
@@ -162,8 +162,8 @@ public final class ApacheconEU08 {
for (int j = 0; j < txt1[i].length; j++) {
TableCell cell = table1.getCell(i, j);
cell.setText(txt1[i][j]);
- cell.getTextRun().getRichTextRuns()[0].setFontSize(10);
- RichTextRun rt = cell.getTextRun().getRichTextRuns()[0];
+ cell.getTextParagraph().getRichTextRuns()[0].setFontSize(10);
+ HSLFTextRun rt = cell.getTextParagraph().getRichTextRuns()[0];
rt.setFontName("Arial");
rt.setBold(true);
if(i == 0){
@@ -174,7 +174,7 @@ public final class ApacheconEU08 {
rt.setFontSize(28);
cell.getFill().setForegroundColor(new Color(235, 239, 241));
}
- cell.setVerticalAlignment(TextBox.AnchorMiddle);
+ cell.setVerticalAlignment(HSLFTextBox.AnchorMiddle);
}
}
@@ -195,30 +195,30 @@ public final class ApacheconEU08 {
table1.moveTo(100, 100);
- TextBox box1 = new TextBox();
- box1.setHorizontalAlignment(TextBox.AlignCenter);
- TextRun tr1 = box1.getTextRun();
+ HSLFTextBox box1 = new HSLFTextBox();
+ box1.setHorizontalAlignment(HSLFTextBox.AlignCenter);
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setText("The source code is available at\r" +
"http://people.apache.org/~yegor/apachecon_eu08/");
- RichTextRun rt = tr1.getRichTextRuns()[0];
+ HSLFTextRun 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.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();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.BODY_TYPE);
tr2.setText(
"Text from slides and notes\r" +
@@ -230,26 +230,26 @@ 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("HSLF in Action - 2");
box1.setAnchor(new Rectangle(36, 20, 648, 90));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.getRichTextRuns()[0].setFontSize(18);
tr2.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];
+ HSLFTextBox box3 = new HSLFTextBox();
+ HSLFTextParagraph tr3 = box3.getTextParagraph();
+ HSLFTextRun rt3 = tr3.getRichTextRuns()[0];
rt3.setFontName("Courier New");
rt3.setFontSize(8);
tr3.setText(
@@ -290,30 +290,30 @@ public final class ApacheconEU08 {
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.setHorizontalAlignment(HSLFTextBox.AlignCenter);
+ box2.setVerticalAlignment(HSLFTextBox.AnchorMiddle);
+ box2.getTextParagraph().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.setHorizontalAlignment(HSLFTextBox.AlignCenter);
+ box3.setVerticalAlignment(HSLFTextBox.AnchorMiddle);
+ box3.getTextParagraph().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(ShapeType.RIGHT_ARROW);
+ HSLFAutoShape box4 = new HSLFAutoShape(ShapeType.RIGHT_ARROW);
box4.getFill().setForegroundColor(new Color(187, 224, 227));
box4.setLineWidth(0.75);
box4.setLineColor(Color.black);
@@ -321,18 +321,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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("Wait, there is more!");
box1.setAnchor(new Rectangle(36, 21, 648, 90));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.BODY_TYPE);
tr2.setText(
"Rich text\r" +
@@ -343,26 +343,26 @@ 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("HSLF in Action - 3");
box1.setAnchor(new Rectangle(36, 20, 648, 50));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.getRichTextRuns()[0].setFontSize(18);
tr2.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];
+ HSLFTextBox box3 = new HSLFTextBox();
+ HSLFTextParagraph tr3 = box3.getTextParagraph();
+ HSLFTextRun rt3 = tr3.getRichTextRuns()[0];
rt3.setFontName("Courier New");
rt3.setFontSize(8);
tr3.setText(
@@ -408,7 +408,7 @@ public final class ApacheconEU08 {
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),
@@ -417,7 +417,7 @@ public final class ApacheconEU08 {
Color.red, new Integer(200),
};
- Slide slide = ppt.createSlide();
+ HSLFSlide slide = ppt.createSlide();
HSLFGroupShape group = new HSLFGroupShape();
//define position of the drawing in the slide
@@ -445,18 +445,18 @@ 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();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.TITLE_TYPE);
tr1.setText("HSLF Development Plans");
box1.setAnchor(new Rectangle(36, 21, 648, 90));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.BODY_TYPE);
tr2.getRichTextRuns()[0].setFontSize(32);
tr2.setText(
@@ -465,8 +465,8 @@ public final class ApacheconEU08 {
box2.setAnchor(new Rectangle(36, 126, 648, 100));
slide.addShape(box2);
- TextBox box3 = new TextBox();
- TextRun tr3 = box3.getTextRun();
+ HSLFTextBox box3 = new HSLFTextBox();
+ HSLFTextParagraph tr3 = box3.getTextParagraph();
tr3.setRunType(TextHeaderAtom.BODY_TYPE);
tr3.getRichTextRuns()[0].setIndentLevel(1);
tr3.setText(
@@ -474,8 +474,8 @@ public final class ApacheconEU08 {
box3.setAnchor(new Rectangle(36, 220, 648, 70));
slide.addShape(box3);
- TextBox box4 = new TextBox();
- TextRun tr4 = box4.getTextRun();
+ HSLFTextBox box4 = new HSLFTextBox();
+ HSLFTextParagraph tr4 = box4.getTextParagraph();
tr4.setRunType(TextHeaderAtom.BODY_TYPE);
tr4.getRichTextRuns()[0].setFontSize(32);
tr4.setText(
@@ -483,8 +483,8 @@ public final class ApacheconEU08 {
box4.setAnchor(new Rectangle(36, 290, 648, 90));
slide.addShape(box4);
- TextBox box5 = new TextBox();
- TextRun tr5 = box5.getTextRun();
+ HSLFTextBox box5 = new HSLFTextBox();
+ HSLFTextParagraph tr5 = box5.getTextParagraph();
tr5.setRunType(TextHeaderAtom.BODY_TYPE);
tr5.getRichTextRuns()[0].setIndentLevel(1);
tr5.setText(
@@ -494,18 +494,18 @@ public final class ApacheconEU08 {
slide.addShape(box5);
}
- public static void slide12(SlideShow ppt) throws IOException {
- Slide slide = ppt.createSlide();
+ public static void slide12(HSLFSlideShow ppt) throws IOException {
+ HSLFSlide slide = ppt.createSlide();
- TextBox box1 = new TextBox();
- TextRun tr1 = box1.getTextRun();
+ HSLFTextBox box1 = new HSLFTextBox();
+ HSLFTextParagraph tr1 = box1.getTextParagraph();
tr1.setRunType(TextHeaderAtom.CENTER_TITLE_TYPE);
tr1.setText("Questions?");
box1.setAnchor(new Rectangle(54, 167, 612, 115));
slide.addShape(box1);
- TextBox box2 = new TextBox();
- TextRun tr2 = box2.getTextRun();
+ HSLFTextBox box2 = new HSLFTextBox();
+ HSLFTextParagraph tr2 = box2.getTextParagraph();
tr2.setRunType(TextHeaderAtom.CENTRE_BODY_TYPE);
tr2.setText(
"http://poi.apache.org/hslf/\r" +
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java Thu Mar 19 23:44:23 2015
@@ -17,10 +17,10 @@
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 org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFTextRun;
+import org.apache.poi.hslf.model.HSLFSlide;
+import org.apache.poi.hslf.model.HSLFTextBox;
import java.io.FileOutputStream;
@@ -34,12 +34,12 @@ 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();
+ HSLFTextRun rt = shape.getTextParagraph().getRichTextRuns()[0];
shape.setText(
"January\r" +
"February\r" +
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java Thu Mar 19 23:44:23 2015
@@ -17,7 +17,7 @@
package org.apache.poi.hslf.examples;
-import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.hslf.model.*;
import java.io.FileOutputStream;
@@ -31,14 +31,14 @@ import java.awt.*;
public final class CreateHyperlink {
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));
@@ -54,7 +54,7 @@ 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));
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java Thu Mar 19 23:44:23 2015
@@ -41,11 +41,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
@@ -58,13 +58,13 @@ public final class DataExtraction {
}
//extract embedded OLE documents
- Slide[] slide = ppt.getSlides();
+ HSLFSlide[] slide = ppt.getSlides();
for (int i = 0; i < slide.length; i++) {
HSLFShape[] 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();
+ HSLFObjectData data = ole.getObjectData();
String name = ole.getInstanceName();
if ("Worksheet".equals(name)) {
@@ -104,29 +104,29 @@ public final class DataExtraction {
for (int i = 0; i < slide.length; i++) {
HSLFShape[] 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();
+ if (shape[j] instanceof HSLFPictureShape) {
+ HSLFPictureShape p = (HSLFPictureShape) shape[j];
+ 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:
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java Thu Mar 19 23:44:23 2015
@@ -17,7 +17,7 @@
package org.apache.poi.hslf.examples;
-import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.hslf.model.*;
import java.awt.*;
@@ -34,7 +34,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,7 +44,7 @@ public final class Graphics2DDemo {
Color.red, new Integer(80),
};
- Slide slide = ppt.createSlide();
+ HSLFSlide slide = ppt.createSlide();
HSLFGroupShape group = new HSLFGroupShape();
//define position of the drawing in the slide
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java Thu Mar 19 23:44:23 2015
@@ -16,9 +16,9 @@
==================================================================== */
package org.apache.poi.hslf.examples;
-import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.hslf.model.HeadersFooters;
-import org.apache.poi.hslf.model.Slide;
+import org.apache.poi.hslf.model.HSLFSlide;
import java.io.FileOutputStream;
@@ -29,7 +29,7 @@ import java.io.FileOutputStream;
*/
public class HeadersFootersDemo {
public static void main(String[] args) throws Exception {
- SlideShow ppt = new SlideShow();
+ HSLFSlideShow ppt = new HSLFSlideShow();
HeadersFooters slideHeaders = ppt.getSlideHeadersFooters();
slideHeaders.setFootersText("Created by POI-HSLF");
@@ -40,7 +40,7 @@ public class HeadersFootersDemo {
notesHeaders.setFootersText("My notes footers");
notesHeaders.setHeaderText("My notes header");
- Slide slide = ppt.createSlide();
+ HSLFSlide slide = ppt.createSlide();
FileOutputStream out = new FileOutputStream("headers_footers.ppt");
ppt.write(out);
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java Thu Mar 19 23:44:23 2015
@@ -17,9 +17,9 @@
package org.apache.poi.hslf.examples;
-import org.apache.poi.hslf.usermodel.SlideShow;
-import org.apache.poi.hslf.model.Slide;
-import org.apache.poi.hslf.model.TextRun;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.model.HSLFSlide;
+import org.apache.poi.hslf.model.HSLFTextParagraph;
import org.apache.poi.hslf.model.Hyperlink;
import org.apache.poi.hslf.model.HSLFShape;
@@ -35,16 +35,16 @@ public final class Hyperlinks {
public static void main(String[] args) throws Exception {
for (int i = 0; i < args.length; i++) {
FileInputStream is = new FileInputStream(args[i]);
- SlideShow ppt = new SlideShow(is);
+ HSLFSlideShow ppt = new HSLFSlideShow(is);
is.close();
- Slide[] slide = ppt.getSlides();
+ HSLFSlide[] slide = ppt.getSlides();
for (int j = 0; j < slide.length; j++) {
System.out.println("slide " + slide[j].getSlideNumber());
//read hyperlinks from the slide's text runs
System.out.println("reading hyperlinks from the text runs");
- TextRun[] txt = slide[j].getTextRuns();
+ HSLFTextParagraph[] txt = slide[j].getTextRuns();
for (int k = 0; k < txt.length; k++) {
String text = txt[k].getText();
Hyperlink[] links = txt[k].getHyperlinks();
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java Thu Mar 19 23:44:23 2015
@@ -62,14 +62,14 @@ public final class PPT2PNG {
}
FileInputStream is = new FileInputStream(file);
- SlideShow ppt = new SlideShow(is);
+ HSLFSlideShow ppt = new HSLFSlideShow(is);
is.close();
Dimension pgsize = ppt.getPageSize();
int width = (int)(pgsize.width*scale);
int height = (int)(pgsize.height*scale);
- Slide[] slide = ppt.getSlides();
+ HSLFSlide[] slide = ppt.getSlides();
for (int i = 0; i < slide.length; i++) {
if (slidenum != -1 && slidenum != (i+1)) continue;
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java Thu Mar 19 23:44:23 2015
@@ -32,10 +32,10 @@ import java.util.List;
*/
public class SoundFinder {
public static void main(String[] args) throws Exception {
- SlideShow ppt = new SlideShow(new FileInputStream(args[0]));
- SoundData[] sounds = ppt.getSoundData();
+ HSLFSlideShow ppt = new HSLFSlideShow(new FileInputStream(args[0]));
+ HSLFSoundData[] sounds = ppt.getSoundData();
- Slide[] slide = ppt.getSlides();
+ HSLFSlide[] slide = ppt.getSlides();
for (int i = 0; i < slide.length; i++) {
HSLFShape[] shape = slide[i].getShapes();
for (int j = 0; j < shape.length; j++) {
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java Thu Mar 19 23:44:23 2015
@@ -17,8 +17,8 @@
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.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFTextRun;
import org.apache.poi.hslf.model.*;
import java.awt.*;
@@ -43,9 +43,9 @@ public final class TableDemo {
{"Total PO History Spend", "$10,172,038"}
};
- SlideShow ppt = new SlideShow();
+ HSLFSlideShow ppt = new HSLFSlideShow();
- Slide slide = ppt.createSlide();
+ HSLFSlide slide = ppt.createSlide();
//six rows, two columns
Table table1 = new Table(6, 2);
@@ -53,7 +53,7 @@ public final class TableDemo {
for (int j = 0; j < txt1[i].length; j++) {
TableCell cell = table1.getCell(i, j);
cell.setText(txt1[i][j]);
- RichTextRun rt = cell.getTextRun().getRichTextRuns()[0];
+ HSLFTextRun rt = cell.getTextParagraph().getRichTextRuns()[0];
rt.setFontName("Arial");
rt.setFontSize(10);
if(i == 0){
@@ -61,8 +61,8 @@ public final class TableDemo {
} else {
rt.setBold(true);
}
- cell.setVerticalAlignment(TextBox.AnchorMiddle);
- cell.setHorizontalAlignment(TextBox.AlignCenter);
+ cell.setVerticalAlignment(HSLFTextBox.AnchorMiddle);
+ cell.setHorizontalAlignment(HSLFTextBox.AlignCenter);
}
}
@@ -92,7 +92,7 @@ public final class TableDemo {
for (int j = 0; j < txt2[i].length; j++) {
TableCell cell = table2.getCell(i, j);
cell.setText(txt2[i][j]);
- RichTextRun rt = cell.getTextRun().getRichTextRuns()[0];
+ HSLFTextRun rt = cell.getTextParagraph().getRichTextRuns()[0];
rt.setFontSize(10);
rt.setFontName("Arial");
if(i == 0){
@@ -100,13 +100,13 @@ public final class TableDemo {
rt.setFontColor(Color.white);
rt.setBold(true);
rt.setFontSize(14);
- cell.setHorizontalAlignment(TextBox.AlignCenter);
+ cell.setHorizontalAlignment(HSLFTextBox.AlignCenter);
} else {
rt.setBullet(true);
rt.setFontSize(12);
- cell.setHorizontalAlignment(TextBox.AlignLeft);
+ cell.setHorizontalAlignment(HSLFTextBox.AlignLeft);
}
- cell.setVerticalAlignment(TextBox.AnchorMiddle);
+ cell.setVerticalAlignment(HSLFTextBox.AnchorMiddle);
}
}
table2.setColumnWidth(0, 300);
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java Thu Mar 19 23:44:23 2015
@@ -21,8 +21,8 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hslf.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.hslf.model.HSLFSlideShowImpl;
+import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import java.io.FileInputStream;
import java.util.Iterator;
@@ -47,7 +47,7 @@ public class EmeddedObjects {
//System.out.println(entry.getName() + ": " + embeddedWordDocument.getRange().text());
} else if (oleName.equals("Presentation")) {
DirectoryNode dn = (DirectoryNode) obj.getDirectory();
- SlideShow embeddedPowerPointDocument = new SlideShow(new HSLFSlideShow(dn));
+ HSLFSlideShow embeddedPowerPointDocument = new HSLFSlideShow(new HSLFSlideShowImpl(dn));
//System.out.println(entry.getName() + ": " + embeddedPowerPointDocument.getSlides().length);
} else {
if(obj.hasDirectoryEntry()){
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/DataExtraction.java Thu Mar 19 23:44:23 2015
@@ -76,7 +76,6 @@ public final class DataExtraction {
Dimension pageSize = ppt.getPageSize(); // size of the canvas in points
for(XSLFSlide slide : ppt.getSlides()) {
for(XSLFShape shape : slide){
- Rectangle2D anchor = shape.getAnchor(); // position on the canvas
if(shape instanceof XSLFTextShape) {
XSLFTextShape txShape = (XSLFTextShape)shape;
System.out.println(txShape.getText());
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial4.java Thu Mar 19 23:44:23 2015
@@ -19,12 +19,12 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.*;
+import java.awt.Color;
import java.awt.geom.Rectangle2D;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.poi.sl.usermodel.TextAlign;
+import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
/**
* PPTX Tables
Modified: poi/branches/common_sl/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java (original)
+++ poi/branches/common_sl/src/examples/src/org/apache/poi/xssf/usermodel/examples/EmbeddedObjects.java Thu Mar 19 23:44:23 2015
@@ -20,7 +20,7 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.hslf.model.HSLFSlideShowImpl;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.xslf.XSLFSlideShow;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -54,7 +54,7 @@ public class EmbeddedObjects {
}
// PowerPoint Document - binary file format
else if (contentType.equals("application/vnd.ms-powerpoint")) {
- HSLFSlideShow slideShow = new HSLFSlideShow(pPart.getInputStream());
+ HSLFSlideShowImpl slideShow = new HSLFSlideShowImpl(pPart.getInputStream());
}
// PowerPoint Document - OpenXML file format
else if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.presentation")) {
Modified: poi/branches/common_sl/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java (original)
+++ poi/branches/common_sl/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java Thu Mar 19 23:44:23 2015
@@ -22,14 +22,14 @@ import static org.junit.Assert.assertTru
import java.io.FileInputStream;
import java.io.InputStream;
-import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.hslf.model.HSLFSlideShowImpl;
import org.apache.poi.hslf.record.Record;
import org.junit.Test;
public class HSLFFileHandler extends POIFSFileHandler {
@Override
public void handleFile(InputStream stream) throws Exception {
- HSLFSlideShow slide = new HSLFSlideShow(stream);
+ HSLFSlideShowImpl slide = new HSLFSlideShowImpl(stream);
assertNotNull(slide.getCurrentUserAtom());
assertNotNull(slide.getEmbeddedObjects());
assertNotNull(slide.getUnderlyingBytes());
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java Thu Mar 19 23:44:23 2015
@@ -19,25 +19,19 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.usermodel.*;
+import org.apache.poi.openxml4j.opc.*;
+import org.apache.poi.sl.usermodel.PlaceableShape;
+import org.apache.poi.sl.usermodel.ShapeGroup;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Units;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.*;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShapeNonVisual;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
+import org.openxmlformats.schemas.presentationml.x2006.main.*;
/**
* Represents a group shape that consists of many shapes grouped together.
@@ -45,7 +39,7 @@ import org.openxmlformats.schemas.presen
* @author Yegor Kozlov
*/
@Beta
-public class XSLFGroupShape extends XSLFShape implements XSLFShapeContainer, PlaceableShape {
+public class XSLFGroupShape extends XSLFShape implements XSLFShapeContainer, ShapeGroup<XSLFShape> {
private final List<XSLFShape> _shapes;
private final CTGroupShapeProperties _grpSpPr;
private XSLFDrawing _drawing;
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java Thu Mar 19 23:44:23 2015
@@ -17,20 +17,19 @@
package org.apache.poi.xslf.usermodel;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.usermodel.Notes;
-import org.apache.poi.sl.usermodel.TextRun;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTCommonSlideData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.NotesDocument;
+import org.openxmlformats.schemas.presentationml.x2006.main.*;
@Beta
-public final class XSLFNotes extends XSLFSheet implements Notes<XSLFShape> {
+public final class XSLFNotes extends XSLFSheet implements Notes<XSLFShape,XMLSlideShow> {
private CTNotesSlide _notes;
/**
@@ -91,19 +90,15 @@ public final class XSLFNotes extends XSL
return null;
}
- public TextRun getTextRun() {
+ @Override
+ public List<XSLFTextParagraph> getTextParagraphs() {
+ List<XSLFTextParagraph> tp = new ArrayList<XSLFTextParagraph>();
for (XSLFShape sh : super.getShapes()) {
if (sh instanceof XSLFTextShape) {
XSLFTextShape txt = (XSLFTextShape)sh;
- for (XSLFTextParagraph p : txt.getTextParagraphs()) {
- for (XSLFTextRun r : p.getTextRuns()) {
- return r;
- }
- }
+ tp.addAll(txt.getTextParagraphs());
}
}
- return null;
+ return tp;
}
-
-
}
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java Thu Mar 19 23:44:23 2015
@@ -47,7 +47,7 @@ import org.openxmlformats.schemas.presen
* @author Yegor Kozlov
*/
@Beta
- public class XSLFNotesMaster extends XSLFSheet implements MasterSheet<XSLFShape> {
+ public class XSLFNotesMaster extends XSLFSheet implements MasterSheet<XSLFShape,XMLSlideShow> {
private CTNotesMaster _slide;
private XSLFTheme _theme;
@@ -94,7 +94,7 @@ import org.openxmlformats.schemas.presen
}
@Override
- public MasterSheet getMasterSheet() {
+ public MasterSheet<XSLFShape,XMLSlideShow> getMasterSheet() {
return null;
}
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java Thu Mar 19 23:44:23 2015
@@ -19,7 +19,6 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Graphics2D;
import java.awt.Insets;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
@@ -32,27 +31,18 @@ import javax.xml.namespace.QName;
import org.apache.poi.POIXMLException;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship;
+import org.apache.poi.sl.usermodel.PictureShape;
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlip;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTBlipFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeArtExtension;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeArtExtensionList;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetGeometry2D;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTRelativeRect;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTShapeProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPictureNonVisual;
+import org.openxmlformats.schemas.drawingml.x2006.main.*;
+import org.openxmlformats.schemas.presentationml.x2006.main.*;
/**
* Represents a picture shape
*/
@Beta
-public class XSLFPictureShape extends XSLFSimpleShape {
+public class XSLFPictureShape extends XSLFSimpleShape implements PictureShape {
private XSLFPictureData _data;
/*package*/ XSLFPictureShape(CTPicture shape, XSLFSheet sheet) {
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java Thu Mar 19 23:44:23 2015
@@ -88,7 +88,7 @@ public class XSLFShadow extends XSLFShap
*/
public Color getFillColor() {
SolidPaint ps = getFillStyle();
- if (ps == TRANSPARENT_PAINT) return null;
+ if (ps == PaintStyle.TRANSPARENT_PAINT) return null;
Color col = DrawPaint.applyColorTransform(ps.getSolidColor());
return col;
}
@@ -97,7 +97,7 @@ public class XSLFShadow extends XSLFShap
public SolidPaint getFillStyle() {
XSLFTheme theme = getSheet().getTheme();
CTOuterShadowEffect ct = (CTOuterShadowEffect)getXmlObject();
- if(ct == null) return TRANSPARENT_PAINT;
+ if(ct == null) return PaintStyle.TRANSPARENT_PAINT;
CTSchemeColor phClr = ct.getSchemeClr();
final XSLFColor xc = new XSLFColor(ct, theme, phClr);
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java Thu Mar 19 23:44:23 2015
@@ -19,7 +19,6 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Color;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -28,7 +27,6 @@ import java.util.Comparator;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.sl.draw.DrawPaint;
import org.apache.poi.sl.usermodel.*;
import org.apache.poi.sl.usermodel.PaintStyle.GradientPaint;
import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
@@ -56,19 +54,6 @@ public abstract class XSLFShape implemen
private CTNonVisualDrawingProps _nvPr;
private CTPlaceholder _ph;
- protected static final SolidPaint TRANSPARENT_PAINT = new SolidPaint() {
- public ColorStyle getSolidColor() {
- return new ColorStyle(){
- public Color getColor() { return DrawPaint.NO_PAINT; }
- public int getAlpha() { return -1; }
- public int getLumOff() { return -1; }
- public int getLumMod() { return -1; }
- public int getShade() { return -1; }
- public int getTint() { return -1; }
- };
- }
- };
-
protected XSLFShape(XmlObject shape, XSLFSheet sheet) {
_shape = shape;
_sheet = sheet;
@@ -146,7 +131,7 @@ public abstract class XSLFShape implemen
try {
pr = shape.getSpPr();
if (((CTShapeProperties)pr).isSetNoFill()) {
- setValue(TRANSPARENT_PAINT);
+ setValue(PaintStyle.TRANSPARENT_PAINT);
return true;
}
} catch (IllegalStateException e) {}
@@ -158,7 +143,7 @@ public abstract class XSLFShape implemen
pr = shape.getGrpSpPr();
}
if (pr == null) {
- setValue(TRANSPARENT_PAINT);
+ setValue(PaintStyle.TRANSPARENT_PAINT);
return true;
}
@@ -190,7 +175,7 @@ public abstract class XSLFShape implemen
fillRef = getBgRef();
}
if (fillRef == null) {
- return TRANSPARENT_PAINT;
+ return PaintStyle.TRANSPARENT_PAINT;
}
// The idx attribute refers to the index of a fill style or
@@ -213,21 +198,21 @@ public abstract class XSLFShape implemen
paint = selectPaint(fillProps, phClr, sheet.getPackagePart());
}
- return paint == null ? TRANSPARENT_PAINT : paint;
+ return paint == null ? PaintStyle.TRANSPARENT_PAINT : paint;
}
protected CTBackgroundProperties getBgPr() {
- String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:bgPr";
+ String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' p:bgPr";
return selectProperty(CTBackgroundProperties.class, xquery);
}
protected CTStyleMatrixReference getBgRef() {
- String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:bgRef";
+ String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' p:bgRef";
return selectProperty(CTStyleMatrixReference.class, xquery);
}
protected CTGroupShapeProperties getGrpSpPr() {
- String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:grpSpPr";
+ String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' p:grpSpPr";
return selectProperty(CTGroupShapeProperties.class, xquery);
}
@@ -241,7 +226,7 @@ public abstract class XSLFShape implemen
protected CTShapeProperties getSpPr() {
if (_spPr == null) {
- String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:spPr";
+ String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' p:spPr";
_spPr = selectProperty(CTShapeProperties.class, xquery);
}
if (_spPr == null) {
@@ -252,7 +237,7 @@ public abstract class XSLFShape implemen
protected CTShapeStyle getSpStyle() {
if (_spStyle == null) {
- String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:style";
+ String xquery = "declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' p:style";
_spStyle = selectProperty(CTShapeStyle.class, xquery);
}
return _spStyle;
@@ -348,7 +333,7 @@ public abstract class XSLFShape implemen
paint = selectPaint(obj, phClr, pp);
if(paint != null) break;
}
- return paint == null ? TRANSPARENT_PAINT : paint;
+ return paint == null ? PaintStyle.TRANSPARENT_PAINT : paint;
}
/**
@@ -373,7 +358,7 @@ public abstract class XSLFShape implemen
*/
protected PaintStyle selectPaint(XmlObject obj, final CTSchemeColor phClr, final PackagePart parentPart) {
if (obj instanceof CTNoFillProperties) {
- return TRANSPARENT_PAINT;
+ return PaintStyle.TRANSPARENT_PAINT;
} else if (obj instanceof CTSolidColorFillProperties) {
return selectPaint((CTSolidColorFillProperties)obj, phClr, parentPart);
} else if (obj instanceof CTBlipFillProperties) {
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Thu Mar 19 23:44:23 2015
@@ -37,7 +37,7 @@ import org.openxmlformats.schemas.office
import org.openxmlformats.schemas.presentationml.x2006.main.*;
@Beta
-public abstract class XSLFSheet extends POIXMLDocumentPart implements XSLFShapeContainer, Sheet<XSLFShape> {
+public abstract class XSLFSheet extends POIXMLDocumentPart implements XSLFShapeContainer, Sheet<XSLFShape, XMLSlideShow> {
private XSLFCommonSlideData _commonSlideData;
private XSLFDrawing _drawing;
private List<XSLFShape> _shapes;
@@ -516,25 +516,26 @@ public abstract class XSLFSheet extends
* Import a package part into this sheet.
*/
PackagePart importPart(PackageRelationship srcRel, PackagePart srcPafrt) {
-
- OPCPackage pkg = getPackagePart().getPackage();
- if(!pkg.containPart(srcPafrt.getPartName())){
- PackageRelationship rel = getPackagePart().addRelationship(
- srcPafrt.getPartName(), TargetMode.INTERNAL, srcRel.getRelationshipType());
-
- PackagePart part = pkg.createPart(srcPafrt.getPartName(), srcPafrt.getContentType());
- OutputStream out = part.getOutputStream();
- try {
- InputStream is = srcPafrt.getInputStream();
- IOUtils.copy(is, out);
- out.close();
- } catch (IOException e){
- throw new POIXMLException(e);
- }
- return part;
- } else {
+ PackagePart destPP = getPackagePart();
+ PackagePartName srcPPName = srcPafrt.getPartName();
+
+ OPCPackage pkg = destPP.getPackage();
+ if(pkg.containPart(srcPPName)){
// already exists
- return pkg.getPart(srcPafrt.getPartName());
+ return pkg.getPart(srcPPName);
+ }
+
+ destPP.addRelationship(srcPPName, TargetMode.INTERNAL, srcRel.getRelationshipType());
+
+ PackagePart part = pkg.createPart(srcPPName, srcPafrt.getContentType());
+ OutputStream out = part.getOutputStream();
+ try {
+ InputStream is = srcPafrt.getInputStream();
+ IOUtils.copy(is, out);
+ out.close();
+ } catch (IOException e){
+ throw new POIXMLException(e);
}
+ return part;
}
}
\ No newline at end of file
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java Thu Mar 19 23:44:23 2015
@@ -19,19 +19,21 @@
package org.apache.poi.xslf.usermodel;
+import static org.apache.poi.sl.usermodel.PaintStyle.TRANSPARENT_PAINT;
+
import java.awt.Color;
import java.awt.geom.Rectangle2D;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.poi.sl.draw.DrawPaint;
import org.apache.poi.sl.draw.geom.*;
import org.apache.poi.sl.usermodel.*;
import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
+import org.apache.poi.sl.usermodel.StrokeStyle.LineCompound;
import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Units;
@@ -208,8 +210,7 @@ public abstract class XSLFSimpleShape ex
PaintStyle ps = getLinePaint();
if (ps == null || ps == TRANSPARENT_PAINT) return null;
if (ps instanceof SolidPaint) {
- Color col = ((SolidPaint)ps).getSolidColor().getColor();
- return (col == DrawPaint.NO_PAINT) ? null : col;
+ return ((SolidPaint)ps).getSolidColor().getColor();
}
return null;
}
@@ -273,7 +274,6 @@ public abstract class XSLFSimpleShape ex
}
/**
- *
* @return line width in points. <code>0</code> means no line.
*/
public double getLineWidth() {
@@ -311,6 +311,54 @@ public abstract class XSLFSimpleShape ex
}
/**
+ * @return the line compound
+ */
+ public LineCompound getLineCompound() {
+ PropertyFetcher<Integer> fetcher = new PropertyFetcher<Integer>() {
+ public boolean fetch(XSLFShape shape) {
+ CTShapeProperties spPr = shape.getSpPr();
+ CTLineProperties ln = spPr.getLn();
+ if (ln != null) {
+ STCompoundLine.Enum stCmpd = ln.getCmpd();
+ if (stCmpd != null) {
+ setValue(stCmpd.intValue());
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+ fetchShapeProperty(fetcher);
+
+ Integer cmpd = fetcher.getValue();
+ if (cmpd == null) {
+ CTLineProperties defaultLn = getDefaultLineProperties();
+ if (defaultLn != null) {
+ STCompoundLine.Enum stCmpd = defaultLn.getCmpd();
+ if (stCmpd != null) {
+ cmpd = stCmpd.intValue();
+ }
+ }
+ }
+
+ if (cmpd == null) return null;
+
+ switch (cmpd) {
+ default:
+ case STCompoundLine.INT_SNG:
+ return LineCompound.SINGLE;
+ case STCompoundLine.INT_DBL:
+ return LineCompound.DOUBLE;
+ case STCompoundLine.INT_THICK_THIN:
+ return LineCompound.THICK_THIN;
+ case STCompoundLine.INT_THIN_THICK:
+ return LineCompound.THIN_THICK;
+ case STCompoundLine.INT_TRI:
+ return LineCompound.TRIPLE;
+ }
+ }
+
+ /**
*
* @param dash a preset line dashing scheme to stroke thr shape outline
*/
@@ -453,8 +501,7 @@ public abstract class XSLFSimpleShape ex
PaintStyle ps = getFillPaint();
if (ps == null || ps == TRANSPARENT_PAINT) return null;
if (ps instanceof SolidPaint) {
- Color col = ((SolidPaint)ps).getSolidColor().getColor();
- return (col == DrawPaint.NO_PAINT) ? null : col;
+ return ((SolidPaint)ps).getSolidColor().getColor();
}
return null;
}
@@ -769,6 +816,10 @@ public abstract class XSLFSimpleShape ex
public double getLineWidth() {
return XSLFSimpleShape.this.getLineWidth();
}
+
+ public LineCompound getLineCompound() {
+ return XSLFSimpleShape.this.getLineCompound();
+ }
};
}
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java Thu Mar 19 23:44:23 2015
@@ -29,7 +29,7 @@ import org.openxmlformats.schemas.drawin
import org.openxmlformats.schemas.presentationml.x2006.main.*;
@Beta
-public final class XSLFSlide extends XSLFSheet implements Slide<XSLFShape> {
+public final class XSLFSlide extends XSLFSheet implements Slide<XSLFShape, XMLSlideShow> {
private final CTSlide _slide;
private XSLFSlideLayout _layout;
private XSLFComments _comments;
@@ -245,7 +245,7 @@ public final class XSLFSlide extends XSL
throw new UnsupportedOperationException();
}
- public void setNotes(Notes<XSLFShape> notes) {
+ public void setNotes(Notes<XSLFShape,XMLSlideShow> notes) {
// TODO Auto-generated method stub
}
Modified: poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java?rev=1667902&r1=1667901&r2=1667902&view=diff
==============================================================================
--- poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java (original)
+++ poi/branches/common_sl/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java Thu Mar 19 23:44:23 2015
@@ -31,7 +31,7 @@ import org.openxmlformats.schemas.presen
import java.io.IOException;
@Beta
-public class XSLFSlideLayout extends XSLFSheet implements MasterSheet<XSLFShape> {
+public class XSLFSlideLayout extends XSLFSheet implements MasterSheet<XSLFShape, XMLSlideShow> {
private CTSlideLayout _layout;
private XSLFSlideMaster _master;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org