summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-01 20:28:21 -0400
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-01 20:28:21 -0400
commit0d1b57b3b1c47b3d2348ca6b37ab0074c728896b (patch)
treedd5554484f6e4c3d7af47d0021eee2fc257355b5
parent0bcda87664af59e01f4e1048991e5cf752547556 (diff)
parent84ae3c9853b7b90d7b859fd562dabc7b31e8deb8 (diff)
Merge ssh://git.freedesktop.org/git/libreoffice/core
-rw-r--r--sc/qa/unit/data/contentCSV/bugFix_Sheet2.csv6
-rw-r--r--sc/qa/unit/data/ods/bug-fixes.odsbin9361 -> 10467 bytes
-rw-r--r--sc/qa/unit/filters-test.cxx6
3 files changed, 11 insertions, 1 deletions
diff --git a/sc/qa/unit/data/contentCSV/bugFix_Sheet2.csv b/sc/qa/unit/data/contentCSV/bugFix_Sheet2.csv
new file mode 100644
index 000000000000..c6fbdda00504
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/bugFix_Sheet2.csv
@@ -0,0 +1,6 @@
+success
+fail
+success
+fail
+success
+fail
diff --git a/sc/qa/unit/data/ods/bug-fixes.ods b/sc/qa/unit/data/ods/bug-fixes.ods
index dcdbd69e66c7..686423527107 100644
--- a/sc/qa/unit/data/ods/bug-fixes.ods
+++ b/sc/qa/unit/data/ods/bug-fixes.ods
Binary files differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 059ef174f988..74a90065201a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -599,7 +599,11 @@ void ScFiltersTest::testBugFixesODS()
CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test
+
+ rtl::OUString aCSVFileName;
+ createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bugFix_Sheet2.")), aCSVFileName);
+ testFile(aCSVFileName, pDoc, 1);
+
xDocSh->DoClose();
}