Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E71D705A for ; Tue, 20 Sep 2011 08:52:54 +0000 (UTC) Received: (qmail 35035 invoked by uid 500); 20 Sep 2011 08:52:54 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 35004 invoked by uid 500); 20 Sep 2011 08:52:54 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 34997 invoked by uid 99); 20 Sep 2011 08:52:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2011 08:52:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2011 08:52:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 59B3C2388A3F for ; Tue, 20 Sep 2011 08:52:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1173034 - /poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java Date: Tue, 20 Sep 2011 08:52:31 -0000 To: commits@poi.apache.org From: sergey@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110920085231.59B3C2388A3F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergey Date: Tue Sep 20 08:52:30 2011 New Revision: 1173034 URL: http://svn.apache.org/viewvc?rev=1173034&view=rev Log: second field in TC is width Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java?rev=1173034&r1=1173033&r2=1173034&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java Tue Sep 20 08:52:30 2011 @@ -25,21 +25,14 @@ public final class TableCellDescriptor e { 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 e 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 e 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()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org