summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
index 33cab9fd8f87..c39c2d9d9fd3 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
@@ -91,7 +91,7 @@ public class DocumentMergerImpl implements DocumentMerger {
if (matchingWorkSheet != null) {
// need to put it into a row Iterator
- // use a straight comparsion algorithm then do a merge on it
+ // use a straight comparision algorithm then do a merge on it
Iterator i1 = new RowIterator(cc_, workSheet);
Iterator i2 = new RowIterator(cc_, matchingWorkSheet);
@@ -180,4 +180,4 @@ public class DocumentMergerImpl implements DocumentMerger {
return matchSheet;
}
-} \ No newline at end of file
+}
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 c6698283f980..33db7cd3e956 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
@@ -74,12 +74,12 @@ public interface Iterator {
boolean equivalent(Object obj1, Object obj2);
/**
- * A method to force the {@code Iterator} to transverse the tree again to
+ * A method to force the {@code Iterator} to traverse the tree again to
* refresh the content.
*
- * <p>It is used mainly for {@code Iterator} objects which take a snap shot
- * instead of dynamically transversing the tree. The current position will
+ * <p>It is used mainly for {@code Iterator} objects which take a snapshot
+ * instead of dynamically tranversing the tree. The current position will
* be set to the beginning.</p>
*/
void refresh();
-} \ No newline at end of file
+}