From 0b2d3cf6938806e4086bfb4766e95572d5bd9134 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Sat, 27 Jun 2009 10:25:23 +0000 Subject: [PATCH] fixed typo in SlideShow.removeSlide which prevened deletion of slide's notes, see Bugzilla 47261 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@788948 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hslf/usermodel/SlideShow.java | 14 ++++++++++---- .../org/apache/poi/hslf/data/47261.ppt | Bin 183296 -> 378368 bytes .../poi/hslf/usermodel/TestAddingSlides.java | 11 +++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java index cf8d89050f..b456798bae 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java @@ -590,6 +590,10 @@ public final class SlideShow { ArrayList records = new ArrayList(); ArrayList sa = new ArrayList(); ArrayList sl = new ArrayList(); + + ArrayList nt = new ArrayList(); + for(Notes notes : getNotes()) nt.add(notes); + for (int i = 0, num = 0; i < _slides.length; i++){ if(i != index) { sl.add(_slides[i]); @@ -599,6 +603,7 @@ public final class SlideShow { records.addAll(Arrays.asList(sas[i].getSlideRecords())); } else { removedSlide = _slides[i]; + nt.remove(_slides[i].getNotesSheet()); } } if(sa.size() == 0){ @@ -610,8 +615,9 @@ public final class SlideShow { _slides = sl.toArray(new Slide[sl.size()]); //if the removed slide had notes - remove references to them too + if(removedSlide != null){ - int notesId = removedSlide.getSlideRecord().getSlideAtom().getNotesID(); + int notesId = removedSlide.getSlideRecord().getSlideAtom().getNotesID(); if(notesId != 0){ SlideListWithText nslwt = _documentRecord.getNotesSlideListWithText(); records = new ArrayList(); @@ -626,13 +632,13 @@ public final class SlideShow { if(na.size() == 0){ _documentRecord.removeSlideListWithText(nslwt); } else { - slwt.setSlideAtomsSets( na.toArray(new SlideAtomsSet[na.size()]) ); - slwt.setChildRecord(records.toArray(new Record[records.size()])); + nslwt.setSlideAtomsSets( na.toArray(new SlideAtomsSet[na.size()]) ); + nslwt.setChildRecord(records.toArray(new Record[records.size()])); } } - } + _notes = nt.toArray(new Notes[nt.size()]); return removedSlide; } diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/47261.ppt b/src/scratchpad/testcases/org/apache/poi/hslf/data/47261.ppt index be472de7c9bdf0c9d28018165810dc339ccad920..7a26a7981ead3957b6d07aca8fd2278d0eb7a1ba 100755 GIT binary patch delta 115278 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 delta 2247 zcmb_ee@xX?6u-Z|@O*+_@IBuHBzeRS`SBPi6lVE@h6e13ztFN_VoB2ijUOXIOF#wZ z(g2ZzLqQOx6DDIwH!NYA&fnTW15bRjg6705GSjVo<;I3-7b&vZL#5vvElqk zY`A#3tx_oA41qT$%ZK?3aI#fSawCAY&z zRl*LnRl+nO0(B1}nIJksro-o@DgnmQWf*KKRXI>tC4wL!LONm7OlgA5PAwY>s)ZBW z)xyC!q-|7FpeRm@knkt>)S0z+O{z8HQxlZEtmZ`|taP&=Fp&F0VCON{r^Z097Yp@S zsH<9TO`|O3B)j2Sp(5@CZIbB-d%N-)bJ_+Yka3e$En3z=N)gvL)p-l(a zE#kS=b7r^bP;zja8wy**8t(QCvWvq@*0v1xZEpjCJj-UNQo}z!lQj6rL9{W zOAJGZItx-q@#yPJcn{GPkS4DQ87B+-%2Bk?!l3XAd1;Q$yfRYIp|~z7Ck}KH$gF9Uvjcv| zt;i3Jb1cz_a^{4kEfRb&D(@cnwME9LExRy&+g>?0$;bv>EylWZx`Mb3wzu@V4Xena%L-Oxxo}JujgVzzro+z-GA_>XVo6yM;+v1crsVTGXa6wBedDsG zqqDy~$0dTZbZkMKECj`C diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java index 4ffeb87894..dd1ccd0b4e 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java @@ -279,15 +279,18 @@ public final class TestAddingSlides extends TestCase { Slide[] slides = ppt.getSlides(); Document doc = ppt.getDocumentRecord(); assertNotNull(doc.getSlideSlideListWithText()); - assertEquals(1, ppt.getSlides().length); + assertEquals(14, ppt.getSlides().length); int notesId = slides[0].getSlideRecord().getSlideAtom().getNotesID(); assertTrue(notesId > 0); assertNotNull(doc.getNotesSlideListWithText()); - //the SLWT container for notes has one entry which will deleted - assertEquals(1, doc.getNotesSlideListWithText().getSlideAtomsSets().length); + assertEquals(14, doc.getNotesSlideListWithText().getSlideAtomsSets().length); - ppt.removeSlide(0); + //remove all slides, corresponding notes should be removed too + for (int i = 0; i < slides.length; i++) { + ppt.removeSlide(0); + } assertEquals(0, ppt.getSlides().length); + assertEquals(0, ppt.getNotes().length); assertNull(doc.getSlideSlideListWithText()); assertNull(doc.getNotesSlideListWithText()); -- 2.39.5