From be424d3a099de86eb3f73e3eee96b6381146b8d2 Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Tue, 20 Sep 2011 08:52:30 +0000 Subject: [PATCH] second field in TC is width git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1173034 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hwpf/usermodel/TableCellDescriptor.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java index 5622dc4c0..812e3b661 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java @@ -25,21 +25,14 @@ public final class TableCellDescriptor extends TCAbstractType implements { public static final int SIZE = 20; - protected short field_x_unused; - public TableCellDescriptor() { - setBrcTop(new BorderCode()); - setBrcLeft(new BorderCode()); - setBrcBottom(new BorderCode()); - setBrcRight(new BorderCode()); - } protected void fillFields(byte[] data, int offset) { field_1_rgf = LittleEndian.getShort(data, 0x0 + offset); - field_x_unused = LittleEndian.getShort(data, 0x2 + offset); + field_2_wWidth = LittleEndian.getShort(data, 0x2 + offset); setBrcTop(new BorderCode(data, 0x4 + offset)); setBrcLeft(new BorderCode(data, 0x8 + offset)); setBrcBottom(new BorderCode(data, 0xc + offset)); @@ -49,7 +42,7 @@ public final class TableCellDescriptor extends TCAbstractType implements public void serialize(byte[] data, int offset) { LittleEndian.putShort(data, 0x0 + offset, field_1_rgf); - LittleEndian.putShort(data, 0x2 + offset, field_x_unused); + LittleEndian.putShort(data, 0x2 + offset, field_2_wWidth); getBrcTop().serialize(data, 0x4 + offset); getBrcLeft().serialize(data, 0x8 + offset); getBrcBottom().serialize(data, 0xc + offset); @@ -60,6 +53,7 @@ public final class TableCellDescriptor extends TCAbstractType implements throws CloneNotSupportedException { TableCellDescriptor tc = (TableCellDescriptor)super.clone(); + tc.setShd( (ShadingDescriptor) getShd().clone() ); tc.setBrcTop((BorderCode)getBrcTop().clone()); tc.setBrcLeft((BorderCode)getBrcLeft().clone()); tc.setBrcBottom((BorderCode)getBrcBottom().clone());