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

handling case with overlapping bookmarks and fields 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1160201 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-08-22 11:07:06 +00:00
parent 50c5c7a98b
commit ec3ab612c8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
View File

@ -81,6 +81,13 @@ public abstract class AbstractWordConverter
{
return start < o.start ? -1 : start == o.start ? 0 : 1;
}
@Override
public String toString()
{
return "Structure [" + start + "; " + end + "): "
+ structure.toString();
}
}
private static final byte BEL_MARK = 7;
@ -116,8 +123,9 @@ public abstract class AbstractWordConverter
return;
}
if ( ( another.start > structure.start && another.end <= structure.end )
|| ( another.start >= structure.start && another.end < structure.end ) )
if ( ( structure.start < another.start && another.start < structure.end )
|| ( structure.start < another.start && another.end <= structure.end )
|| ( structure.start <= another.start && another.end < structure.end ) )
{
iterator.remove();
continue;