From 0251fdd0336e26cf391331a1fca1edb309b6dc92 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 22 Sep 2012 22:00:36 +0200 Subject: now we can also activate the cond format import test for xlsx Change-Id: Idb72bb2616c212439241d93ac28c9649457507a3 --- sc/qa/unit/data/xlsx/formats.xlsx | Bin 7878 -> 7928 bytes sc/qa/unit/subsequent_filters-test.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'sc') diff --git a/sc/qa/unit/data/xlsx/formats.xlsx b/sc/qa/unit/data/xlsx/formats.xlsx index 6eb216c0e9a6..ddc828af96ab 100644 Binary files a/sc/qa/unit/data/xlsx/formats.xlsx and b/sc/qa/unit/data/xlsx/formats.xlsx 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); -- cgit v1.2.3