summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-09-22 22:00:36 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-09-23 13:45:16 +0200
commit0251fdd0336e26cf391331a1fca1edb309b6dc92 (patch)
tree6d1433c56c4c8f7ad857a03d45b29cd84092d1db
parentb774fc9f90be8ebe4878ed84920f6f7afa4f12e4 (diff)
now we can also activate the cond format import test for xlsx
Change-Id: Idb72bb2616c212439241d93ac28c9649457507a3
-rw-r--r--sc/qa/unit/data/xlsx/formats.xlsxbin7878 -> 7928 bytes
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx2
2 files changed, 1 insertions, 1 deletions
diff --git a/sc/qa/unit/data/xlsx/formats.xlsx b/sc/qa/unit/data/xlsx/formats.xlsx
index 6eb216c0e9a6..ddc828af96ab 100644
--- a/sc/qa/unit/data/xlsx/formats.xlsx
+++ b/sc/qa/unit/data/xlsx/formats.xlsx
Binary files differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index b5d845ca0e16..d48c455401c0 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -626,7 +626,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n
CPPUNIT_ASSERT_EQUAL_MESSAGE("cell content should be aligned block horizontally", SVX_HOR_JUSTIFY_BLOCK, eHorJustify);
//test Sheet3 only for ods
- if ( nFormat == ODS )
+ if ( nFormat == ODS || nFormat == XLSX )
{
rtl::OUString aCondString = getConditionalFormatString(pDoc, 3,0,2);
pFiltersTest->createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName);