View | Details | Raw Unified | Return to bug 42474
Collapse All | Expand All

(-)src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java (-6 / +6 lines)
Lines 32-37 Link Here
32 
import org.apache.poi.hslf.model.*;
 32 
import org.apache.poi.hslf.model.*;
33 
import org.apache.poi.hslf.record.Document;
 33 
import org.apache.poi.hslf.record.Document;
34 
import org.apache.poi.hslf.record.DocumentAtom;
 34 
import org.apache.poi.hslf.record.DocumentAtom;
35 
import org.apache.poi.hslf.record.NotesAtom;
35 
import org.apache.poi.hslf.record.FontCollection;
 36 
import org.apache.poi.hslf.record.FontCollection;
36 
import org.apache.poi.hslf.record.ParentAwareRecord;
 37 
import org.apache.poi.hslf.record.ParentAwareRecord;
37 
import org.apache.poi.hslf.record.PositionDependentRecordContainer;
 38 
import org.apache.poi.hslf.record.PositionDependentRecordContainer;
Lines 54-61 Link Here
54 
 * This class is a friendly wrapper on top of the more scary HSLFSlideShow.
 55 
 * This class is a friendly wrapper on top of the more scary HSLFSlideShow.
55 
 *
 56 
 *
56 
 * TODO:
 57 
 * TODO:
57 
 *  - figure out how to match notes to their correct sheet
58 
 *    (will involve understanding DocSlideList and DocNotesList)
59 
 *  - handle Slide creation cleaner
 58 
 *  - handle Slide creation cleaner
60 
 *
59 
 *
61 
 * @author Nick Burch
 60 
 * @author Nick Burch
Lines 363-374 Link Here
363 
			Record r = getCoreRecordForSAS(notesSets[i]);
 362 
			Record r = getCoreRecordForSAS(notesSets[i]);
364
363
365 
			// Ensure it really is a notes record
 364 
			// Ensure it really is a notes record
366 
			if(r != null && r instanceof org.apache.poi.hslf.record.Notes) {
 365 
			if(r instanceof org.apache.poi.hslf.record.Notes) {
367 
				notesRecordsL.add( (org.apache.poi.hslf.record.Notes)r );
 366 
				org.apache.poi.hslf.record.Notes notesRecord = (org.apache.poi.hslf.record.Notes)r;
367 
				notesRecordsL.add(notesRecord);
368
368
369 
				// Record the match between slide id and these notes
 369 
				// Record the match between slide id and these notes
370 
				SlidePersistAtom spa = notesSets[i].getSlidePersistAtom();
 370 
				NotesAtom na = notesRecord.getNotesAtom();
371 
				Integer slideId = new Integer(spa.getSlideIdentifier());
 371 
				Integer slideId = new Integer(na.getSlideID());
372 
				slideIdToNotes.put(slideId, new Integer(i));
 372 
				slideIdToNotes.put(slideId, new Integer(i));
373 
			} else {
 373 
			} else {
374 
				logger.log(POILogger.ERROR, "A Notes SlideAtomSet at " + i + " said its record was at refID " + notesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);
 374 
				logger.log(POILogger.ERROR, "A Notes SlideAtomSet at " + i + " said its record was at refID " + notesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);

Return to bug 42474