fix dead field structure boundaries

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1189226 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
index d8331eb8225732852d1a89f3e579565946245f39..c7ddf975181d8ef85f4164c12d6ec4a70748b445 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
@@ -341,7 +341,6 @@ public abstract class AbstractWordConverter
                 if ( aliveField != null )
                 {
                     addToStructures( structures, new Structure( aliveField ) );
-                    skipUntil = aliveField.getFieldEndOffset() + 1;
                 }
                 else
                 {
@@ -349,11 +348,14 @@ public abstract class AbstractWordConverter
                             wordDocument, range, c );
                     if ( separatorEnd != null )
                     {
-                        addToStructures( structures,
+                        addToStructures(
+                                structures,
                                 new Structure( new DeadFieldBoundaries( c,
                                         separatorEnd[0], separatorEnd[1] ),
-                                        characterRun.getStartOffset(),
-                                        separatorEnd[1] + 1 ) );
+                                        characterRun.getStartOffset(), range
+                                                .getCharacterRun(
+                                                        separatorEnd[1] )
+                                                .getEndOffset() ) );
                         c = separatorEnd[1];
                     }
                 }