summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-15 10:36:46 +0200
committerNoel Grandin <noel@peralex.com>2015-10-15 11:29:36 +0200
commitfac24cd6ff75f3e64c760fd511b4d92a5476991c (patch)
tree6aaade6834a2f166e46ff9099b4812760f2d002a /xmerge
parent480dda56950d01bbfb7ea6a00b826bb794bf4cae (diff)
cid#1326571 and cid#1326572 Unused value
Change-Id: I0e984135a5abf918ba556c700ffa111097fd48c1
Diffstat (limited to 'xmerge')
-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;
}
}