Author: maxcom
Date: Mon Feb  8 12:08:15 2010
New Revision: 907626

URL: http://svn.apache.org/viewvc?rev=907626&view=rev
Log:
XSLFCommonSlideData: extract text data from group shape

Modified:
    
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java?rev=907626&r1=907625&r2=907626&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java 
(original)
+++ 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java 
Mon Feb  8 12:08:15 2010
@@ -26,16 +26,10 @@
 
         List<DrawingParagraph> out = new ArrayList<DrawingParagraph>();
 
-        CTShape[] shapes = gs.getSpArray();
-        for (int i = 0; i < shapes.length; i++) {
-            CTTextBody ctTextBody = shapes[i].getTxBody();
-            if (ctTextBody==null) {
-                continue;
-            }
+        processShape(gs, out);
 
-            DrawingTextBody textBody = new DrawingTextBody(ctTextBody);
-
-            out.addAll(Arrays.asList(textBody.getParagraphs()));
+        for (CTGroupShape shape : gs.getGrpSpArray()) {
+            processShape(shape, out);
         }
 
         CTGraphicalObjectFrame[] graphicFrames = gs.getGraphicFrameArray();
@@ -64,4 +58,18 @@
         return out;
     }
 
+    private void processShape(CTGroupShape gs, List<DrawingParagraph> out) {
+        CTShape[] shapes = gs.getSpArray();
+        for (int i = 0; i < shapes.length; i++) {
+            CTTextBody ctTextBody = shapes[i].getTxBody();
+            if (ctTextBody==null) {
+                continue;
+            }
+
+            DrawingTextBody textBody = new DrawingTextBody(ctTextBody);
+
+            out.addAll(Arrays.asList(textBody.getParagraphs()));
+        }
+    }
+
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to