xmerge: Remove local variable name conflict

Change-Id: Id1708504934588c2e881bf249bc07bc61dc2c3c6
Reviewed-on: https://gerrit.libreoffice.org/10690Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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 {