You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2008/09/09 08:58:36 UTC
svn commit: r693383 - in /poi/trunk/src/java/org/apache/poi:
ddf/EscherContainerRecord.java hssf/model/Workbook.java
Author: yegor
Date: Mon Sep 8 23:58:35 2008
New Revision: 693383
URL: http://svn.apache.org/viewvc?rev=693383&view=rev
Log:
don't increment the number of shapes when cloning a sheet with drawings
Modified:
poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java?rev=693383&r1=693382&r2=693383&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java Mon Sep 8 23:58:35 2008
@@ -243,10 +243,11 @@
public void getRecordsById(short recordId, List out){
for(Iterator it = childRecords.iterator(); it.hasNext();) {
Object er = it.next();
- if(er instanceof EscherContainerRecord) {
- EscherContainerRecord c = (EscherContainerRecord)er;
+ EscherRecord r = (EscherRecord)er;
+ if(r instanceof EscherContainerRecord) {
+ EscherContainerRecord c = (EscherContainerRecord)r;
c.getRecordsById(recordId, out );
- } else if (er instanceof EscherSpRecord){
+ } else if (r.getRecordId() == recordId){
out.add(er);
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java?rev=693383&r1=693382&r2=693383&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java Mon Sep 8 23:58:35 2008
@@ -2493,6 +2493,8 @@
for(Iterator spIt = spRecords.iterator(); spIt.hasNext();) {
EscherSpRecord sp = (EscherSpRecord)spIt.next();
int shapeId = drawingManager.allocateShapeId((short)dgId, dg);
+ //allocateShapeId increments the number of shapes. roll back to the previous value
+ dg.setNumShapes(dg.getNumShapes()-1);
sp.setShapeId(shapeId);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org