summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-15 16:25:10 +0200
committerNoel Grandin <noel@peralex.com>2014-10-16 08:15:52 +0200
commitfa22664be218c211c41342c6296616c316b2c3b1 (patch)
tree2118e12dffce57f5027ef4aed227d27acf8c6ed6 /xmerge
parent94ae3e827b71da5be77ff04522ff156770801b25 (diff)
java: always use braces for while loops
Change-Id: Iff896b0cace8b8305528b3b0140004ea856169ce
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java3
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java3
2 files changed, 4 insertions, 2 deletions
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 706b58d18cc1..6d0135aaf468 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
@@ -1062,8 +1062,9 @@ public abstract class OfficeDocument
char[] charArray = new char[4096];
StringBuffer sBuf = new StringBuffer();
int n;
- while ((n=br.read(charArray, 0, charArray.length)) > 0)
+ while ((n=br.read(charArray, 0, charArray.length)) > 0) {
sBuf.append(charArray, 0, n);
+ }
// ensure there is no trailing garbage after the end of the stream.
int sIndex = sBuf.lastIndexOf("</office:document>");
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
index d72c702fccc5..305100772739 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -95,8 +95,9 @@ public class OfficeUtil implements OfficeConstants {
// Compute length of space sequence.
int nrSpaces = 2;
while ((nrSpaces < text.length())
- && text.substring(nrSpaces, nrSpaces + 1).equals(" "))
+ && text.substring(nrSpaces, nrSpaces + 1).equals(" ")) {
nrSpaces++;
+ }
Element spaceNode = parentDoc.createElement(TAG_SPACE);
spaceNode.setAttribute(ATTRIBUTE_SPACE_COUNT,