diff options
Diffstat (limited to 'xmerge/source/xmerge')
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 2 | ||||
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index 839b43100938..9fe83a2a4a51 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -274,7 +274,7 @@ public abstract class OfficeDocument // Need to read the manifest file and construct a list of objects NodeList nl = manifestDoc.getElementsByTagName(TAG_MANIFEST_FILE); - // Dont create the HashMap if there are no embedded objects + // Don't create the HashMap if there are no embedded objects int len = nl.getLength(); for (int i = 0; i < len; i++) { Node n = nl.item(i); 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 c39c2d9d9fd3..c086439bbdec 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 comparision algorithm then do a merge on it + // use a straight comparison algorithm then do a merge on it Iterator i1 = new RowIterator(cc_, workSheet); Iterator i2 = new RowIterator(cc_, matchingWorkSheet); |