summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-04-29 21:12:16 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-05-01 02:31:57 +0200
commit3cca2dca62b19242a5b421f938443eabcd24b671 (patch)
tree70415ceeb44178ed9df8ead9bb729e0c3e1359fa
parent3629fac93ee96a3778bb9a7a63150b35c5d9bc3c (diff)
add test for fdo#75168
Change-Id: Iffb07d98333667837a7a2bba00e2d667d49bb709
-rw-r--r--sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv3
-rw-r--r--sc/qa/unit/data/xlsx/new_cond_format_test.xlsxbin9818 -> 11254 bytes
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx17
3 files changed, 16 insertions, 4 deletions
diff --git a/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv b/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv
new file mode 100644
index 000000000000..b35f4e58e25b
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv
@@ -0,0 +1,3 @@
+2.00,2
+1,1.00
+4.00,3
diff --git a/sc/qa/unit/data/xlsx/new_cond_format_test.xlsx b/sc/qa/unit/data/xlsx/new_cond_format_test.xlsx
index f5a69774936a..0750188d473f 100644
--- a/sc/qa/unit/data/xlsx/new_cond_format_test.xlsx
+++ b/sc/qa/unit/data/xlsx/new_cond_format_test.xlsx
Binary files differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 82edb800fe42..cf1233b51f86 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -265,10 +265,19 @@ void ScExportTest::testConditionalFormatExportXLSX()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
- OUString aCSVFile("new_cond_format_test.");
- OUString aCSVPath;
- createCSVPath( aCSVFile, aCSVPath );
- testCondFile(aCSVPath, pDoc, 0);
+ {
+ OUString aCSVFile("new_cond_format_test.");
+ OUString aCSVPath;
+ createCSVPath( aCSVFile, aCSVPath );
+ testCondFile(aCSVPath, pDoc, 0);
+ }
+ {
+ OUString aCSVFile("new_cond_format_test_sheet2.");
+ OUString aCSVPath;
+ createCSVPath( aCSVFile, aCSVPath );
+ testCondFile(aCSVPath, pDoc, 1);
+ }
+
xDocSh->DoClose();
}