summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java6
1 files changed, 3 insertions, 3 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 c4b1e9a53ccb..37917a1d47b3 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
@@ -78,8 +78,8 @@ public final class CharacterBaseParagraphMerge
CharacterParser modParser,
Difference[] diffs) {
- List orgNodeList = orgParser.getNodeList();
- List modNodeList = modParser.getNodeList();
+ List<TextNodeEntry> orgNodeList = orgParser.getNodeList();
+ List<TextNodeEntry> modNodeList = modParser.getNodeList();
int diffCount = 0;
int modNodeListCnt = 0;
int numNode = orgNodeList.size();
@@ -88,7 +88,7 @@ public final class CharacterBaseParagraphMerge
int extraChar = 0;
int orgDiffCount = diffCount;
- TextNodeEntry orgTextNode = (TextNodeEntry)(orgNodeList.get(i));
+ TextNodeEntry orgTextNode = (orgNodeList.get(i));
Debug.log(Debug.INFO, "checking node " + (i + 1) + " of " + numNode);