summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-06-23 20:42:27 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-02-06 09:51:36 -0500
commit2fa86540a3dde7c2e2c04be7a378d891ca02f815 (patch)
tree1011b62f6074d27ec489184dc7527e3903e408e3 /xmerge
parent53ade60932857cb9b8b71520bf73c96a2e98dc11 (diff)
Revert "Typo: iff->if"
This reverts commit cf92da3d6e1de14756efe3f1ee79f393a2f3787d. iff can mean "if and only if" so not a typo (cherry picked from commit 2a65bf32ec270484dcea4d22d3c93552dc0c24dd)
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java4
1 files changed, 2 insertions, 2 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 6b33aa600231..33cab9fd8f87 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
@@ -135,7 +135,7 @@ public class DocumentMergerImpl implements DocumentMerger {
// try to match the workSheet
Node matchingWorkSheet = matchWorkSheet(workSheet, workSheetList1);
- // add the new WorkSheet to the original document if match not found
+ // add the new WorkSheet to the original document iff match not found
if (matchingWorkSheet == null) {
Node cloneNode = XmlUtil.deepClone(officeBody, workSheet);
officeBody.appendChild(cloneNode);
@@ -180,4 +180,4 @@ public class DocumentMergerImpl implements DocumentMerger {
return matchSheet;
}
-}
+} \ No newline at end of file