From 958a95d052002120a9e3871fe3e3fb2cbaa33bdb Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 2 Aug 2014 13:23:31 +0200 Subject: xmerge: Remove local variable name conflict Change-Id: Id1708504934588c2e881bf249bc07bc61dc2c3c6 Reviewed-on: https://gerrit.libreoffice.org/10690 Reviewed-by: David Tardon Tested-by: David Tardon --- .../xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmerge') 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 { -- cgit