Code cleanup

* Remove dead code
* Fix comment typos
Released under LGPLv3+/MPL

7 files changed, 11 insertions, 11 deletions

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 11240b4bceac..b224baafc48a 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
@@ -76,7 +76,7 @@ public abstract class EmbeddedObject {
      * Retrieves the name of the embedded object represented by an instance of
      * this class.
      *
-     * <b>N.B.</b>The name referes to the name as found in the
+     * <b>N.B.</b>The name refers to the name as found in the
      * <code>META-INF/manifest.xml</code> file.
      *
      * @return  The name of the object.
@@ -113,4 +113,4 @@ public abstract class EmbeddedObject {
      * @return  Document    <code>Document</code> containing the manifest entries.
      */
     abstract void writeManifestData(Document manifestDoc) throws DOMException;
-}
\ No newline at end of file
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index dcf82bd2ace6..6a6e2d239874 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -91,7 +91,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the content data for this embedded object.
      *
-     * @return DOM represenation of "content.xml"
+     * @return DOM representation of "content.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
@@ -120,7 +120,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the settings data for this embedded object.
      *
-     * @return DOM represenation of "settings.xml"
+     * @return DOM representation of "settings.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
@@ -149,7 +149,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the style data for this embedded object.
      *
-     * @return DOM represenation of "styles.xml"
+     * @return DOM representation of "styles.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
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 2eb507d09b7b..e47b750459a0 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
@@ -199,7 +199,7 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants,
     }
 
     /**
-     * This initializes a font table so we can imclude some basic font
+     * This initializes a font table so we can include some basic font
      * support for spreadsheets.
      *
      */
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 edb95cfd9cb2..742340a8158e 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
@@ -39,7 +39,7 @@ import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
  *  The main difference between this implementation and
  *  <code>DocumentMerge</code>
  *  is that this merge will try to maintain unsupported features by
- *  examing the cell <code>node</code> objects one by one when it
+ *  examining the cell <code>node</code> objects one by one when it
  *  removes a node from the original <code>Iterator</code>.
  *
  * @author smak
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html b/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
index ea56e3b6c118..5a8d9e091aa4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
@@ -67,7 +67,7 @@ implementation so that the merge logic knows what changes from the
 &quot;lossy&quot; format to merge into the original &quot;rich&quot;
 <code>Document</code>.</p>
 
-<p>Each plug-in must be registed via the singleton ConverterInfoMgr
+<p>Each plug-in must be registered via the singleton ConverterInfoMgr
 object via its {@link
 org.openoffice.xmerge.util.registry.ConverterInfoMgr#addPlugIn
 addPlugIn} method.</p>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
index 30675c0889d5..d0fed6d39ce0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
@@ -120,7 +120,7 @@ public class ColourConverter {
     }
 
     /**
-     * Uses the colour table it it exists to translate default values to
+     * Uses the colour table if it exists to translate default values to
      * values in the colorTable
      */
     private short colourLookup(short colour) {
@@ -133,7 +133,7 @@ public class ColourConverter {
     }
 
     /**
-     * Uses the colour table it it exists to translate default values to
+     * Uses the colour table if it exists to translate default values to
      * values in the colorTable
      */
     private short indexLookup(short index) {
diff --git a/xmerge/workben/jstyle.pl b/xmerge/workben/jstyle.pl
index 3c300c29a227..177b1a2aff94 100644
--- a/xmerge/workben/jstyle.pl
+++ b/xmerge/workben/jstyle.pl
@@ -396,7 +396,7 @@ if (0) {
     if (/\S\*\//) {
         do err("missing blank before close comment");
     }
-    # allow // at beginnging of line, often used to comment out code
+    # allow // at beginning of line, often used to comment out code
     if (/.\/\/\S/) {        # C++ comments
         do err("missing blank after start comment");
     }