Return-Path: 
 <commits-return-2884-apmail-poi-commits-archive=poi.apache.org@poi.apache.org>
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 629A24D81
	for <apmail-poi-commits-archive@minotaur.apache.org>;
 Sat,  9 Jul 2011 11:15:20 +0000 (UTC)
Received: (qmail 75348 invoked by uid 500); 9 Jul 2011 11:15:20 -0000
Delivered-To: apmail-poi-commits-archive@poi.apache.org
Received: (qmail 75315 invoked by uid 500); 9 Jul 2011 11:15:19 -0000
Mailing-List: contact commits-help@poi.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@poi.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@poi.apache.org>
List-Post: <mailto:commits@poi.apache.org>
List-Id: <commits.poi.apache.org>
Reply-To: dev@poi.apache.org
Delivered-To: mailing list commits@poi.apache.org
Received: (qmail 75308 invoked by uid 99); 9 Jul 2011 11:15:18 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jul 2011 11:15:18 +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; Sat, 09 Jul 2011 11:15:15 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D91A12388980
	for <commits@poi.apache.org>; Sat,  9 Jul 2011 11:14:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1144641 - in
 /poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model:
 BytePropertyNode.java PAPX.java SectionTable.java
Date: Sat, 09 Jul 2011 11:14:53 -0000
To: commits@poi.apache.org
From: sergey@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110709111453.D91A12388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sergey
Date: Sat Jul  9 11:14:53 2011
New Revision: 1144641

URL: http://svn.apache.org/viewvc?rev=1144641&view=rev
Log:
fix the same problem with SPX and move deprecation to BytePropertyNode

Modified:
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java?rev=1144641&r1=1144640&r2=1144641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java Sat Jul  9 11:14:53 2011
@@ -49,11 +49,25 @@ public abstract class BytePropertyNode<T
                 this.endBytes = fcEnd;
 	}
 
-	public int getStartBytes() {
-                return startBytes;
-	}
+    /**
+     * @deprecated Though bytes are actually stored in file, it is advised to
+     *             use char positions for all operations. Including save
+     *             operations, because only char positions are preserved.
+     */
+	@Deprecated
+    public int getStartBytes()
+    {
+        return startBytes;
+    }
 
-	public int getEndBytes() {
-                return endBytes;
-	}
+    /**
+     * @deprecated Though bytes are actually stored in file, it is advised to
+     *             use char positions for all operations. Including save
+     *             operations, because only char positions are preserved.
+     */
+    @Deprecated
+    public int getEndBytes()
+    {
+        return endBytes;
+    }
 }

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java?rev=1144641&r1=1144640&r2=1144641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java Sat Jul  9 11:14:53 2011
@@ -123,31 +123,6 @@ public final class PAPX extends ByteProp
     return (SprmBuffer)_buf;
   }
 
-    /**
-     * @deprecated Though bytes are actually stored in file, it is advised to
-     *             use char positions for all operations. Including save
-     *             operations, because only char positions are preserved.
-     */
-    @Deprecated
-    @Override
-    public int getEndBytes()
-    {
-        return super.getEndBytes();
-    }
-
-    /**
-     * @deprecated Though bytes are actually stored in file, it is advised to
-     *             use char positions for all operations. Including save
-     *             operations, because only char positions are preserved.
-     */
-    @Deprecated
-    @Override
-    public int getStartBytes()
-    {
-        // TODO Auto-generated method stub
-        return super.getStartBytes();
-    }
-
   public ParagraphProperties getParagraphProperties(StyleSheet ss)
   {
     if(ss == null) {

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java?rev=1144641&r1=1144640&r2=1144641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java Sat Jul  9 11:14:53 2011
@@ -17,12 +17,13 @@
 
 package org.apache.poi.hwpf.model;
 
-import java.util.ArrayList;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.poi.hwpf.model.io.HWPFFileSystem;
+import org.apache.poi.hwpf.model.io.HWPFOutputStream;
 import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hwpf.model.io.*;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
@@ -180,21 +181,20 @@ public class SectionTable
       // add the section descriptor bytes to the PlexOfCps.
 
             /* original line */
-            // GenericPropertyNode property = new
-            // GenericPropertyNode(sepx.getStart(), sepx.getEnd(),
-            // sed.toByteArray());
+            GenericPropertyNode property = new GenericPropertyNode(
+                    sepx.getStart(), sepx.getEnd(), sed.toByteArray() );
             /*
              * Line using Ryan's FCtoCP() conversion method - unable to observe
              * any effect on our testcases when using this code - piers
              */
             /*
              * there is an effect on Bug45743.doc actually. writeoutreadback
-             * changes byte offset of chars (but preserve string offsets) -
-             * sergey
+             * changes byte offset of chars (but preserve string offsets).
+             * Changing back to original lines - sergey
              */
-            GenericPropertyNode property = new GenericPropertyNode(
-                    tpt.getCharIndex( sepx.getStartBytes() ),
-                    tpt.getCharIndex( sepx.getEndBytes() ), sed.toByteArray() );
+            // GenericPropertyNode property = new GenericPropertyNode(
+            // tpt.getCharIndex( sepx.getStartBytes() ),
+            // tpt.getCharIndex( sepx.getEndBytes() ), sed.toByteArray() );
 
       plex.addProperty(property);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org