moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix the same problem with SPX and move deprecation to BytePropertyNode

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144641 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-07-09 11:14:53 +00:00
parent d07d8ec7f7
commit 1eba38d7cf
3 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
View File

@ -49,11 +49,25 @@ public abstract class BytePropertyNode<T extends BytePropertyNode<T>> extends
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;
}
}

25
src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
View File

@ -123,31 +123,6 @@ public final class PAPX extends BytePropertyNode<PAPX> {
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) {

20
src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
View File

@ -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);