diff options
| author | rbuj <robert.buj@gmail.com> | 2014-08-02 13:23:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-02 11:36:43 +0000 |
| commit | 958a95d052002120a9e3871fe3e3fb2cbaa33bdb (patch) | |
| tree | b9533f6e8090698664f72371fded92b29a416c04 /xmerge | |
| parent | de024170a51b993109f27469ae869fc67548fc63 (diff) | |
xmerge: Remove local variable name conflict
Change-Id: Id1708504934588c2e881bf249bc07bc61dc2c3c6
Reviewed-on: https://gerrit.libreoffice.org/10690
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index 34c358dc51fd..b264b5f9436c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -355,10 +355,10 @@ public abstract class NodeIterator implements Iterator { // (can be optimized in future) String nodeName = node.getNodeName(); if ( cc_ == null || cc_.canConvertTag(nodeName)) { - NodeList nodeList = node.getChildNodes(); - int nodeListLength = nodeList.getLength(); + NodeList auxNodeList = node.getChildNodes(); + int nodeListLength = auxNodeList.getLength(); for (int i = 0; i < nodeListLength; i++) { - markTree(nodeList.item(i)); + markTree(auxNodeList.item(i)); } } else { |