diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-09-22 02:48:02 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-09-22 02:59:10 +0200 |
| commit | 1aad8c1e2cf36c8232c82412ba8e8cbe306a8179 (patch) | |
| tree | 1b1f58bde23c0260221611b10bcd15dd0fb6c60d | |
| parent | 8c04e4234380b94590450822192defbd85271df4 (diff) | |
enable the cond format import test also for xls and xlsx
Change-Id: I04d743ef9f38f4f65ba912f34ac641ea7031aed2
| -rw-r--r-- | sc/qa/unit/data/xls/formats.xls | bin | 8704 -> 9728 bytes | |||
| -rw-r--r-- | sc/qa/unit/data/xlsx/formats.xlsx | bin | 6118 -> 7878 bytes | |||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 21 |
3 files changed, 9 insertions, 12 deletions
diff --git a/sc/qa/unit/data/xls/formats.xls b/sc/qa/unit/data/xls/formats.xls Binary files differindex 5868a9304e75..982b62f9dbe6 100644 --- a/sc/qa/unit/data/xls/formats.xls +++ b/sc/qa/unit/data/xls/formats.xls diff --git a/sc/qa/unit/data/xlsx/formats.xlsx b/sc/qa/unit/data/xlsx/formats.xlsx Binary files differindex 2cd31f5a1c97..6eb216c0e9a6 100644 --- a/sc/qa/unit/data/xlsx/formats.xlsx +++ b/sc/qa/unit/data/xlsx/formats.xlsx diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 57d3ba7926a1..b5d845ca0e16 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -633,20 +633,17 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n testCondFile(aCSVFileName, pDoc, 2); } - if( nFormat == ODS ) - { - ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(0,0,2); - const ScRangeList& rRange = pCondFormat->GetRange(); - CPPUNIT_ASSERT(rRange == ScRange(0,0,2,3,0,2)); + ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(0,0,2); + const ScRangeList& rRange = pCondFormat->GetRange(); + CPPUNIT_ASSERT(rRange == ScRange(0,0,2,3,0,2)); - pCondFormat = pDoc->GetCondFormat(0,1,2); - const ScRangeList& rRange2 = pCondFormat->GetRange(); - CPPUNIT_ASSERT(rRange2 == ScRange(0,1,2,0,1,2)); + pCondFormat = pDoc->GetCondFormat(0,1,2); + const ScRangeList& rRange2 = pCondFormat->GetRange(); + CPPUNIT_ASSERT(rRange2 == ScRange(0,1,2,0,1,2)); - pCondFormat = pDoc->GetCondFormat(1,1,2); - const ScRangeList& rRange3 = pCondFormat->GetRange(); - CPPUNIT_ASSERT(rRange3 == ScRange(1,1,2,3,1,2)); - } + pCondFormat = pDoc->GetCondFormat(1,1,2); + const ScRangeList& rRange3 = pCondFormat->GetRange(); + CPPUNIT_ASSERT(rRange3 == ScRange(1,1,2,3,1,2)); } } |