diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2016-02-02 19:47:20 +0100 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-02-05 06:48:38 +0000 |
| commit | 534b2a4b58ba765dbc256d6297e33453524915e2 (patch) | |
| tree | 68524baff923ce094392f49e0f263ae0d35f80e9 /xmerge | |
| parent | 7f5de2436a5c51ee8dec38a9b04f4a1b3589e361 (diff) | |
Fix typos
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3
Reviewed-on: https://gerrit.libreoffice.org/21797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to '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); |