summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index 8f656337e635..98c0d8a420dc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -230,8 +230,6 @@ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm {
newTextPosition += cacheLength;
// reset the markers
- lastDiffPosition = -1;
- lastDiffOperation = Difference.UNCHANGE;
cacheLength = 0;
}
}