Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bug 42620: More than one slide fails to open in OpenOffice. Fix: UserEditAtom.MaxPersistWritten wasn't updated when adding new slides. 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@563185 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2007-08-06 16:49:47 +00:00
parent 0b2c404d55
commit 15a2673316
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java
View File

@ -68,6 +68,7 @@ public class UserEditAtom extends PositionDependentRecordAtom
public void setLastUserEditAtomOffset(int offset) { lastUserEditAtomOffset = offset; } public void setLastUserEditAtomOffset(int offset) { lastUserEditAtomOffset = offset; }
public void setPersistPointersOffset(int offset) { persistPointersOffset = offset; } public void setPersistPointersOffset(int offset) { persistPointersOffset = offset; }
public void setLastViewType(short type) { lastViewType=type; } public void setLastViewType(short type) { lastViewType=type; }
public void setMaxPersistWritten(int max) { maxPersistWritten=max; }
/* *************** record code follows ********************** */ /* *************** record code follows ********************** */

3
src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
View File

@ -662,7 +662,8 @@ public class SlideShow
// Last view is now of the slide // Last view is now of the slide
usr.setLastViewType((short)UserEditAtom.LAST_VIEW_SLIDE_VIEW); usr.setLastViewType((short)UserEditAtom.LAST_VIEW_SLIDE_VIEW);
usr.setMaxPersistWritten(_highestSheetId);
// All done and added // All done and added
slide.setSlideShow(this); slide.setSlideShow(this);
return slide; return slide;

35
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
View File

@ -26,6 +26,9 @@ import java.io.ByteArrayOutputStream;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.hslf.*; import org.apache.poi.hslf.*;
import org.apache.poi.hslf.record.Record;
import org.apache.poi.hslf.record.RecordTypes;
import org.apache.poi.hslf.record.UserEditAtom;
import org.apache.poi.hslf.model.*; import org.apache.poi.hslf.model.*;
/** /**
@ -73,14 +76,26 @@ public class TestAddingSlides extends TestCase {
// Should only have a master SLWT // Should only have a master SLWT
assertEquals(1, ss_empty.getDocumentRecord().getSlideListWithTexts().length); assertEquals(1, ss_empty.getDocumentRecord().getSlideListWithTexts().length);
//grab UserEditAtom
UserEditAtom usredit = null;
Record[] _records = hss_empty.getRecords();
for (int i = 0; i < _records.length; i++) {
Record record = _records[i];
if(_records[i].getRecordType() == RecordTypes.UserEditAtom.typeID) {
usredit = (UserEditAtom)_records[i];
}
}
assertNotNull(usredit);
// Add one // Add one
Slide slide = ss_empty.createSlide(); Slide slide = ss_empty.createSlide();
assertEquals(1, ss_empty.getSlides().length); assertEquals(1, ss_empty.getSlides().length);
assertEquals(256, slide._getSheetNumber()); assertEquals(256, slide._getSheetNumber());
assertEquals(3, slide._getSheetRefId()); assertEquals(3, slide._getSheetRefId());
assertEquals(1, slide.getSlideNumber()); assertEquals(1, slide.getSlideNumber());
assertEquals(usredit.getMaxPersistWritten(), slide._getSheetRefId());
// Write out, and read back in // Write out, and read back in
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
hss_empty.write(baos); hss_empty.write(baos);
@ -155,6 +170,17 @@ public class TestAddingSlides extends TestCase {
* with two slides already * with two slides already
*/ */
public void testAddSlideToExisting2() throws Exception { public void testAddSlideToExisting2() throws Exception {
//grab UserEditAtom
UserEditAtom usredit = null;
Record[] _records = hss_two.getRecords();
for (int i = 0; i < _records.length; i++) {
Record record = _records[i];
if(_records[i].getRecordType() == RecordTypes.UserEditAtom.typeID) {
usredit = (UserEditAtom)_records[i];
}
}
assertNotNull(usredit);
// Has two slides // Has two slides
assertEquals(2, ss_two.getSlides().length); assertEquals(2, ss_two.getSlides().length);
Slide s1 = ss_two.getSlides()[0]; Slide s1 = ss_two.getSlides()[0];
@ -168,14 +194,15 @@ public class TestAddingSlides extends TestCase {
assertEquals(257, s2._getSheetNumber()); assertEquals(257, s2._getSheetNumber());
assertEquals(6, s2._getSheetRefId()); // master and 1 have notes assertEquals(6, s2._getSheetRefId()); // master and 1 have notes
assertEquals(2, s2.getSlideNumber()); assertEquals(2, s2.getSlideNumber());
// Add a third one // Add a third one
Slide s3 = ss_two.createSlide(); Slide s3 = ss_two.createSlide();
assertEquals(3, ss_two.getSlides().length); assertEquals(3, ss_two.getSlides().length);
assertEquals(258, s3._getSheetNumber()); assertEquals(258, s3._getSheetNumber());
assertEquals(8, s3._getSheetRefId()); // lots of notes before us assertEquals(8, s3._getSheetRefId()); // lots of notes before us
assertEquals(3, s3.getSlideNumber()); assertEquals(3, s3.getSlideNumber());
assertEquals(usredit.getMaxPersistWritten(), s3._getSheetRefId());
// Write out, and read back in // Write out, and read back in
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
hss_two.write(baos); hss_two.write(baos);