xmerge: Remove local variable name conflict

Change-Id: Iab2fdc516f5074a6957bde3be7aec52e48cbdc4b
Reviewed-on: https://gerrit.libreoffice.org/10663Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java

@@ -237,8 +237,8 @@ public class ParaStyle extends Style implements Cloneable {
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
                 Node child = children.item(i);
-                String name = child.getNodeName();
-                if (name.equals("style:properties")) {
+                String nodeName = child.getNodeName();
+                if (nodeName.equals("style:properties")) {
                     NamedNodeMap childAttrNodes = child.getAttributes();
                     if (childAttrNodes != null) {
                         int nChildAttrNodes = childAttrNodes.getLength();

xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java

@@ -96,8 +96,8 @@ public class TextStyle extends Style implements Cloneable {
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
                 Node child = children.item(i);
-                String name = child.getNodeName();
-                if (name.equals("style:properties")) {
+                String nodeName = child.getNodeName();
+                if (nodeName.equals("style:properties")) {
                     NamedNodeMap childAttrNodes = child.getAttributes();
                     if (childAttrNodes != null) {
                         int nChildAttrNodes = childAttrNodes.getLength();

xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java

@@ -67,8 +67,8 @@ public class CellStyle extends Style implements Cloneable {
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
                 Node child = children.item(i);
-                String name = child.getNodeName();
-                if (name.equals("style:properties")) {
+                String nodeName = child.getNodeName();
+                if (nodeName.equals("style:properties")) {
                     NamedNodeMap childAttrNodes = child.getAttributes();
                     if (childAttrNodes != null) {
                         int nChildAttrNodes = childAttrNodes.getLength();

xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java

@@ -65,8 +65,8 @@ public class ColumnStyle extends Style implements Cloneable {
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
                 Node child = children.item(i);
-                String name = child.getNodeName();
-                if (name.equals("style:properties")) {
+                String nodeName = child.getNodeName();
+                if (nodeName.equals("style:properties")) {
                     NamedNodeMap childAttrNodes = child.getAttributes();
                     if (childAttrNodes != null) {
                         int nChildAttrNodes = childAttrNodes.getLength();

xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java

@@ -65,8 +65,8 @@ public class RowStyle extends Style implements Cloneable {
             int len = children.getLength();
             for (int i = 0; i < len; i++) {
                 Node child = children.item(i);
-                String name = child.getNodeName();
-                if (name.equals("style:properties")) {
+                String nodeName = child.getNodeName();
+                if (nodeName.equals("style:properties")) {
                     NamedNodeMap childAttrNodes = child.getAttributes();
                     if (childAttrNodes != null) {
                         int nChildAttrNodes = childAttrNodes.getLength();