summaryrefslogtreecommitdiff
path: root/xmerge/source/aportisdoc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-07-03 09:16:02 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-08-20 16:34:38 +0100
commit08181e1c3e0df6556f4ec8732180630a780738f0 (patch)
treed0683fb097d89c0a5323e64030e4f111d1c8d974 /xmerge/source/aportisdoc
parent43c1aefd2dd5b25e1ff2cf4bf689427693a0bda1 (diff)
Remove dead java code, fields and local variables
Change-Id: Iac80b047d990fddd3b78366843afdff77620cd7f
Diffstat (limited to 'xmerge/source/aportisdoc')
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java3
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java2
2 files changed, 0 insertions, 5 deletions
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
index 959a092e4e5a..11e62eb26892 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
@@ -83,10 +83,7 @@ public final class DocumentDeserializerImpl
*/
public Document deserialize() throws IOException, ConvertException {
- int numberOfPDBs = cd.getNumDocuments();
Document doc = null;
- int i=0;
- ConvertData cdOut;
Iterator<Object> e = cd.getDocumentEnumeration();
while (e.hasNext()) {
PalmDocument palmDoc = (PalmDocument) e.next();
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
index 8ab3ddf82e55..f3e9f045c957 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
@@ -79,8 +79,6 @@ public class DocumentMergerImpl implements DocumentMerger {
NodeMergeAlgorithm charMerge = new CharacterBaseParagraphMerge();
DocumentMerge docMerge = new DocumentMerge(cc_, charMerge);
- Iterator result = null;
-
docMerge.applyDifference(i1, i2, diffTable);
}
}