The cloned reference for merged cells did not create a new collection,

so deletes cascaded to the original.
Reported by: huri@users.sourceforge.net
PR:  22720

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

diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
index 7f56b6b14e47f646b34a92c9ed988473fe3c9c66..62bbafbfab852f96d780843a6bb05d05b5b38ac4 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
@@ -326,7 +326,8 @@ public class MergeCellsRecord
     public Object clone() {
         MergeCellsRecord rec = new MergeCellsRecord();
         rec.field_1_num_areas = field_1_num_areas;
-        rec.field_2_regions = field_2_regions;
+        rec.field_2_regions = new ArrayList();
+        rec.field_2_regions.addAll(field_2_regions);
         return rec;
     }
 }

diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
new file mode 100644 (file)
index 0000000..2b1a7c6
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
@@ -0,0 +1,78 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003, 2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache POI" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache POI", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.poi.hssf.record;
+
+import junit.framework.TestCase;
+
+/**
+ * Make sure the merge cells record behaves
+ * @author Danny Mui (dmui at apache dot org)
+ *
+ */
+public class TestMergeCellsRecord extends TestCase {
+   
+   /**
+    * Make sure when a clone is called, we actually clone it.
+    * @throws Exception
+    */
+   public void testCloneReferences() throws Exception {
+      MergeCellsRecord merge = new MergeCellsRecord();
+      merge.addArea(0, (short)0, 1, (short)2);
+      MergeCellsRecord clone = (MergeCellsRecord)merge.clone();
+      
+      assertNotSame("Merged and cloned objects are the same", merge, clone);
+      merge.removeAreaAt(0);
+      assertNotNull("Clone's item not removed", clone.getAreaAt(0));
+   }
+}
\ No newline at end of file