Java update - fix various javadoc issues

Along the way, remove some javadoc comments that are completely incorrect.

Change-Id: I02f96b6cbe665d2c10bd6ee245a7d8e2eef0f755

24 files changed, 27 insertions, 60 deletions

diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
index 8ad9434a9835..df8e7972532f 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
@@ -27,8 +27,7 @@ import org.openoffice.xmerge.util.Resources;
 import org.openoffice.xmerge.util.Debug;
 
 /**
- *  This class is used by {@link
- *  org.openoffice.xmerge.converter.xml.sxw.DocumentDeserializerImpl}
+ *  This class is used by {@link DocumentDeserializerImpl}
  *  to decode the AportisDoc format.  It currently decodes
  *  the text content into a single <code>String</code> object.
  *
@@ -56,7 +55,7 @@ final class DocDecoder implements DocConstants {
      *  Decode the text records into a single <code>String</code>
      *  of text content.
      *
-     *  @param  Record  <code>Record</code> array holding AportisDoc
+     *  @param  recs  <code>Record</code> array holding AportisDoc
      *                  contents.
      *
      *  @throws  IOException  If any I/O error occurs.
@@ -114,7 +113,7 @@ final class DocDecoder implements DocConstants {
      *  with the encoding of that PDB and throw
      *  <code>IOException</code>.</p>
      *
-     *  @param  bytes           Compressed <code>byte</code> array.
+     *  @param  cBytes           Compressed <code>byte</code> array.
      *  @param  textRecordSize  Size of uncompressed
      *                          <code>byte</code> array.
      *
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
index 657784fe7684..bcf498d8444f 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
@@ -27,9 +27,7 @@ import java.util.ArrayList;
 import org.openoffice.xmerge.converter.palm.Record;
 
 /**
- *  This class is used by {@link
- *  org.openoffice.xmerge.converter.xml.sxw.DocumentSerializerImpl
- *  DocumentSerializerImpl} to encode the AportisDoc format.
+ *  This class is used by {@link DocumentSerializerImpl} to encode the AportisDoc format.
  *  It does not deal with any XML tags.  It only knows how to encode
  *  from <code>String</code>.
  *
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
index 219670fdfedc..a69433833c1e 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
@@ -45,8 +45,7 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Worksheet;
 import org.openoffice.xmerge.util.Debug;
 
 /**
- *  This class is used by {@link
- *  org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializerImpl}
+ *  This class is used by {@link SxcDocumentDeserializerImpl}
  *  SxcDocumentDeserializerImpl} to decode the Pocket Excel format.
  *
  *  @author   Paul Rank
@@ -84,7 +83,7 @@ final class PocketExcelDecoder extends SpreadsheetDecoder {
      *  converts it into a PocketWord WorkSheet.  The WorkSheet is then
      *  added to the WorkBook.
      *
-     *  @param  InputStream An <code>ConvertData</code> containing a
+     *  @param  cd An <code>ConvertData</code> containing a
      *                      Pocket Excel WorkSheet.
      *
      *  @throws  IOException  If any I/O error occurs.
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
index a7b64d94bd2e..ce5779cf1e75 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
@@ -31,9 +31,7 @@ import org.openoffice.xmerge.converter.xml.sxc.NameDefinition;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
 
 /**
- *  This class is used by {@link
- *  org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializerImpl
- * SxcDocumentSerializerImpl} to encode the Pocket Excel format.
+ *  This class is used by {@link SxcDocumentSerializerImpl} to encode the Pocket Excel format.
  *
  *  @author  Martin Maher
  */
@@ -200,20 +198,13 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
     /**
      *  Set the width of the columns in the WorkBook.
      *
-     *  @param  columnWidths  An <code>IntArrayList</code> of column
-     *                        widths.
+     *  @param  columnRows  An <code>ArrayList</code> of ColumnRowInfo
      */
     public void setColumnRows(ArrayList<ColumnRowInfo> columnRows) throws IOException {
 
         wb.addColInfo(columnRows);
     }
 
-     /**
-     *  Set the width of the columns in the WorkBook.
-     *
-     *  @param  columnWidths  An <code>IntArrayList</code> of column
-     *                        widths.
-     */
     public void setNameDefinition(NameDefinition nd) throws IOException {
 
         String parsedName = nd.getDefinition();
@@ -222,12 +213,6 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
         wb.addNameDefinition(nd);
     }
 
-     /**
-     *  Set the width of the columns in the WorkBook.
-     *
-     *  @param  columnWidths  An <code>IntArrayList</code> of column
-     *                        widths.
-     */
     public void addSettings(BookSettings s) throws IOException {
 
         wb.addSettings(s);
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
index d9401c27e0b5..51ac357973f0 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
@@ -59,7 +59,7 @@ public class BoundSheet implements BIFFRecord {
       * Sets the worksheet name. The sheetname length must be doubled as the
      * String is stored in unicode format.
       *
-      * @param  sheetname   worksheet name
+      * @param  sheetName   worksheet name
       */
     void setSheetName(String sheetName) throws IOException {
         this.cch        = (byte) sheetName.length();
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
index d0422ebb5745..7c88383e9c48 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
@@ -118,8 +118,6 @@ public class LabelCell extends CellValue {
 
     /**
      * Sets the <code>String</code> representing the cells contents
-     *
-     * @return the <code>String</code> representing the cells contents
      */
     private void setLabel(String cellContents) throws IOException {
         rgch = cellContents.getBytes("UTF-16LE");
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
index 9dd327354078..db7c8e59d180 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
@@ -128,7 +128,7 @@ public class FormulaParser {
     /**
      * Identify <, >, <=, >=, =, <>
      *
-     * @param  The <code>String</code> which is to be identified
+     * @param  op The <code>String</code> which is to be identified
      * @return A boolean returning the result of the comparison
      */
     private boolean isLogicalOp(String op) {
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
index d597b2292dbb..2d26654d0a2c 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
@@ -279,7 +279,7 @@ public class TokenEncoder {
     /**
      * A Cell Reference Encoder (It supports absolute and relative addressing)
      *
-     * @param t <code>Token</code> to be encoded
+     * @param cellCoordinates <code>Token</code> to be encoded
      * @return A <code>Vector</code> of pexcel <code>Byte</code>
      */
     private byte[] encodeCellCoordinates(String cellCoordinates) {
@@ -362,7 +362,7 @@ public class TokenEncoder {
     /**
      * This function will find the sheetname index for a given String
      *
-     * @param t <code>Token</code> to be encoded
+     * @param s <code>Token</code> to be encoded
      * @return A <code>Vector</code> of pexcel <code>Byte</code>
      */
     private short findSheetIndex(String s) {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
index 313054c9adaa..ac52a781c7ff 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
@@ -125,8 +125,6 @@ public final class DocumentDeserializerImpl
      *
      * @param   data    An Enumeration of all Paragraphs in the Pocket Word doc.
      *
-     * @return  The OpenOffice Writer XML representation of the data.
-     *
      * @throws  IOException     If any I/O errors occur.
      */
     private void buildDocument(Iterator<Paragraph> data) throws IOException {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
index 47f8f53de1cb..0c3e08bbf116 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
@@ -75,7 +75,7 @@ class ParagraphTextSegment implements PocketWordConstants {
     /**
      * <p>Sets the style for this segment.</p>
      *
-     * @param   data    The style describing this segment.
+     * @param   style    The style describing this segment.
      */
     public void setStyle (TextStyle style) {
         pStyle = style;
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 20ef21e3cb61..9ab74066cf5b 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -284,7 +284,7 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer {
      *  <code>SXWDocument</code>.
      *
      *  @param  docName  <code>Document</code> name
-     *  @param  str      Text content of WordSmith format
+     *  @param  data      Text content of WordSmith format
      *
      *  @return  Resulting <code>SXWDocument</code> object.
      *
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
index bea4b6581a21..fb6383ed40df 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
@@ -100,10 +100,6 @@ implements OfficeConstants, DocumentSerializer {
      *  but this is the only way to not modify most of the existing
      *  code right now.</p>
      *
-     *  @param  doc  Input should be an XML <code>Document</code>
-     *               object
-     *  @param  os   Output of <code>PalmDB</code> object
-     *
      *  @throws  ConvertException  If any conversion error occurs.
      *  @throws  IOException       If any I/O error occurs.
      */
@@ -457,7 +453,7 @@ implements OfficeConstants, DocumentSerializer {
      *  <i>text:h</i>, <i>text:unordered-list</i> and
      *  <i>text:ordered-list</i>.
      *
-     *  @param  Node  <code>Node</code> to traverse.
+     *  @param  node  <code>Node</code> to traverse.
      *
      *  @throws  IOException  If any I/O error occurs.
      */
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
index a62f48c6a3ad..10185a09502c 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
@@ -126,8 +126,6 @@ public final class PluginFactoryImpl extends SxwPluginFactory
      *  which is an implementation of the <code>DocumentMerger</code>
      *  interface.
      *
-     *  @param  doc  <code>Document</code> to merge.
-     *
      *  @return  A Device Document object
      */
     public Document createDeviceDocument(String name, InputStream is)
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
index 2b86395d1bc8..bcd363e56e3a 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
@@ -56,7 +56,7 @@ final class WSDecoder implements DOCConstants {
     /**
      *  Decode the text records into a single <code>byte</code> array.
      *
-     *  @param  Record  <code>Record</code> array holding WordSmith
+     *  @param  recs  <code>Record</code> array holding WordSmith
      *                  contents.
      *
      *  @throws  IOException  If any I/O error occurs.
@@ -113,7 +113,7 @@ final class WSDecoder implements DOCConstants {
     /**
      *  Decode the text records into a <code>Wse</code> array.
      *
-     *  @param  Record[]  <code>Record</code> array holding DOC
+     *  @param  recs  <code>Record</code> array holding DOC
      *                    contents.
      *
      *  @throws  IOException  If any I/O error occurs.
@@ -173,7 +173,7 @@ final class WSDecoder implements DOCConstants {
      *  it as a problem with the encoding of that PDB and
      *  throw <code>IOException</code>.</p>
      *
-     *  @param  bytes           Compressed <code>byte</code> array
+     *  @param  cBytes           Compressed <code>byte</code> array
      *  @param  textRecordSize  Size of uncompressed <code>byte</code>
      *                          array
      *
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 936bd021ab9e..86024f138caf 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -228,7 +228,7 @@ public class DOMDocument
      *  <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
      *  package!</p>
      *
-     *  @param  Document  DOM <code>Document</code> object.
+     *  @param  doc  DOM <code>Document</code> object.
      *
      *  @return  <code>byte</code> array of DOM <code>Document</code>
      *           object.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
index e40fef1ee368..9d3352bbdcde 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
@@ -101,7 +101,7 @@ final class PdbHeader {
      *  Read in the data for the PDB header.  Need to
      *  preserve the unsigned value for some of the fields.
      *
-     *  @param  di  A <code>DataInput</code> object.
+     *  @param  in  A <code>DataInput</code> object.
      *
      *  @throws  IOException  If any I/O error occurs.
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
index 48314db3b66e..95e4a6f272d5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
@@ -102,8 +102,6 @@ public class EmbeddedBinaryObject extends EmbeddedObject {
     /**
      * Package private method that constructs the manifest.xml entries for this
      * embedded object.
-     *
-     * @return  Document    <code>Document</code> containing the manifest entries.
      */
     void writeManifestData(Document manifestDoc) throws DOMException {
         Element objNode = manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
index 7d9d10c058ff..cdc3d51d88fc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
@@ -100,8 +100,6 @@ public abstract class EmbeddedObject {
     /**
      * Package private method that constructs the manifest.xml entries for this
      * embedded object.
-     *
-     * @return  Document    <code>Document</code> containing the manifest entries.
      */
     abstract void writeManifestData(Document manifestDoc) throws DOMException;
 }
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 5e9014604172..baca3dec1d80 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
@@ -832,7 +832,7 @@ public abstract class OfficeDocument
      *  <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
      *  package!</p>
      *
-     *  @param  Document  DOM <code>Document</code> object.
+     *  @param  doc  DOM <code>Document</code> object.
      *
      *  @return  <code>byte</code> array of DOM <code>Document</code>
      *           object.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
index cbd9f7ca8ad7..c7f7055c6eaa 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
@@ -34,7 +34,7 @@ import org.openoffice.xmerge.util.Debug;
 
 /**
  *  Class used by {@link
- *  org.openoffice.xmerge.converter.OfficeDocument
+ *  org.openoffice.xmerge.converter.xml.OfficeDocument
  *  OfficeDocument} to handle reading and writing
  *  from a ZIP file, as well as storing ZIP entries.
  *
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
index 90c815dd3d2a..8b8b4c42f935 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
@@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap;
  *  <code>ParaStyle</code> are used.
  *
  *  @author   David Proulx
- *  @see <a href="TextStyle.html">TextStyle</a>,
- *  <a href="ParaStyle.html">ParaStyle</a>
+ *  @see <a href="TextStyle.html">TextStyle</a>
+ *  @see <a href="ParaStyle.html">ParaStyle</a>
  */
 public class Style {
 
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 fca77ac19939..5fb13dee5c24 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
@@ -441,7 +441,7 @@ public class TextStyle extends Style implements Cloneable {
      *  Private function to return the value as an element in
      *  a Comma Separated Value (CSV) format.
      *
-     *  @param  The value to format.
+     *  @param  value The value to format.
      *
      *  @return  The formatted value.
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
index fa5bdd51cff4..dbd7411a4d0a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
@@ -114,7 +114,7 @@ public class BookSettings implements OfficeConstants {
      * Adds an XML entry for a particular setting
      *
      * @param root the root node at which to add the xml entry
-     * @param attriute the name of the attribute to add
+     * @param attribute the name of the attribute to add
      * @param type the attribute type (int, short etc)
      * @param value the value of the attribute
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index 47779eb514df..73a57401a23d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -227,7 +227,7 @@ public class SheetSettings implements OfficeConstants {
      * Adds an XML entry for a particular setting
      *
      * @param root the root node at which to add the xml entry
-     * @param attriute the name of the attribute to add
+     * @param attribute the name of the attribute to add
      * @param type the attribute type (int, short etc)
      * @param value the value of the attribute
      */