[Libreoffice-commits] core.git: sc/qa

[Caolán McNamara]

 sc/qa/unit/data/xlsm/pass/CVE-2016-0122-1.xlsm |binary
 sc/qa/unit/filters-test.cxx                    |    6 ++++++
 2 files changed, 6 insertions(+)

New commits:
commit 7ec9c4c703967ecc871b349b46bf56d759c80978
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 15 09:48:04 2016 +0100

    add CVE-2016-0122 test
    
    Change-Id: I065f6d7c62ffa604fc5cc3e522c991068652c8bb

diff --git a/sc/qa/unit/data/xlsm/fail/.gitignore b/sc/qa/unit/data/xlsm/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/data/xlsm/indeterminate/.gitignore b/sc/qa/unit/data/xlsm/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/data/xlsm/pass/.gitignore b/sc/qa/unit/data/xlsm/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/data/xlsm/pass/CVE-2016-0122-1.xlsm b/sc/qa/unit/data/xlsm/pass/CVE-2016-0122-1.xlsm
new file mode 100644
index 0000000..a86f92f
Binary files /dev/null and b/sc/qa/unit/data/xlsm/pass/CVE-2016-0122-1.xlsm differ
diff --git a/sc/qa/unit/data/xlsx/fail/.gitignore b/sc/qa/unit/data/xlsx/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/data/xlsx/indeterminate/.gitignore b/sc/qa/unit/data/xlsx/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/data/xlsx/pass/.gitignore b/sc/qa/unit/data/xlsx/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0a0eac8..a8a6d7f 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -140,6 +140,12 @@ void ScFiltersTest::testCVEs()
     testDir("MS Excel 97",
         m_directories.getURLFromSrc("/sc/qa/unit/data/xls/"));
 
+    testDir("Calc Office Open XML",
+        m_directories.getURLFromSrc("/sc/qa/unit/data/xlsx/"), OUString(), XLSX_FORMAT_TYPE);
+
+    testDir("Calc Office Open XML",
+        m_directories.getURLFromSrc("/sc/qa/unit/data/xlsm/"), OUString(), XLSX_FORMAT_TYPE);
+
     testDir("dBase",
         m_directories.getURLFromSrc("/sc/qa/unit/data/dbf/"));