[Libreoffice-commits] core.git: xmerge/source

[rbuj]

 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java       |    4 ++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java       |    4 ++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java   |    4 ++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java |    4 ++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java    |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4ac335c1dcebc89e27f1e4bf6b119547afb1526f
Author: rbuj <robert.buj at gmail.com>
Date:   Thu Jul 31 19:15:12 2014 +0200

    xmerge: Remove local variable name conflict
    
    Change-Id: Iab2fdc516f5074a6957bde3be7aec52e48cbdc4b
    Reviewed-on: https://gerrit.libreoffice.org/10663
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

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 c47b235..ba409f6 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 cc45fa5..3f9e6b9 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 5669537..5f51f61 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 bc2d03d..4a8d87c 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 e908259..4d0d2f0 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();