Bugzilla 54407 - Avoid XmlValueDisconnectedException when merging slides

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

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
index 5beb53850c3cd973d847ecf7c2bca26682313fc5..529bacf734d6608acbc92f200c60e080e4a74358 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
@@ -19,13 +19,21 @@
 \r
 package org.apache.poi.xslf.usermodel;\r
 \r
+import org.apache.poi.POIXMLException;\r
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;\r
+import org.apache.poi.openxml4j.opc.PackagePart;\r
+import org.apache.poi.openxml4j.opc.PackageRelationship;\r
 import org.apache.poi.util.Beta;\r
 import org.apache.poi.util.Units;\r
+import org.apache.xmlbeans.XmlCursor;\r
+import org.apache.xmlbeans.XmlObject;\r
+import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObjectData;\r
 import org.openxmlformats.schemas.drawingml.x2006.main.CTPoint2D;\r
 import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;\r
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTransform2D;\r
 import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;\r
 \r
+import javax.xml.namespace.QName;\r
 import java.awt.Graphics2D;\r
 import java.awt.geom.Rectangle2D;\r
 \r
@@ -151,5 +159,54 @@ public class XSLFGraphicFrame extends XSLFShape {
 \r
     }\r
 \r
+    @Override\r
+    void copy(XSLFShape sh){\r
+        super.copy(sh);\r
+\r
+        CTGraphicalObjectData data = _shape.getGraphic().getGraphicData();\r
+        String uri = data.getUri();\r
+        if(uri.equals("http://schemas.openxmlformats.org/drawingml/2006/diagram")){\r
+            copyDiagram(data, (XSLFGraphicFrame)sh);\r
+        } else {\r
+            // TODO  support other types of objects\r
+\r
+        }\r
+    }\r
+\r
+    // TODO should be moved to a sub-class\r
+    private void copyDiagram(CTGraphicalObjectData objData, XSLFGraphicFrame srcShape){\r
+        String xpath = "declare namespace dgm='http://schemas.openxmlformats.org/drawingml/2006/diagram' $this//dgm:relIds";\r
+        XmlObject[] obj = objData.selectPath(xpath);\r
+        if(obj != null && obj.length == 1){\r
+            XmlCursor c = obj[0].newCursor();\r
+\r
+            XSLFSheet sheet = srcShape.getSheet();\r
+            try {\r
+                String dm = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "dm"));\r
+                PackageRelationship dmRel = sheet.getPackagePart().getRelationship(dm);\r
+                PackagePart dmPart = sheet.getPackagePart().getRelatedPart(dmRel);\r
+                _sheet.importPart(dmRel, dmPart);\r
+\r
+                String lo = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "lo"));\r
+                PackageRelationship loRel = sheet.getPackagePart().getRelationship(lo);\r
+                PackagePart loPart = sheet.getPackagePart().getRelatedPart(loRel);\r
+                _sheet.importPart(loRel, loPart);\r
+\r
+                String qs = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "qs"));\r
+                PackageRelationship qsRel = sheet.getPackagePart().getRelationship(qs);\r
+                PackagePart qsPart = sheet.getPackagePart().getRelatedPart(qsRel);\r
+                _sheet.importPart(qsRel, qsPart);\r
+\r
+                String cs = c.getAttributeText(new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "cs"));\r
+                PackageRelationship csRel = sheet.getPackagePart().getRelationship(cs);\r
+                PackagePart csPart = sheet.getPackagePart().getRelatedPart(csRel);\r
+                _sheet.importPart(csRel, csPart);\r
+\r
+            } catch (InvalidFormatException e){\r
+                throw new POIXMLException(e);\r
+            }\r
+            c.dispose();\r
+        }\r
+    }\r
 \r
 }
\ No newline at end of file

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
index 63d3e8f37cc6b6675ff01c25fa223cc148b4ce0d..ddf78ba9a492473f49cfe25357a5393158808103 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
@@ -18,11 +18,13 @@ package org.apache.poi.xslf.usermodel;
 
 import org.apache.poi.POIXMLDocumentPart;
 import org.apache.poi.POIXMLException;
+import org.apache.poi.openxml4j.opc.OPCPackage;
 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.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.Beta;
+import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.Internal;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
@@ -39,6 +41,7 @@ import javax.xml.namespace.QName;
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -297,6 +300,8 @@ public abstract class XSLFSheet extends POIXMLDocumentPart implements XSLFShapeC
         _spTree = null;
         _drawing = null;
         _spTree = null;
+        _placeholders = null;
+
         // first copy the source xml
         getSpTree().set(src.getSpTree());
 
@@ -534,4 +539,30 @@ public abstract class XSLFSheet extends POIXMLDocumentPart implements XSLFShapeC
 
         return rel.getId();
     }
+
+    /**
+     * Import a package part into this sheet.
+     */
+    PackagePart importPart(PackageRelationship srcRel, PackagePart srcPafrt) {
+
+        OPCPackage pkg = getPackagePart().getPackage();
+        if(!pkg.containPart(srcPafrt.getPartName())){
+            PackageRelationship rel = getPackagePart().addRelationship(
+                    srcPafrt.getPartName(), TargetMode.INTERNAL, srcRel.getRelationshipType());
+
+            PackagePart part = pkg.createPart(srcPafrt.getPartName(), srcPafrt.getContentType());
+            OutputStream out = part.getOutputStream();
+            try {
+                InputStream is = srcPafrt.getInputStream();
+                IOUtils.copy(is, out);
+                out.close();
+            } catch (IOException e){
+                throw new POIXMLException(e);
+            }
+            return part;
+        }  else {
+            // already exists
+            return pkg.getPart(srcPafrt.getPartName());
+        }
+    }
 }
\ No newline at end of file