diff options
author | Noel Grandin <noel@peralex.com> | 2012-07-03 09:16:02 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-08-20 16:34:38 +0100 |
commit | 08181e1c3e0df6556f4ec8732180630a780738f0 (patch) | |
tree | d0683fb097d89c0a5323e64030e4f111d1c8d974 /xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | |
parent | 43c1aefd2dd5b25e1ff2cf4bf689427693a0bda1 (diff) |
Remove dead java code, fields and local variables
Change-Id: Iac80b047d990fddd3b78366843afdff77620cd7f
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java')
-rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java index b79a4e11caf4..cb60e1614b2a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java @@ -101,8 +101,6 @@ public class DocumentMerge implements MergeAlgorithm { int operation = currentDiff.getOperation(); - Object currentElement; - switch (operation) { case Difference.DELETE: @@ -132,11 +130,9 @@ public class DocumentMerge implements MergeAlgorithm { // empty } - currentElement = orgSeq.currentElement(); - for (; orgSeqCounter < currentDiff.getOrgPosition(); - orgSeqCounter++, currentElement = orgSeq.next()) { + orgSeqCounter++, orgSeq.next()) { // empty } @@ -159,11 +155,9 @@ public class DocumentMerge implements MergeAlgorithm { // empty } - currentElement = orgSeq.currentElement(); - for (; orgSeqCounter < currentDiff.getOrgPosition(); - orgSeqCounter++, currentElement = orgSeq.next()) { + orgSeqCounter++, orgSeq.next()) { // empty } |