[PATCH] fdo#51304: Remove @author annotation

guilherme.sft at gmail.com guilherme.sft at gmail.com
Tue Sep 25 22:23:44 PDT 2012


From: José Guilherme Vanz <guilherme.sft at gmail.com>

This patch removes '@author' annotations and some unnecessary comments
in java sources.

Change-Id: Icea4721c42dc08fe51a0bc667872dfbca9c2880f
Signed-off-by: José Guilherme Vanz <guilherme.sft at gmail.com>
---
 extensions/qa/integration/extensions/ComponentFactory.java           | 4 ----
 extensions/qa/integration/extensions/Frame.java                      | 5 ++---
 extensions/qa/integration/extensions/HelpTextProvider.java           | 3 ---
 extensions/qa/integration/extensions/MethodHandler.java              | 4 ----
 extensions/qa/integration/extensions/ServicesHandler.java            | 4 ----
 reportdesign/qa/complex/reportdesign/FileURL.java                    | 4 ----
 .../openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java | 1 -
 .../openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java   | 1 -
 .../openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java   | 1 -
 .../converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java       | 1 -
 .../xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java  | 1 -
 .../xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java       | 1 -
 .../xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java         | 2 --
 .../xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java        | 1 -
 .../xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java           | 1 -
 .../xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java           | 1 -
 .../converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java      | 1 -
 .../xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java | 2 --
 .../xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java        | 1 -
 .../xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java          | 1 -
 .../xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java          | 1 -
 .../xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java | 1 -
 .../xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java   | 2 --
 .../openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java | 1 -
 .../xmerge/converter/xml/sxc/pexcel/records/Worksheet.java           | 2 --
 .../xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java      | 3 +--
 .../converter/xml/sxw/pocketword/DocumentDeserializerImpl.java       | 1 -
 .../xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java  | 1 -
 .../openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java    | 1 -
 .../xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java    | 1 -
 .../xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java       | 1 -
 .../xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java     | 1 -
 .../xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java      | 1 -
 .../openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java  | 1 -
 .../xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 1 -
 .../xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java   | 1 -
 .../xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java        | 1 -
 .../org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java | 1 -
 .../org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java | 1 -
 .../java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java  | 1 -
 .../openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java | 1 -
 .../openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java  | 1 -
 .../org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java | 1 -
 .../org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java   | 1 -
 .../openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java    | 1 -
 .../openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java    | 1 -
 .../java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java         | 2 --
 xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java     | 1 -
 .../source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java   | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java        | 1 -
 .../xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java      | 1 -
 .../xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java     | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java  | 1 -
 .../source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java | 2 --
 xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java   | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java         | 2 --
 .../xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java     | 1 -
 .../java/org/openoffice/xmerge/converter/palm/PalmDocument.java      | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java  | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java    | 2 --
 .../xmerge/java/org/openoffice/xmerge/converter/palm/Record.java     | 1 -
 .../java/org/openoffice/xmerge/converter/xml/OfficeConstants.java    | 1 -
 .../org/openoffice/xmerge/converter/xml/OfficeDocumentException.java | 2 --
 .../xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java   | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java   | 2 --
 .../xmerge/java/org/openoffice/xmerge/converter/xml/Style.java       | 1 -
 .../java/org/openoffice/xmerge/converter/xml/StyleCatalog.java       | 1 -
 .../xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java   | 1 -
 .../java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java   | 2 --
 .../java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java      | 2 --
 .../java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java  | 1 -
 .../java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java    | 2 --
 .../xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java  | 2 --
 .../java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java | 2 --
 .../java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java       | 2 --
 .../java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java  | 2 --
 .../org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java  | 1 -
 .../org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java  | 1 -
 .../java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java   | 1 -
 .../openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java | 3 ---
 .../openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java   | 2 --
 .../xmerge/converter/xml/xslt/DocumentDeserializerImpl.java          | 2 --
 .../openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 2 --
 .../org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java  | 2 --
 .../source/xmerge/java/org/openoffice/xmerge/merger/Difference.java  | 2 --
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java     | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java | 2 --
 .../java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java     | 2 --
 .../org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java     | 2 --
 .../java/org/openoffice/xmerge/merger/diff/CharacterParser.java      | 2 --
 .../java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java | 2 --
 .../java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java   | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java  | 2 --
 .../java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java  | 2 --
 .../java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java     | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java   | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java | 2 --
 .../java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java     | 2 --
 .../openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java  | 2 --
 .../java/org/openoffice/xmerge/merger/merge/DocumentMerge.java       | 2 --
 .../xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java   | 2 --
 .../xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java    | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java      | 1 -
 .../xmerge/java/org/openoffice/xmerge/util/EndianConverter.java      | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java | 3 +--
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java  | 1 -
 .../xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java       | 1 -
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java    | 2 --
 .../java/org/openoffice/xmerge/util/registry/ConverterInfo.java      | 2 --
 .../java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java   | 1 -
 .../org/openoffice/xmerge/util/registry/ConverterInfoReader.java     | 2 --
 115 files changed, 4 insertions(+), 177 deletions(-)

diff --git a/extensions/qa/integration/extensions/ComponentFactory.java b/extensions/qa/integration/extensions/ComponentFactory.java
index 1ea4f32..5a449df 100644
--- a/extensions/qa/integration/extensions/ComponentFactory.java
+++ b/extensions/qa/integration/extensions/ComponentFactory.java
@@ -22,10 +22,6 @@ import com.sun.star.uno.XComponentContext;
 import com.sun.star.lang.XSingleComponentFactory;
 import java.lang.reflect.Constructor;
 
-/**
- *
- * @author fs93730
- */
 public class ComponentFactory implements XSingleComponentFactory
 {
     private Class       m_handlerClass;
diff --git a/extensions/qa/integration/extensions/Frame.java b/extensions/qa/integration/extensions/Frame.java
index 9cba820..a3c7b3e 100644
--- a/extensions/qa/integration/extensions/Frame.java
+++ b/extensions/qa/integration/extensions/Frame.java
@@ -23,9 +23,8 @@ import com.sun.star.frame.*;
 import com.sun.star.task.XStatusIndicatorFactory;
 import com.sun.star.util.XCloseable;
 
-/** wraps the coms.sun.star.frame.Frame service
- *
- * @author fs93730
+/**
+ * wraps the coms.sun.star.frame.Frame service
  */
 public class Frame implements   XFrame,
                                 XDispatchProvider,
diff --git a/extensions/qa/integration/extensions/HelpTextProvider.java b/extensions/qa/integration/extensions/HelpTextProvider.java
index ad0b175..73cda71 100644
--- a/extensions/qa/integration/extensions/HelpTextProvider.java
+++ b/extensions/qa/integration/extensions/HelpTextProvider.java
@@ -20,9 +20,6 @@
  * HelpTextProvider.java
  *
  * Created on 16. November 2006, 09:44
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
  */
 
 package integration.extensions;
diff --git a/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index 2241bf4..93c9ec8f 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -24,10 +24,6 @@ import com.sun.star.beans.*;
 import com.sun.star.reflection.*;
 import com.sun.star.inspection.*;
 
-/**
- *
- * @author fs93730
- */
 public class MethodHandler implements XPropertyHandler
 {
     private XComponentContext       m_context;
diff --git a/extensions/qa/integration/extensions/ServicesHandler.java b/extensions/qa/integration/extensions/ServicesHandler.java
index 426b5e1..6033b11 100644
--- a/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/extensions/qa/integration/extensions/ServicesHandler.java
@@ -24,10 +24,6 @@ import com.sun.star.inspection.*;
 import com.sun.star.frame.*;
 import com.sun.star.lang.XServiceInfo;
 
-/**
- *
- * @author fs93730
- */
 public class ServicesHandler implements XPropertyHandler
 {
     private XComponentContext   m_context;
diff --git a/reportdesign/qa/complex/reportdesign/FileURL.java b/reportdesign/qa/complex/reportdesign/FileURL.java
index 62b9c6e..c240803 100644
--- a/reportdesign/qa/complex/reportdesign/FileURL.java
+++ b/reportdesign/qa/complex/reportdesign/FileURL.java
@@ -22,10 +22,6 @@ import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-/**
- *
- * @author ll93751
- */
 public class FileURL
 {
     String m_sFileURL;
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
index 4aa494b..c5e0c1a 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java
@@ -23,7 +23,6 @@ import org.openoffice.xmerge.converter.palm.PdbUtil;
 /**
  *  Constants used for encoding and decoding the AportisDoc format.
  *
- *  @author   Herbie Ong
  */
 interface DocConstants {
 
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 df8e797..f6b203b 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
@@ -31,7 +31,6 @@ import org.openoffice.xmerge.util.Debug;
  *  to decode the AportisDoc format.  It currently decodes
  *  the text content into a single <code>String</code> object.
  *
- *  @author   Herbie Ong
  */
 final class DocDecoder implements DocConstants {
 
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 bcf498d..70035bf 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
@@ -31,7 +31,6 @@ import org.openoffice.xmerge.converter.palm.Record;
  *  It does not deal with any XML tags.  It only knows how to encode
  *  from <code>String</code>.
  *
- *  @author   Herbie Ong
  */
 final class DocEncoder implements DocConstants {
 
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
index 11e62eb..2765aad 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java
@@ -50,7 +50,6 @@ import org.w3c.dom.Text;
  *  it calls <code>buildDocument</code> to create a <code>SxwDocument</code>
  *  object from it.</p>
  *
- *  @author      Herbie Ong
  */
 public final class DocumentDeserializerImpl
     implements OfficeConstants, DocConstants, DocumentDeserializer {
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
index 4f2afe9..45bd158 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java
@@ -50,7 +50,6 @@ import org.openoffice.xmerge.util.XmlUtil;
  *  <code>DocEncoder</code> object for the actual conversion of
  *  contents to the AportisDoc format.</p>
  *
- *  @author      Herbie Ong
  */
 
 
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
index f6cdf6b..19bc67b 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java
@@ -58,7 +58,6 @@ import java.io.InputStream;
  *  org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocumentMergerImpl
  *  DocumentMergerImpl} which this class derives the functionality.</p>
  *
- *  @author   Herbie Ong
  */
 public final class PluginFactoryImpl extends SxwPluginFactory
     implements DocumentDeserializerFactory, DocumentSerializerFactory,
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
index 9a6df95..4c5e7df 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java
@@ -22,8 +22,6 @@ import org.openoffice.xmerge.converter.palm.PdbUtil;
 
 /**
  *  Constants used for encoding and decoding the MiniCalc format.
- *
- *  @author   Herbie Ong
  */
 interface MinicalcConstants {
 
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
index 7087431..aac23c7 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml.sxc.minicalc;
  *  This class is used by <code>MinicalcDecoder</code> to manipulate a
  *  <code>String</code> containing MiniCalc cell data.
  *
- *  @author   Paul Rank
  */
 public class MinicalcDataString {
 
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
index 5865085..feeac91 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
@@ -47,7 +47,6 @@ import org.openoffice.xmerge.converter.xml.sxc.Format;
  *  org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializerImpl}
  *  SxcDocumentDeserializerImpl} to decode the MiniCalc format.
  *
- *  @author   Paul Rank
  */
 final class MinicalcDecoder extends SpreadsheetDecoder {
 
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
index bc2580c..532d598 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java
@@ -45,7 +45,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
  *  org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializerImpl
  * SxcDocumentSerializerImpl} to encode the MiniCalc format.
  *
- *  @author   Paul Rank
  */
 final class MinicalcEncoder extends SpreadsheetEncoder {
 
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
index 3561869..c4e825e 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
@@ -35,7 +35,6 @@ import java.util.Enumeration;
  *
  *  <p>This converts a set of files in MiniCalc PDB format to a StarOffice DOM.</p>
  *
- *  @author  Mark Murnane
  */
 public final class SxcDocumentDeserializerImpl extends SxcDocumentDeserializer {
 
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
index 52392b4..dfe51ef 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java
@@ -48,8 +48,6 @@ import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializer;
  *  <p>This converts StarOffice XML format to a set of files in
  *  MiniCalc PDB format.</p>
  *
- *  @author      Paul Rank
- *  @author      Mark Murnane
  */
 public final class SxcDocumentSerializerImpl extends SxcDocumentSerializer {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
index 29beae8..e556586 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel;
 /**
  * Interface defining constants for Pocket Excel attributes.
  *
- * @author  Martin Maher
  */
 public interface PocketExcelConstants {
     /** File extension for Pocket Word files. */
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 6115c14..efbdbee 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
@@ -47,7 +47,6 @@ import org.openoffice.xmerge.util.Debug;
  *  This class is used by {@link SxcDocumentDeserializerImpl}
  *  SxcDocumentDeserializerImpl} to decode the Pocket Excel format.
  *
- *  @author   Paul Rank
  */
 final class PocketExcelDecoder extends SpreadsheetDecoder {
 
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 e642bff..925e8f9 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
@@ -33,7 +33,6 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
 /**
  *  This class is used by {@link SxcDocumentSerializerImpl} to encode the Pocket Excel format.
  *
- *  @author  Martin Maher
  */
 final class PocketExcelEncoder extends SpreadsheetEncoder {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
index 1bff41d..289edb4 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java
@@ -37,7 +37,6 @@ import org.openoffice.xmerge.util.Debug;
  *
  *  <p>This converts a set of files in Pocket Excel PXL format to a StarOffice DOM.</p>
  *
- *  @author  Mark Murnane
  */
 public final class SxcDocumentDeserializerImpl extends SxcDocumentDeserializer {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
index bf3c3a8..525c163 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java
@@ -38,8 +38,6 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
  *  <p>This converts StarOffice XML format to a set of files in
  *  Pocket Excel PXL format.</p>
  *
- *  @author      Paul Rank
- *  @author      Mark Murnane
  */
 public final class SxcDocumentSerializerImpl extends SxcDocumentSerializer {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
index e5f7240..95a804a 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
@@ -37,7 +37,6 @@ import org.openoffice.xmerge.util.Debug;
  *  This class is used by <code> PxlDocument</code> to maintain pexcel
  *  workbooks.
  *
- *  @author  Martin Maher
  */
 public class Workbook implements org.openoffice.xmerge.Document,
 OfficeConstants {
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
index 15d5289..5f101b2 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
@@ -32,8 +32,6 @@ import org.openoffice.xmerge.util.Debug;
 /**
  *  This class is used by <code>PxlDocument</code> to maintain pexcel
  *  worksheets.
- *
- *  @author  Martin Maher
  */
 public class Worksheet {
 
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java
index 18a50c8..d7cd645 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java
@@ -38,7 +38,6 @@ import org.openoffice.xmerge.util.EndianConverter;
  * paragraph in the document.  These paragraph descriptors appear at the end
  * of the Document Descriptor.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 class DocumentDescriptor {
@@ -222,4 +221,4 @@ class DocumentDescriptor {
             return desc.toByteArray();
         }
     }
-}
\ No newline at end of file
+}
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 8cc2e23..7fdb983 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
@@ -45,7 +45,6 @@ import org.w3c.dom.NodeList;
  *
  * <p>This converts a Pocket Word file to an OpenOffice Writer XML DOM.</p>
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public final class DocumentDeserializerImpl
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
index 969c09e..ba67a1d 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
@@ -44,7 +44,6 @@ import java.io.IOException;
  *
  * <p>This converts an OpenOffice Writer XML files to a Pocket Word file<.</p>
  *
- * @author      Mark Murnane
  * @version 1.1
  */
 public final class DocumentSerializerImpl
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
index da58d60..2871a26 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
@@ -33,7 +33,6 @@ import org.openoffice.xmerge.util.EndianConverter;
 /**
  * Represents a paragraph data structure within a Pocket Word document.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 class Paragraph implements PocketWordConstants {
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 0c3e08b..999a24f 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
@@ -32,7 +32,6 @@ import java.io.IOException;
  * The style may differ from the default style of the paragraph of which it
  * is part.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 class ParagraphTextSegment implements PocketWordConstants {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
index cd42c0f..24c7b91 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
@@ -40,7 +40,6 @@ import org.openoffice.xmerge.converter.xml.sxw.SxwPluginFactory;
 /**
  * Factory class used to create converters to/from the Pocket Word format.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public final class PluginFactoryImpl extends SxwPluginFactory
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java
index bb244a2..feb9827 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml.sxw.pocketword;
 /**
  * Interface defining constants for Pocket Word attributes.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public interface PocketWordConstants {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
index 3b267f6..8e79a8c 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
@@ -38,7 +38,6 @@ import org.openoffice.xmerge.converter.xml.TextStyle;
  *    and to read existing data to allow for conversion to OpenOffice Writer
  *    format.</p>
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public class PocketWordDocument implements Document, PocketWordConstants {
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java
index 9a85e42..78bbc7a0 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java
@@ -21,7 +21,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
 /**
  *  Constants used for encoding and decoding the WordSmith format.
  *
- *  @author   Herbie Ong, David Proulx
  */
 interface DOCConstants {
 
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 d1e8358..559abef 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
@@ -55,7 +55,6 @@ import org.w3c.dom.Text;
  *  <code>String</code> object, then it calls <code>buildDocument</code>
  *  to create a <code>SxwDocument</code> object from it.
  *
- *  @author      Herbie Ong, David Proulx
  */
 public final class DocumentDeserializerImpl
 implements DOCConstants, OfficeConstants, DocumentDeserializer {
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 69b4cf9..ca99f85 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
@@ -48,7 +48,6 @@ import org.openoffice.xmerge.converter.xml.*;
  *  <code>DocEncoder</code> object for the actual conversion of
  *  contents to the WordSmith format.</p>
  *
- *  @author      Herbie Ong, David Proulx
  */
 
 // DJP: take out "implements OfficeConstants"
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 10185a0..f4eb5dc 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
@@ -60,7 +60,6 @@ import java.io.IOException;
  *  org.openoffice.xmerge.converter.xml.sxw.wordsmith.DocumentMergerImpl
  *  DocumentMergerImpl} which this class derives the functionality.</p>
  *
- *  @author   Herbie Ong, Dave Proulx
  */
 public final class PluginFactoryImpl extends SxwPluginFactory
     implements DocumentDeserializerFactory, DocumentSerializerFactory,
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 c5b12ce..cb12e2d 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
@@ -32,7 +32,6 @@ import org.openoffice.xmerge.util.Resources;
  *  DocumentDeserializerImpl} to decode a WordSmith format.  It currently
  *  decodes the text content into a single <code>String</code> object.
  *
- *  @author   Herbie Ong, David Proulx
  */
 final class WSDecoder implements DOCConstants {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
index e813632..af9980d 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java
@@ -30,7 +30,6 @@ import org.openoffice.xmerge.converter.palm.Record;
  *  org.openoffice.xmerge.converter.xml.sxw.wordsmith.DocumentDeserializerImpl
  *  DocumentDeserializerImpl} to encode the WordSmith format.
  *
- *  @author   David Proulx
  */
 
 // DJP: replace 4096 w/ a defined constant
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
index dc86058..9e80feab 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java
@@ -24,7 +24,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
  * This is the superclass for all elements in a WordSmith document.
  * Elements can be paragraphs, text runs, font tables, or color tables.
  *
- *  @author   David Proulx
  */
 abstract class Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java
index b56bd84..5651ee9 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java
@@ -23,7 +23,6 @@ import java.awt.Color;
 /**
  *  This class represents a color table in a WordSmith document.
  *
- *  @author   David Proulx
  */
 class WseColorTable extends Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java
index 3406bc6..391dbcd 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java
@@ -29,7 +29,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
  *   string table (null-terminated strings) representing font names
  *  </blockquote></p>
  *
- *  @author   David Proulx
  */
 class WseFontTable extends Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
index bf4b752..eb62be7 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 /**
  *  This class represents a WordSmith document header.
  *
- *  @author   David Proulx
  */
 class WseHeader extends Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
index e9b33d6..fc4807a 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
@@ -26,7 +26,6 @@ import org.openoffice.xmerge.converter.xml.StyleCatalog;
  *  This class represents a paragraph in a WordSmith document.
  *  (A paragraph is "5" followed by 12 bytes of attributes.)
  *
- *  @author   David Proulx
  */
 class WsePara extends Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java
index de596d4..0556427 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java
@@ -45,7 +45,6 @@ import java.awt.Color;
  *    n bytes  Text - the actual text
  *  </li></ul></p>
  *
- *  @author   David Proulx
  */
 class WseTextRun extends Wse {
 
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
index 4f97db6..18cb61b 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java
@@ -28,7 +28,6 @@ import java.io.ByteArrayOutputStream;
  *  include: WordSmith header, font table, color table, paragraphs,
  *  and text runs.
  *
- *  @author   David Proulx
  */
 
 class textRecord {
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java
index 537bd61..96110be 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java
@@ -21,7 +21,6 @@ package org.openoffice.xmerge.converter.xml.sxw.wordsmith;
 /**
  *  WordSmith utility class.
  *
- *  @author   David Proulx
  */
 class util {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 3dec93a..9912cb6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -35,8 +35,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo;
  *  @see  ConverterFactory
  *  @see  PluginFactory
  *  @see  org.openoffice.xmerge.util.registry.ConverterInfo
- *
- *  @author  Martin Maher
  */
 public class Convert implements Cloneable {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
index afa85ef..195e235 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
@@ -27,7 +27,6 @@ import java.util.Iterator;
  *  class.  The <code>ConvertData</code> contains a <code>String</code>
  *  name and a <code>Vector</code> of <code>Document</code> objects.</p>
  *
- *  @author  Martin Maher
  */
 public class ConvertData {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
index 687f262..7003779 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
@@ -31,7 +31,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfoMgr;
  *  @see  Convert
  *  @see  org.openoffice.xmerge.util.registry.ConverterInfoMgr
  *
- *  @author  Martin Maher
  */
 public class ConverterFactory {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
index 2690750..ac9d455 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
@@ -33,7 +33,6 @@ import java.io.IOException;
  *  org.openoffice.xmerge.PluginFactory#createDeviceDocument
  *  createDeviceDocument} method.</p>
  *
- *  @author  Herbie Ong
  *  @see     org.openoffice.xmerge.PluginFactory
  */
 public interface Document {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
index e9dc7d7..13a4b8b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
@@ -31,7 +31,6 @@ import java.io.IOException;
  *  createDocumentDeserializer} method.  When it is constructed, a
  *  <code>ConvertData</code> object is passed in to be used as input.</p>
  *
- *  @author  Herbie Ong
  *  @see     org.openoffice.xmerge.PluginFactory
  *  @see     org.openoffice.xmerge.DocumentDeserializerFactory
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
index de26760..54e4667 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
@@ -32,7 +32,6 @@ import java.io.IOException;
  *  When it is constructed, a
  *  <code>ConvertData</code> object is passed in to be used as input.</p>
  *
- *  @author  Henrik Just
  *  @see     org.openoffice.xmerge.PluginFactory
  *  @see     org.openoffice.xmerge.DocumentDeserializerFactory
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
index 2af2b6f..eae5e40 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
@@ -43,7 +43,6 @@ package org.openoffice.xmerge;
  *  "Original Office" <code>Document</code> object is
  *  passed in to be used as input.</p>
  *
- *  @author  Herbie Ong
  *  @see     org.openoffice.xmerge.PluginFactory
  *  @see     org.openoffice.xmerge.DocumentMergerFactory
  *  @see     org.openoffice.xmerge.ConverterCapabilities
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
index f5bc303..b3f6af6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
@@ -31,8 +31,6 @@ import java.io.IOException;
  *  createDocumentSerializer} method.  When it is constructed, a
  *  "Office" <code>Document</code> object is passed in to
  *  be used as input.</p>
- *
- *  @author  Herbie Ong
  *  @see     org.openoffice.xmerge.PluginFactory
  *  @see     org.openoffice.xmerge.DocumentSerializerFactory
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
index 67f532d..62df009 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java
@@ -56,7 +56,6 @@ import java.io.IOException;
  *  <a href="converter/xml/sxc/package-summary.html">
  *  org.openoffice.xmerge.util.registry</a>.</p>
  *
- *  @author  Herbie Ong
  *  @see     Document
  *  @see     DocumentSerializer
  *  @see     DocumentSerializerFactory
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
index 38c4e87..b97f03e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
@@ -23,8 +23,6 @@ package org.openoffice.xmerge;
  *  jar file.  It has a main method that prints out the version
  *  info.  It also provides two static methods for runtime classes
  *  to query.
- *
- *  @author    Herbie Ong
  */
 public final class Version {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index c7a752b..cd362f7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -59,7 +59,6 @@ import java.io.UnsupportedEncodingException;
  *  PalmDocument.read} method for reading in its data from the <code>InputStream</code>
  *  object.</p>
  *
- *  @author  Akhil Arora, Herbie Ong
  *  @see     PalmDocument
  *  @see     Record
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
index d2eed38..d342daa 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
@@ -35,7 +35,6 @@ import org.openoffice.xmerge.Document;
  *  read via an <code>InputStream</code> and written via an
  *  <code>OutputStream</code>.</p>
  *
- *  @author  Martin Maher
  */
 
 public class PalmDocument
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
index c5abd5e..9bc3d65 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
@@ -49,7 +49,6 @@ import java.io.DataInputStream;
  *
  *  <p>Other decoders assume these as well.</p>
  *
- *  @author  Herbie Ong
  *  @see     PalmDB
  *  @see     Record
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
index b30d38f..cdd866f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
@@ -41,7 +41,6 @@ import java.util.Date;
  *     encoder.write(new FileOutputStream("sample.pdb"));
  *  </code></pre></blockquote>
  *
- *  @author  Herbie Ong
  *  @see     PalmDB
  *  @see     Record
  */
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 9d3352b..df9ccfb 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
@@ -35,7 +35,6 @@ import java.io.IOException;
  *  The <code>read</code> and <code>write</code> methods should
  *  handle them properly.</p>
  *
- *  @author  Herbie Ong
  *  @see     PalmDB
  *  @see     Record
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
index bd83ff5..d30b242 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
@@ -20,8 +20,6 @@ package org.openoffice.xmerge.converter.palm;
 
 /**
  *  Contains common static methods and constants for use within the package.
- *
- *  @author    Herbie Ong
  */
 public final class PdbUtil {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index 9ee4a1f..d3f68bd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -30,7 +30,6 @@ import java.io.IOException;
  *  <p>Note that it is not associated with a <code>Record</code> number
  *  or ID.</p>
  *
- *  @author  Akhil Arora, Herbie Ong
  *  @see     PalmDocument
  *  @see     PalmDB
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
index 35ac860..a8eef4a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml;
  *  This interface contains constants for StarOffice XML tags,
  *  attributes (StarCalc cell types, etc.).
  *
- *  @author      Herbie Ong, Paul Rank, Martin Maher
  */
 public interface OfficeConstants {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
index d2a7329..00c0bf1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
@@ -29,8 +29,6 @@ import org.openoffice.xmerge.util.Resources;
  *  Used by OfficeDocument to encapsulate exceptions.  It will add
  *  more details to the message string if it is of type
  *  <code>SAXParseException</code>.
- *
- *  @author      Herbie Ong
  */
 
 public final class OfficeDocumentException extends IOException {
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 c7f7055..abdeaa7 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
@@ -38,7 +38,6 @@ import org.openoffice.xmerge.util.Debug;
  *  OfficeDocument} to handle reading and writing
  *  from a ZIP file, as well as storing ZIP entries.
  *
- *  @author   Herbie Ong
  */
 class OfficeZip {
 
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 82650fd..80d42f5 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
@@ -136,8 +136,6 @@ class alignment extends conversionAlgorithm {
  *  </td></tr><tr><td>
  *  TEXT_ALIGN       </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT
  *  </td></tr></table></p>
- *
- *   @author   David Proulx
  */
 public class ParaStyle extends Style implements Cloneable {
 
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 8b8b4c4..6e85a41 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
@@ -27,7 +27,6 @@ import org.w3c.dom.NamedNodeMap;
  *  <code>Style</code>, such as <code>TextStyle</code>,
  *  <code>ParaStyle</code> are used.
  *
- *  @author   David Proulx
  *  @see <a href="TextStyle.html">TextStyle</a>
  *  @see <a href="ParaStyle.html">ParaStyle</a>
  */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
index bc7696e..a8e7093 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
@@ -37,7 +37,6 @@ import org.w3c.dom.NodeList;
  *  <code>Style</code>, and is an object which is a subclass of
  *  <code>Style</code>.
  *
- *  @author David Proulx
  *  @see <a href="Style.html">Style</a>
  */
 public class StyleCatalog {
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 5fb13de..57583d7 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
@@ -32,7 +32,6 @@ import org.openoffice.xmerge.util.Debug;
 /**
  *  Represents a text <code>Style</code> in an OpenOffice document.
  *
- *  @author   David Proulx
  */
 public class TextStyle extends Style implements Cloneable {
 
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 dbd7411..f1cf6a1 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
@@ -32,8 +32,6 @@ import org.w3c.dom.NodeList;
 /**
  * This is a class representing the different attributes for a worksheet
  * contained in settings.xml.
- *
- * @author Martin Maher
  */
 public class BookSettings implements OfficeConstants {
 
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 29593c8..d5f8859 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
@@ -31,8 +31,6 @@ import org.openoffice.xmerge.util.Debug;
 
 /**
  *  Represents a text <code>Style</code> in an OpenOffice document.
- *
- *  @author Martin Maher
  */
 public class CellStyle extends Style implements Cloneable {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
index 654e4dd..985bee0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml.sxc;
  * This is a class to define a table-column structure. This can then be
  * used by plugins to write or read their own column types.
  *
- * @author Martin Maher
  */
 public class ColumnRowInfo {
 
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 4dec10b..bc2d03d 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
@@ -30,8 +30,6 @@ import org.openoffice.xmerge.util.TwipsConverter;
 
 /**
  *  Represents a text <code>Style</code> in an OpenOffice document.
- *
- *  @author Martin Maher
  */
 public class ColumnStyle extends Style implements Cloneable {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
index fecbde7..a28edaa 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
@@ -23,8 +23,6 @@ import java.awt.Color;
 /**
  *  This class specifies the format for a given spreadsheet cell.
  *
- *  @author  Mark Murnane
- *  @author  Martin Maher (Extended Style Support)
  */
 public class Format implements Cloneable {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
index c29daf7..2dd8eef 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
@@ -29,8 +29,6 @@ import org.openoffice.xmerge.util.XmlUtil;
 /**
  * This is a class to define a Name Definition structure. This can then be
  * used by plugins to write or read their own definition types.
- *
- * @author Martin Maher
  */
 public class NameDefinition implements OfficeConstants {
 
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 db3674b..e908259 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
@@ -30,8 +30,6 @@ import org.openoffice.xmerge.util.TwipsConverter;
 
 /**
  *  Represents a text <code>Style</code> in an OpenOffice document.
- *
- *  @author Martin Maher
  */
 public class RowStyle extends Style implements Cloneable {
 
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 b4f5b60..44bf94a 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
@@ -29,8 +29,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
 /**
  * This is a class representing the different attributes for a worksheet
  * contained in settings.xml.
- *
- * @author Martin Maher
  */
 public class SheetSettings implements OfficeConstants {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
index 380497d..d49f5a6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
@@ -27,7 +27,6 @@ import org.openoffice.xmerge.ConvertData;
  *  This class is a abstract class for encoding a "Device"
  *  <code>Document</code> format into an alternative spreadsheet format.
  *
- *  @author  Mark Murnane
  */
 public abstract class SpreadsheetDecoder {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
index aae852c..3cc0a35 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
  *
  *  <p>TODO - Add appropriate exceptions to each of the methods.</p>
  *
- *  @author  Mark Murnane
  */
 public abstract class SpreadsheetEncoder {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
index d66c8da..2ff98cb 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
@@ -22,7 +22,6 @@ package org.openoffice.xmerge.converter.xml.sxc;
 /**
  * Interface defining constants for Sxc attributes.
  *
- * @author  Martin Maher
  */
 public interface SxcConstants {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
index d554c99..d7e6b55 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
@@ -44,9 +44,6 @@ import org.w3c.dom.NodeList;
  *  object, then it calls <code>buildDocument</code> to create a
  *  <code>SxcDocument</code> object from it.</p>
  *
- *  @author      Paul Rank
- *  @author      Mark Murnane
- *  @author      Martin Maher
  */
 public abstract class SxcDocumentDeserializer implements OfficeConstants,
     DocumentDeserializer {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index 36e2baf..cf4f0b4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -46,8 +46,6 @@ import org.w3c.dom.NodeList;
  *  It uses a <code>DocEncoder</code> object for the actual conversion
  *  of contents to the device spreadsheet format.</p>
  *
- * @author      Paul Rank
- * @author      Mark Murnane
  */
 public abstract class SxcDocumentSerializer implements OfficeConstants,
     DocumentSerializer {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index 9aa52ba..4c57734 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -55,8 +55,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo;
  *  <p>The <code>serialize</code> method transforms the DOM
  *  document from the given <code>Document</code> object by
  *  means of a supplied Xsl Stylesheet.</p>
- *
- *  @author      Aidan Butler
  */
 public final class DocumentDeserializerImpl
     implements  DocumentDeserializer,URIResolver {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index a347280..52c40c6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -63,8 +63,6 @@ import java.io.FileNotFoundException;
  *  <p>The <code>serialize</code> method transforms the DOM
  *  document from the given <code>Document</code> object by
  *  means of a supplied Xsl Stylesheet.</p>
- *
- *  @author      Aidan Butler
  */
 
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index 59d5ef3..878ba9c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -52,8 +52,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo;
  *  DocumentSerializer} and {@link
  *  org.openoffice.xmerge.DocumentDeserializer
  *  DocumentDeserializer}</p>
- *
- *  @author   Aidan Butler
  */
 public final class PluginFactoryImpl extends PluginFactory
     implements DocumentDeserializerFactory, DocumentSerializerFactory, DocumentMergerFactory
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
index 49aae7f..7378f5b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
@@ -24,8 +24,6 @@ package org.openoffice.xmerge.merger;
  *  <code>DiffAlgorithm</code> as a set of difference between two
  *  <code>Iterators</code> (the original and modified
  *  <code>Iterators</code>).
- *
- *  @author smak
  */
 public final class Difference {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
index 4466f32..7a35abb 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
@@ -24,8 +24,6 @@ package org.openoffice.xmerge.merger;
  *  DiffAlgorithm} and {@link
  *  org.openoffice.xmerge.merger.MergeAlgorithm
  *  MergeAlgorithm} to access a <code>Document</code>.
- *
- *  @author smak
  */
 public interface Iterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index 3a242db..3e7360a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -26,8 +26,6 @@ import org.openoffice.xmerge.merger.Difference;
  *  This is the <code>MergeAlgorithm</code> interface. It is an
  *  interface so that different merge algorithms may be plugged-in
  *  to actually merge the diffs back to an original document.
- *
- *  @author smak
  */
 public interface MergeAlgorithm {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index 2d99888..eed7049 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -25,8 +25,6 @@ import org.w3c.dom.Node;
  *  org.openoffice.xmerge.merger.MergeAlgorithm
  *  MergeAlgorithm} to merge two <code>Node</code> objects.  It is an
  *  interface so that  different merge algorithms may be plugged-in.
- *
- *  @author smak
  */
 public interface NodeMergeAlgorithm {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
index cf93b71..16102e8 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
@@ -36,8 +36,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
  *  this <code>Iterator</code> does not support any operation methods such
  *  as insert, remove or replace.  The main purpose of this
  *  <code>Iterator</code> is to be used with difference, not with merge.</p>
- *
- *  @author smak
  */
 public final class CellNodeIterator extends NodeIterator  {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
index 77bc473..6f558e0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
@@ -28,8 +28,6 @@ import org.openoffice.xmerge.merger.Difference;
  *  <p>It also use Longest Common Subsequence (LCS).  The algorithm is based
  *  on the book "Introduction to Algorithms" by Thomas H.Cormen,
  *  Charles E.Leiserson, and Ronald L.Riverst (MIT Press 1990) page 314.</p>
- *
- *  @author smak
  */
 public class CharArrayLCSAlgorithm {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
index da22778..258401e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
@@ -39,8 +39,6 @@ import java.util.List;
  *  not support any operation methods such as insert, remove or replace.  The
  *  main purpose of this <code>Iterator</code> is to be used with difference,
  *  not with merge.</p>
- *
- *  @author smak
  */
 public class CharacterParser {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
index 58e511c..c7959be 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
@@ -29,8 +29,6 @@ import org.openoffice.xmerge.util.Debug;
  *  Using Longest Common Subsequence (LCS). The algorithm here is based
  *  on the book "Introduction to Algorithms" by Thomas H.Cormen,
  *  Charles E.Leiserson and Ronald L.Riverst (MIT Press 1990) page 314.
- *
- *  @author smak
  */
 public class IteratorLCSAlgorithm implements DiffAlgorithm {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
index 7a0cdf2..94d4112 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
@@ -52,8 +52,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
  *  </li></ol></p>
  *
  *  <p>NOTE: The algorithm will have potential side effect to split rows.</p>
- *
- *  @author smak
  */
 
 public class IteratorRowCompare implements DiffAlgorithm {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java
index 31cc2ef..0e67e97 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java
@@ -41,8 +41,6 @@ import org.w3c.dom.NodeList;
  *  <code>Iterator</code> does not support any operation methods such as
  *  insert, remove or replace.  The main purpose of this
  *  <code>Iterator</code> is to be used with difference, not with merge.</p>
- *
- *  @author smak
  */
 public abstract class NodeIterator implements Iterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
index 1327e4b..9854d16 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java
@@ -25,8 +25,6 @@ import org.openoffice.xmerge.merger.Iterator;
  *  It is based upon a simple <code>Object</code> array.</p>
  *
  * <p>Note: this class is not thread safe for performance reasons.</p>
- *
- *  @author smak
  */
 public final class ObjectArrayIterator implements Iterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
index 3279eeb..23ba1d3 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
@@ -36,8 +36,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
  *  <code>Iterator</code> does not support any operation methods such as
  *  insert, remove or replace.  The main purpose of this
  *  <code>Iterator</code> is to be used with difference, not with merge.</p>
- *
- *  @author smak
  */
 public final class ParaNodeIterator extends NodeIterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
index babe1df..779393e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
@@ -27,8 +27,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
 /**
  *  This is an implementation of the <code>Iterator</code> interface and extends
  *  <code>NodeIterator</code>.  It will traverse the tree and find row sequences.
- *
- * @author smak
  */
 public final class RowIterator extends NodeIterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java
index 5c494fa..d20a005 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java
@@ -25,8 +25,6 @@ import org.w3c.dom.Node;
  *  <code>Node</code> pointer in a text <code>Node</code>.  It is
  *  mainly used for character parser to make a list of text
  *  <code>Node</code> cache entries.
- *
- *  @author smak
  */
 public class TextNodeEntry {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
index f40aaff..2450914 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
@@ -35,8 +35,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants;
  *  this <code>Iterator</code> does not support any operation methods
  *  such as insert, remove or replace.  The main purpose of this
  *  <code>Iterator</code> is to be used with difference, not with merge.</p>
- *
- *  @author smak
  */
 public final class TextNodeIterator extends NodeIterator {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index 36c1b72..a303794 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -31,8 +31,6 @@ import org.openoffice.xmerge.util.Debug;
  *  This is an implementation of the <code>NodeMergeAlgorithm</code>
  *  interface.  It is used to merge two paragraph <code>Node</code>
  *  objects based on character comparisons.
- *
- * @author smak
  */
 public final class CharacterBaseParagraphMerge
                    implements NodeMergeAlgorithm {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
index cb60e161..87dd1da 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
@@ -35,8 +35,6 @@ import org.openoffice.xmerge.util.XmlUtil;
  * appropriate class which implements {@link
  * org.openoffice.xmerge.merger.NodeMergeAlgorithm
  * NodeMergeAlgorithm} to perform the merge.
- *
- * @author smak
  */
 public class DocumentMerge implements MergeAlgorithm {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
index f64c137..0af951f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
@@ -32,8 +32,6 @@ import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
  *  is that this merge will try to maintain unsupported features by
  *  examining the cell <code>node</code> objects one by one when it
  *  removes a node from the original <code>Iterator</code>.
- *
- * @author smak
  */
 public final class SheetMerge extends DocumentMerge {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
index 9ff7add..ce94213 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
@@ -29,7 +29,6 @@ import java.util.Properties;
  *  Loads a properties file so that registry knows which plug-ins
  *  it needs to load.
  *
- *  @author Martin Maher
  */
 public class ConverterInfoList {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index b43f003..b476ea3 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -39,7 +39,6 @@ import java.util.Properties;
  *  to set the writer to either <code>System.out</code>,
  *  <code>System.err</code>, or to a file.
  *
- *  @author      Herbie Ong
  */
 public final class Debug {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
index 5c6ccc5..b7054e1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
@@ -27,7 +27,6 @@ package org.openoffice.xmerge.util;
  *    <code>java.nio.ByteBuffer</code> in Java 1.4, it may no longer be
  *    necessary to use this class in the future.</p>
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public class EndianConverter {
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 a0f2d8b..35cf0eb 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 /**
  * Class providing utility methods for OpenOffice plugins.
  *
- * @author  Mark Murnane
  * @version 1.1
  */
 public class OfficeUtil implements OfficeConstants {
@@ -123,4 +122,4 @@ public class OfficeUtil implements OfficeConstants {
             nodes[i] = nodeVec.get(i);
         return nodes;
     }
-}
\ No newline at end of file
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java
index c9d8a7a..091dda7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java
@@ -36,7 +36,6 @@ import java.util.ResourceBundle;
  *  declare it.  If it does throw <code>MissingResourceException</code>,
  *  it may be due to a packaging problem.</p>
  *
- *  @author      Herbie Ong
  */
 public final class Resources
 {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
index e43e382..3b28d2f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
@@ -23,7 +23,6 @@ package org.openoffice.xmerge.util;
  * <p>Helper class providing static methods to convert data to/from
  *    twips</p>
  *
- * @author  Martin Maher
  */
 public class TwipsConverter {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
index 54105f8..939a867 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
@@ -26,8 +26,6 @@ import org.w3c.dom.NamedNodeMap;
 
 /**
  *  Class containing static util methods for handling XML trees.
- *
- *  @author     smak
  */
 public final class XmlUtil {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index 20b5ce5..bf88d21 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -31,8 +31,6 @@ import org.openoffice.xmerge.PluginFactory;
 
 /**
  *  Class for storing the information about a converter plugin.
- *
- *  @author  Brian Cameron
  */
 public class ConverterInfo {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 9f5ff30..245fb4a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -28,7 +28,6 @@ import java.io.*;
  *  manager can exist at a time.  It is final, so it may not be
  *  subclassed.
  *
- *  @author Brian Cameron
  */
 public final class ConverterInfoMgr {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 38b4bb9..b4083f8 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -32,8 +32,6 @@ import java.net.JarURLConnection;
  *  file out of a jar file and parses it, providing access to this
  *  information in a <code>Vector</code> of <code>ConverterInfo</code>
  *  objects.
- *
- *  @author  Brian Cameron
  */
 public class ConverterInfoReader {
 
-- 
1.7.11.4



More information about the LibreOffice mailing list