You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by ye...@apache.org on 2007/05/24 13:38:37 UTC
svn commit: r541274 - in /jakarta/poi/trunk/src/scratchpad:
src/org/apache/poi/hslf/model/ShapeGroup.java
testcases/org/apache/poi/hslf/data/42485.ppt
testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Author: yegor
Date: Thu May 24 04:38:36 2007
New Revision: 541274
URL: http://svn.apache.org/viewvc?view=rev&rev=541274
Log:
fixed bug 42485: All TextBoxes inside ShapeGroups have null TextRuns
Added:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt (with props)
Modified:
jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Modified: jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
URL: http://svn.apache.org/viewvc/jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java?view=diff&rev=541274&r1=541273&r2=541274
==============================================================================
--- jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java (original)
+++ jakarta/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java Thu May 24 04:38:36 2007
@@ -64,6 +64,7 @@
// Create the Shape for it
EscherContainerRecord container = (EscherContainerRecord)r;
Shape shape = ShapeFactory.createShape(container, this);
+ shape.setSheet(getSheet());
shapeList.add( shape );
} else {
// Should we do anything special with these non
Added: jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt
URL: http://svn.apache.org/viewvc/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt?view=auto&rev=541274
==============================================================================
Binary file - no diff available.
Propchange: jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?view=diff&rev=541274&r1=541273&r2=541274
==============================================================================
--- jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java (original)
+++ jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java Thu May 24 04:38:36 2007
@@ -19,10 +19,7 @@
import junit.framework.TestCase;
import org.apache.poi.hslf.HSLFSlideShow;
-import org.apache.poi.hslf.model.Picture;
-import org.apache.poi.hslf.model.Slide;
-import org.apache.poi.hslf.model.Notes;
-import org.apache.poi.hslf.model.TextRun;
+import org.apache.poi.hslf.model.*;
import java.io.*;
import java.util.HashSet;
@@ -118,4 +115,29 @@
}
}
}
+
+ /**
+ * Bug 42485: All TextBoxes inside ShapeGroups have null TextRuns
+ */
+ public void test42485 () throws Exception {
+ FileInputStream is = new FileInputStream(new File(cwd, "42485.ppt"));
+ HSLFSlideShow hslf = new HSLFSlideShow(is);
+ is.close();
+
+ SlideShow ppt = new SlideShow(hslf);
+ Shape[] shape = ppt.getSlides()[0].getShapes();
+ for (int i = 0; i < shape.length; i++) {
+ if(shape[i] instanceof ShapeGroup){
+ ShapeGroup group = (ShapeGroup)shape[i];
+ Shape[] sh = group.getShapes();
+ for (int j = 0; j < sh.length; j++) {
+ if( sh[j] instanceof TextBox){
+ TextBox txt = (TextBox)sh[j];
+ assertNotNull(txt.getTextRun());
+ }
+ }
+ }
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/