You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by se...@apache.org on 2011/08/31 15:14:10 UTC
svn commit: r1163615 - in /poi/trunk/src: java/org/apache/poi/ddf/
java/org/apache/poi/hssf/record/ scratchpad/src/org/apache/poi/hslf/model/
Author: sergey
Date: Wed Aug 31 13:14:09 2011
New Revision: 1163615
URL: http://svn.apache.org/viewvc?rev=1163615&view=rev
Log:
replace getInstance() / getOptions() with getShapeType for EscherSpRecord
replace getOptions() with getInstance() for other cases
Modified:
poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
poi/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherBlipWMFRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java
poi/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java
poi/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
Modified: poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java Wed Aug 31 13:14:09 2011
@@ -152,8 +152,11 @@ public abstract class AbstractEscherOptR
stringBuilder.append( " isContainer: " );
stringBuilder.append( isContainerRecord() );
stringBuilder.append( nl );
- stringBuilder.append( " options: 0x" );
- stringBuilder.append( HexDump.toHex( getOptions() ) );
+ stringBuilder.append( " version: 0x" );
+ stringBuilder.append( HexDump.toHex( getVersion() ) );
+ stringBuilder.append( nl );
+ stringBuilder.append( " instance: 0x" );
+ stringBuilder.append( HexDump.toHex( getInstance() ) );
stringBuilder.append( nl );
stringBuilder.append( " recordId: 0x" );
stringBuilder.append( HexDump.toHex( getRecordId() ) );
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherBSERecord.java Wed Aug 31 13:14:09 2011
@@ -313,7 +313,8 @@ public final class EscherBSERecord exten
String extraData = _remainingData == null ? null : HexDump.toHex(_remainingData, 32);
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex( RECORD_ID ) + '\n' +
- " Options: 0x" + HexDump.toHex( getOptions() ) + '\n' +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
" BlipTypeWin32: " + field_1_blipTypeWin32 + '\n' +
" BlipTypeMacOS: " + field_2_blipTypeMacOS + '\n' +
" SUID: " + (field_3_uid == null ? "" : HexDump.toHex(field_3_uid)) + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherBitmapBlip.java Wed Aug 31 13:14:09 2011
@@ -108,7 +108,8 @@ public class EscherBitmapBlip extends Es
}
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex( getRecordId() ) + nl +
- " Options: 0x" + HexDump.toHex( getOptions() ) + nl +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + nl +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + nl +
" UID: 0x" + HexDump.toHex( field_1_UID ) + nl +
" Marker: 0x" + HexDump.toHex( field_2_marker ) + nl +
" Extra Data:" + nl + extraData;
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherBlipRecord.java Wed Aug 31 13:14:09 2011
@@ -77,7 +77,8 @@ public class EscherBlipRecord extends Es
String extraData = HexDump.toHex(field_pictureData, 32);
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
- " Options: 0x" + HexDump.toHex( getOptions() ) + '\n' +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
" Extra Data:" + '\n' + extraData;
}
}
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherBlipWMFRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherBlipWMFRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherBlipWMFRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherBlipWMFRecord.java Wed Aug 31 13:14:09 2011
@@ -334,7 +334,8 @@ public class EscherBlipWMFRecord
}
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex( getRecordId() ) + nl +
- " Options: 0x" + HexDump.toHex( getOptions() ) + nl +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + nl +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + nl +
" Secondary UID: " + HexDump.toHex( field_1_secondaryUID ) + nl +
" CacheOfSize: " + field_2_cacheOfSize + nl +
" BoundaryTop: " + field_3_boundaryTop + nl +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java Wed Aug 31 13:14:09 2011
@@ -88,7 +88,8 @@ public class EscherChildAnchorRecord
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
- " Options: 0x" + HexDump.toHex(getOptions()) + nl +
+ " Version: 0x" + HexDump.toHex(getVersion()) + nl +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + nl +
" X1: " + field_1_dx1 + nl +
" Y1: " + field_2_dy1 + nl +
" X2: " + field_3_dx2 + nl +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java Wed Aug 31 13:14:09 2011
@@ -145,7 +145,8 @@ public class EscherClientAnchorRecord
}
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
- " Options: 0x" + HexDump.toHex(getOptions()) + nl +
+ " Version: 0x" + HexDump.toHex(getVersion()) + nl +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + nl +
" Flag: " + field_1_flag + nl +
" Col1: " + field_2_col1 + nl +
" DX1: " + field_3_dx1 + nl +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherClientDataRecord.java Wed Aug 31 13:14:09 2011
@@ -92,7 +92,8 @@ public class EscherClientDataRecord
}
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
- " Options: 0x" + HexDump.toHex(getOptions()) + nl +
+ " Version: 0x" + HexDump.toHex(getVersion()) + nl +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + nl +
" Extra Data:" + nl +
extraData;
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=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java Wed Aug 31 13:14:09 2011
@@ -248,7 +248,8 @@ public final class EscherContainerRecord
return getClass().getName() + " (" + getRecordName() + "):" + nl
+ " isContainer: " + isContainerRecord() + nl
- + " options: 0x" + HexDump.toHex( getOptions() ) + nl
+ + " version: 0x" + HexDump.toHex( getVersion() ) + nl
+ + " instance: 0x" + HexDump.toHex( getInstance() ) + nl
+ " recordId: 0x" + HexDump.toHex( getRecordId() ) + nl
+ " numchildren: " + _childRecords.size() + nl
+ children.toString();
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherDgRecord.java Wed Aug 31 13:14:09 2011
@@ -88,7 +88,8 @@ public class EscherDgRecord
public String toString() {
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
- " Options: 0x" + HexDump.toHex(getOptions()) + '\n' +
+ " Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
" NumShapes: " + field_1_numShapes + '\n' +
" LastMSOSPID: " + field_2_lastMSOSPID + '\n';
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java Wed Aug 31 13:14:09 2011
@@ -132,7 +132,8 @@ public final class EscherDggRecord exten
}
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
- " Options: 0x" + HexDump.toHex(getOptions()) + '\n' +
+ " Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
" ShapeIdMax: " + field_1_shapeIdMax + '\n' +
" NumIdClusters: " + getNumIdClusters() + '\n' +
" NumShapesSaved: " + field_3_numShapesSaved + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherMetafileBlip.java Wed Aug 31 13:14:09 2011
@@ -247,7 +247,8 @@ public final class EscherMetafileBlip ex
String extraData = "";//HexDump.toHex(field_pictureData, 32);
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
- " Options: 0x" + HexDump.toHex( getOptions() ) + '\n' +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
" UID: 0x" + HexDump.toHex( field_1_UID ) + '\n' +
(field_2_UID == null ? "" : (" UID2: 0x" + HexDump.toHex( field_2_UID ) + '\n')) +
" Uncompressed Size: " + HexDump.toHex( field_2_cb ) + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherPictBlip.java Wed Aug 31 13:14:09 2011
@@ -202,7 +202,8 @@ public final class EscherPictBlip extend
String extraData = HexDump.toHex(field_pictureData, 32);
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
- " Options: 0x" + HexDump.toHex( getOptions() ) + '\n' +
+ " Version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
+ " Instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
" UID: 0x" + HexDump.toHex( field_1_UID ) + '\n' +
" Uncompressed Size: " + HexDump.toHex( field_2_cb ) + '\n' +
" Bounds: " + getBounds() + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherSpRecord.java Wed Aug 31 13:14:09 2011
@@ -108,7 +108,8 @@ public class EscherSpRecord
return getClass().getName() + ":" + nl +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + nl +
- " Options: 0x" + HexDump.toHex(getOptions()) + nl +
+ " Version: 0x" + HexDump.toHex(getVersion()) + nl +
+ " ShapeType: 0x" + HexDump.toHex(getShapeType()) + nl +
" ShapeId: " + field_1_shapeId + nl +
" Flags: " + decodeFlags(field_2_flags) + " (0x" + HexDump.toHex(field_2_flags) + ")" + nl;
@@ -197,4 +198,27 @@ public class EscherSpRecord
{
this.field_2_flags = field_2_flags;
}
+
+ /**
+ * Returns shape type. Must be one of MSOSPT values (see [MS-ODRAW] for
+ * details).
+ *
+ * @return shape type
+ */
+ public short getShapeType()
+ {
+ return getInstance();
+ }
+
+ /**
+ * Sets shape type. Must be one of MSOSPT values (see [MS-ODRAW] for
+ * details).
+ *
+ * @param value
+ * new shape type
+ */
+ public void setShapeType( short value )
+ {
+ setInstance( value );
+ }
}
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherSpgrRecord.java Wed Aug 31 13:14:09 2011
@@ -89,7 +89,8 @@ public class EscherSpgrRecord
public String toString() {
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
- " Options: 0x" + HexDump.toHex(getOptions()) + '\n' +
+ " Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
" RectX: " + field_1_rectX1 + '\n' +
" RectY: " + field_2_rectY1 + '\n' +
" RectWidth: " + field_3_rectX2 + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java Wed Aug 31 13:14:09 2011
@@ -90,7 +90,8 @@ public class EscherSplitMenuColorsRecord
public String toString() {
return getClass().getName() + ":" + '\n' +
" RecordId: 0x" + HexDump.toHex(RECORD_ID) + '\n' +
- " Options: 0x" + HexDump.toHex(getOptions()) + '\n' +
+ " Version: 0x" + HexDump.toHex(getVersion()) + '\n' +
+ " Instance: 0x" + HexDump.toHex(getInstance()) + '\n' +
" Color1: 0x" + HexDump.toHex(field_1_color1) + '\n' +
" Color2: 0x" + HexDump.toHex(field_2_color2) + '\n' +
" Color3: 0x" + HexDump.toHex(field_3_color3) + '\n' +
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherTextboxRecord.java Wed Aug 31 13:14:09 2011
@@ -132,7 +132,8 @@ public class EscherTextboxRecord extends
return getClass().getName() + ":" + nl +
" isContainer: " + isContainerRecord() + nl +
- " options: 0x" + HexDump.toHex( getOptions() ) + nl +
+ " version: 0x" + HexDump.toHex( getVersion() ) + nl +
+ " instance: 0x" + HexDump.toHex( getInstance() ) + nl +
" recordId: 0x" + HexDump.toHex( getRecordId() ) + nl +
" numchildren: " + getChildRecords().size() + nl +
theDumpHex;
Modified: poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java Wed Aug 31 13:14:09 2011
@@ -135,7 +135,8 @@ public final class UnknownEscherRecord e
return getClass().getName() + ":" + '\n' +
" isContainer: " + isContainerRecord() + '\n' +
- " options: 0x" + HexDump.toHex( getOptions() ) + '\n' +
+ " version: 0x" + HexDump.toHex( getVersion() ) + '\n' +
+ " instance: 0x" + HexDump.toHex( getInstance() ) + '\n' +
" recordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
" numchildren: " + getChildRecords().size() + '\n' +
theDumpHex +
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java Wed Aug 31 13:14:09 2011
@@ -616,7 +616,7 @@ public final class EscherAggregate exten
{
EscherSpRecord spRecord = shapeContainer
.getChildById( EscherSpRecord.RECORD_ID );
- int type = spRecord.getOptions() >> 4;
+ int type = spRecord.getShapeType();
switch (type)
{
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java Wed Aug 31 13:14:09 2011
@@ -130,7 +130,7 @@ public abstract class Shape {
*/
public int getShapeType(){
EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
- return spRecord.getOptions() >> 4;
+ return spRecord.getShapeType();
}
/**
@@ -139,7 +139,8 @@ public abstract class Shape {
*/
public void setShapeType(int type){
EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
- spRecord.setOptions((short)(type << 4 | 0x2));
+ spRecord.setShapeType( (short) type );
+ spRecord.setVersion( (short) 0x2 );
}
/**
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java?rev=1163615&r1=1163614&r2=1163615&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java Wed Aug 31 13:14:09 2011
@@ -72,7 +72,7 @@ public final class ShapeFactory {
Shape shape = null;
EscherSpRecord spRecord = spContainer.getChildById(EscherSpRecord.RECORD_ID);
- int type = spRecord.getOptions() >> 4;
+ int type = spRecord.getShapeType();
switch (type){
case ShapeTypes.TextBox:
shape = new TextBox(spContainer, parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org