diff options
| author | rbuj <robert.buj@gmail.com> | 2014-07-31 19:15:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-08-01 06:33:07 +0000 |
| commit | 4ac335c1dcebc89e27f1e4bf6b119547afb1526f (patch) | |
| tree | c8eeb9391eddf4b4296f627dd9f250b24b8581a9 /xmerge | |
| parent | 583a35b7872be903520dd9fc342efde23ade929f (diff) | |
xmerge: Remove local variable name conflict
Change-Id: Iab2fdc516f5074a6957bde3be7aec52e48cbdc4b
Reviewed-on: https://gerrit.libreoffice.org/10663
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmerge')
5 files changed, 10 insertions, 10 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index c47b23544f36..ba409f6cb40d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/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(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index cc45fa5f486f..3f9e6b9fb7da 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/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(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index 56695374d563..5f51f618ccbd 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/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(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index bc2d03d3d1e3..4a8d87c11b1b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/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(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index e90825922425..4d0d2f091317 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/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(); |