<!-- Don't forget to update status.xml too! -->
<release version="3.0.2-FINAL" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="fix">31795 - Support cloning of sheets with certain drawing objects on them</action>
<action dev="POI-DEVELOPERS" type="fix">43902 - Don't consider merged regions when auto-sizing columns</action>
<action dev="POI-DEVELOPERS" type="fix">42464 - Avoid "Expected ExpPtg to be converted from Shared to Non-Shared Formula" on large, formula heavy worksheets</action>
<action dev="POI-DEVELOPERS" type="add">42033 - Add support for named ranges with unicode names</action>
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.0.2-FINAL" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="fix">31795 - Support cloning of sheets with certain drawing objects on them</action>
<action dev="POI-DEVELOPERS" type="fix">43902 - Don't consider merged regions when auto-sizing columns</action>
<action dev="POI-DEVELOPERS" type="fix">42464 - Avoid "Expected ExpPtg to be converted from Shared to Non-Shared Formula" on large, formula heavy worksheets</action>
<action dev="POI-DEVELOPERS" type="add">42033 - Add support for named ranges with unicode names</action>
import org.apache.poi.ddf.NullEscherSerializationListener;
import org.apache.poi.util.LittleEndian;
+import java.io.ByteArrayInputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
{
if (id != getSid())
{
- throw new RecordFormatException("Not an escher record");
+ throw new RecordFormatException("Not an escher record! (sid was " + id + ", expecting " + getSid() + ")");
}
}
public Object clone()
{
- throw new IllegalStateException("Not implemented yet.");
+ // Do it via a re-serialise
+ // It's a cheat, but it works...
+ byte[] b = serialize();
+ RecordInputStream rinp = new RecordInputStream(
+ new ByteArrayInputStream(b)
+ );
+ rinp.nextRecord();
+
+ Record[] r = RecordFactory.createRecord(rinp);
+ if(r.length != 1) {
+ throw new IllegalStateException("Re-serialised a record to clone it, but got " + r.length + " records back!");
+ }
+ return r[0];
}
public void addEscherRecord(int index, EscherRecord element)
}
public Object clone() {
- if (recordData == null) {
- recordData = new byte[ 0 ];
- }
-
DrawingRecord rec = new DrawingRecord();
- rec.recordData = new byte[ recordData.length ];
- rec.contd = new byte[ contd.length ];
- System.arraycopy(recordData, 0, rec.recordData, 0, recordData.length);
- System.arraycopy(contd, 0, rec.contd, 0, contd.length);
+
+ if (recordData != null) {
+ rec.recordData = new byte[ recordData.length ];
+ System.arraycopy(recordData, 0, rec.recordData, 0, recordData.length);
+ }
+ if (contd != null) {
+ System.arraycopy(contd, 0, rec.contd, 0, contd.length);
+ rec.contd = new byte[ contd.length ];
+ }
return rec;
}
assertEquals(b.getSelectedTab(), 1);
assertEquals(b.getDisplayedTab(), 1);
}
+
+ public void testSheetClone() throws Exception {
+ // First up, try a simple file
+ HSSFWorkbook b = new HSSFWorkbook();
+ assertEquals(0, b.getNumberOfSheets());
+ b.createSheet("Sheet One");
+ b.createSheet("Sheet Two");
+
+ assertEquals(2, b.getNumberOfSheets());
+ b.cloneSheet(0);
+ assertEquals(3, b.getNumberOfSheets());
+
+ // Now try a problem one with drawing records in it
+ b = new HSSFWorkbook(
+ new FileInputStream(new File(filename,"SheetWithDrawing.xls"))
+ );
+ assertEquals(1, b.getNumberOfSheets());
+ b.cloneSheet(0);
+ assertEquals(2, b.getNumberOfSheets());
+ }
}
\ No newline at end of file