Attempt to fix bug 63901

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
index 1949e7e66f4c0de9e78137770638fcfb9ce5f0f2..45870ded5cf1a9f9f48db11aea034b2c6aca620d 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
@@ -273,7 +273,7 @@ public final class XSSFDrawing extends POIXMLDocumentPart implements Drawing<XSS
         destAnchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
         XSSFChart destChart = createChart(destAnchor);
         destChart.getCTChartSpace().set(srcChart.getCTChartSpace().copy());
-        destChart.getCTChart().set(srcChart.getCTChart().copy());
+        destChart.getCTChart().set(destChart.getCTChartSpace().getChart());
         return destChart;
     }
 

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index c6c015a4427ee241e06fc19cda6578aa5171e037..cc7e2bb85c0acc79f4d20b7f8ac814d826fa13e3 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -43,11 +43,12 @@ import javax.xml.namespace.QName;
 
 import org.apache.commons.collections4.ListValuedMap;
 import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import org.apache.poi.hpsf.ClassIDPredefined;
 import org.apache.poi.ooxml.POIXMLDocument;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLException;
 import org.apache.poi.ooxml.POIXMLProperties;
-import org.apache.poi.hpsf.ClassIDPredefined;
+import org.apache.poi.ooxml.util.PackageHelper;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -67,8 +68,13 @@ import org.apache.poi.ss.formula.SheetNameFormatter;
 import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
 import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
 import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Date1904Support;
+import org.apache.poi.ss.usermodel.Name;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.SheetVisibility;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.ss.util.WorkbookUtil;
 import org.apache.poi.util.Beta;
@@ -77,7 +83,6 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.NotImplemented;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.ooxml.util.PackageHelper;
 import org.apache.poi.util.Removal;
 import org.apache.poi.util.Units;
 import org.apache.poi.xssf.XLSBUnsupportedException;
@@ -123,6 +128,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * @deprecated POI 3.17 beta 1
      * @see Units#DEFAULT_CHARACTER_WIDTH
      */
+    @Deprecated
     @Removal(version="4.1")
     public static final float DEFAULT_CHARACTER_WIDTH = Units.DEFAULT_CHARACTER_WIDTH;
 
@@ -668,9 +674,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
             }
             XSSFDrawing clonedDg = clonedSheet.createDrawingPatriarch();
             // copy drawing contents
-            clonedDg.getCTDrawing().set(dg.getCTDrawing());
-
-            clonedDg = clonedSheet.createDrawingPatriarch();
+            clonedDg.getCTDrawing().set(dg.getCTDrawing().copy());
 
             // Clone drawing relations
             List<RelationPart> srcRels = srcSheet.createDrawingPatriarch().getRelationParts();