diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java index 621984ce6..72f0f102e 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java @@ -36,111 +36,111 @@ import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet; public class Slide extends Sheet { - private int _refSheetNo; - private int _sheetNo; - private int _slideNo; - private org.apache.poi.hslf.record.Slide _slide; - private SlideAtomsSet _atomSet; - private TextRun[] _runs; - private TextRun[] _otherRuns; // Any from the PPDrawing, shouldn't really be any though - private Notes _notes; // usermodel needs to set this + private int _refSheetNo; + private int _sheetNo; + private int _slideNo; + private org.apache.poi.hslf.record.Slide _slide; + private SlideAtomsSet _atomSet; + private TextRun[] _runs; + private TextRun[] _otherRuns; // Any from the PPDrawing, shouldn't really be any though + private Notes _notes; // usermodel needs to set this - /** - * Constructs a Slide from the Slide record, and the SlideAtomsSet - * containing the text. - * Initialises TextRuns, to provide easier access to the text - * - * @param slide the Slide record we're based on - * @param notes the Notes sheet attached to us - * @param atomSet the SlideAtomsSet to get the text from - */ - public Slide(org.apache.poi.hslf.record.Slide slide, Notes notes, SlideAtomsSet atomSet, int slideIdentifier, int slideNumber) { - _slide = slide; - _notes = notes; - _atomSet = atomSet; - _refSheetNo = slide.getSheetId(); - _sheetNo = slideIdentifier; - _slideNo = slideNumber; + /** + * Constructs a Slide from the Slide record, and the SlideAtomsSet + * containing the text. + * Initialises TextRuns, to provide easier access to the text + * + * @param slide the Slide record we're based on + * @param notes the Notes sheet attached to us + * @param atomSet the SlideAtomsSet to get the text from + */ + public Slide(org.apache.poi.hslf.record.Slide slide, Notes notes, SlideAtomsSet atomSet, int slideIdentifier, int slideNumber) { + _slide = slide; + _notes = notes; + _atomSet = atomSet; + _refSheetNo = slide.getSheetId(); + _sheetNo = slideIdentifier; + _slideNo = slideNumber; - // Grab the TextRuns from the PPDrawing - _otherRuns = findTextRuns(_slide.getPPDrawing()); + // Grab the TextRuns from the PPDrawing + _otherRuns = findTextRuns(_slide.getPPDrawing()); - // For the text coming in from the SlideAtomsSet: - // Build up TextRuns from pairs of TextHeaderAtom and - // one of TextBytesAtom or TextCharsAtom - Vector textRuns = new Vector(); - if(_atomSet != null) { - findTextRuns(_atomSet.getSlideRecords(),textRuns); - } else { - // No text on the slide, must just be pictures + // For the text coming in from the SlideAtomsSet: + // Build up TextRuns from pairs of TextHeaderAtom and + // one of TextBytesAtom or TextCharsAtom + Vector textRuns = new Vector(); + if(_atomSet != null) { + findTextRuns(_atomSet.getSlideRecords(),textRuns); + } else { + // No text on the slide, must just be pictures + } + + // Build an array, more useful than a vector + _runs = new TextRun[textRuns.size()+_otherRuns.length]; + // Grab text from SlideListWithTexts entries + int i=0; + for(i=0; iTextBox object that represents the slide's title. - * - * @return TextBox object that represents the slide's title. - */ - public TextBox addTitle() { - Placeholder pl = new Placeholder(); - pl.setShapeType(ShapeTypes.Rectangle); - pl.setTextType(TextHeaderAtom.TITLE_TYPE); - pl.setText("Click to edit title"); - pl.setAnchor(new java.awt.Rectangle(54, 48, 612, 90)); - addShape(pl); - return pl; - } + /** + * Create a TextBox object that represents the slide's title. + * + * @return TextBox object that represents the slide's title. + */ + public TextBox addTitle() { + Placeholder pl = new Placeholder(); + pl.setShapeType(ShapeTypes.Rectangle); + pl.setTextType(TextHeaderAtom.TITLE_TYPE); + pl.setText("Click to edit title"); + pl.setAnchor(new java.awt.Rectangle(54, 48, 612, 90)); + addShape(pl); + return pl; + } // Complex Accesser methods follow @@ -171,45 +171,45 @@ public class Slide extends Sheet // Simple Accesser methods follow - /** - * Returns an array of all the TextRuns found - */ - public TextRun[] getTextRuns() { return _runs; } + /** + * Returns an array of all the TextRuns found + */ + public TextRun[] getTextRuns() { return _runs; } - /** - * Returns the (internal, RefID based) sheet number, as used - * to in PersistPtr stuff. - */ - public int _getSheetRefId() { return _refSheetNo; } - /** - * Returns the (internal, SlideIdentifier based) sheet number - * @see #getSlideNumber() - */ - public int _getSheetNumber() { return _sheetNo; } - - /** - * Returns the (public facing) page number of this slide - */ - public int getSlideNumber() { return _slideNo; } - - /** - * Returns the underlying slide record - */ - public org.apache.poi.hslf.record.Slide getSlideRecord() { return _slide; } + /** + * Returns the (internal, RefID based) sheet number, as used + * to in PersistPtr stuff. + */ + public int _getSheetRefId() { return _refSheetNo; } + /** + * Returns the (internal, SlideIdentifier based) sheet number + * @see #getSlideNumber() + */ + public int _getSheetNumber() { return _sheetNo; } - /** - * Returns the Notes Sheet for this slide, or null if there isn't one - */ - public Notes getNotesSheet() { return _notes; } - - /** - * Returns the PPDrawing associated with this slide, or null if there isn't one - */ - protected PPDrawing getPPDrawing() { return _slide.getPPDrawing(); } - - /** - * @return set of records inside SlideListWithtext container - * which hold text data for this slide (typically for placeholders). - */ - protected SlideAtomsSet getSlideAtomsSet() { return _atomSet; } + /** + * Returns the (public facing) page number of this slide + */ + public int getSlideNumber() { return _slideNo; } + + /** + * Returns the underlying slide record + */ + public org.apache.poi.hslf.record.Slide getSlideRecord() { return _slide; } + + /** + * Returns the Notes Sheet for this slide, or null if there isn't one + */ + public Notes getNotesSheet() { return _notes; } + + /** + * Returns the PPDrawing associated with this slide, or null if there isn't one + */ + protected PPDrawing getPPDrawing() { return _slide.getPPDrawing(); } + + /** + * @return set of records inside SlideListWithtext container + * which hold text data for this slide (typically for placeholders). + */ + protected SlideAtomsSet getSlideAtomsSet() { return _atomSet; } }