[Libreoffice-commits] core.git: filter/qa qadevOOo/tests

[dennisroczek]

 filter/qa/complex/filter/detection/typeDetection/files.csv |    2 +-
 qadevOOo/tests/java/mod/_sc/ScCellObj.java                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a87f678e7ba525c7725cd2f4cfadfb69bdcd4b34
Author: dennisroczek <dennisroczek at libreoffice.org>
Date:   Fri Mar 17 08:53:15 2017 +0000

    fix typo: amd --> and
    
    Change-Id: I2905e8bbc659ab8a6344b172980d20455a67e87e
    Reviewed-on: https://gerrit.libreoffice.org/35319
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/qa/complex/filter/detection/typeDetection/files.csv b/filter/qa/complex/filter/detection/typeDetection/files.csv
index d9e1a5c58ca6..007b8786cd80 100644
--- a/filter/qa/complex/filter/detection/typeDetection/files.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/files.csv
@@ -2,7 +2,7 @@ fileAlias;fileURL;defaultFileType;streamFileType
 #**************************************************************
 #** N O T E
 #**
-#** The detection for template filter amd wirter_text_encoded
+#** The detection for template filter and wirter_text_encoded
 #** will be changed on following childworkspsace
 #**
 #**************************************************************
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
index 0c83486c9c29..1c5e02d3700f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
@@ -161,7 +161,7 @@ public class ScCellObj extends TestCase {
         tEnv.addObjRelation("XTextFieldsSupplier.MAKEENTRY", Boolean.TRUE);
         tEnv.addObjRelation("MAKEENTRYINCELL", cell);
 
-        // for XSearchable amd XReplaceable interface test
+        // for XSearchable and XReplaceable interface test
         tEnv.addObjRelation("XSearchable.MAKEENTRYINCELL", cell);
         tEnv.addObjRelation("EXCLUDEFINDNEXT", Boolean.TRUE);