Snapshot commit - still lots of errors, xslf rendering works, started work on hslf

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/common_sl@1667902 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 11 deletions

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
index 57e96f8ee5..9a58a5128a 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
@@ -19,25 +19,19 @@
 

 package org.apache.poi.xslf.usermodel;

 

-import java.awt.Graphics2D;

-import java.awt.geom.AffineTransform;

 import java.awt.geom.Rectangle2D;

 import java.util.Iterator;

 import java.util.List;

 import java.util.regex.Pattern;

 

-import org.apache.poi.openxml4j.opc.PackagePart;

-import org.apache.poi.openxml4j.opc.PackageRelationship;

-import org.apache.poi.openxml4j.opc.TargetMode;

-import org.apache.poi.sl.usermodel.*;

+import org.apache.poi.openxml4j.opc.*;

+import org.apache.poi.sl.usermodel.PlaceableShape;

+import org.apache.poi.sl.usermodel.ShapeGroup;

 import org.apache.poi.util.Beta;

 import org.apache.poi.util.Units;

 import org.apache.xmlbeans.XmlObject;

 import org.openxmlformats.schemas.drawingml.x2006.main.*;

-import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;

-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape;

-import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShapeNonVisual;

-import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;

+import org.openxmlformats.schemas.presentationml.x2006.main.*;

 

 /**

  * Represents a group shape that consists of many shapes grouped together.

@@ -45,7 +39,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
  * @author Yegor Kozlov

  */

 @Beta

-public class XSLFGroupShape extends XSLFShape implements XSLFShapeContainer, PlaceableShape {

+public class XSLFGroupShape extends XSLFShape implements XSLFShapeContainer, ShapeGroup<XSLFShape> {

     private final List<XSLFShape> _shapes;

     private final CTGroupShapeProperties _grpSpPr;

     private XSLFDrawing _drawing;