xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 8b4ea551546516f9db78bec3fef841752bfc8b4a Author: rbuj <robert....@gmail.com> Date: Sat Aug 2 12:34:07 2014 +0200 xmerge: The assigned value is never used Change-Id: I0476332d43138f3403b85d7ce14f4e27376adc0c Reviewed-on: https://gerrit.libreoffice.org/10688 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index 7be7b49..f3909be 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -1131,7 +1131,7 @@ public abstract class OfficeDocument BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8")); StringBuffer buffer = new StringBuffer(); - String str = null; + String str; while ((str = br.readLine()) != null) { @@ -1198,7 +1198,7 @@ public abstract class OfficeDocument BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8")); char[] charArray = new char[4096]; StringBuffer sBuf = new StringBuffer(); - int n = 0; + int n; while ((n=br.read(charArray, 0, charArray.length)) > 0) sBuf.append(charArray, 0, n); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits