sc/qa/unit/data/xls/formats.xls |binary sc/qa/unit/data/xlsx/formats.xlsx |binary sc/qa/unit/subsequent_filters-test.cxx | 12 ++++++++++++ 3 files changed, 12 insertions(+)
New commits: commit 1aad8c1e2cf36c8232c82412ba8e8cbe306a8179 Author: Markus Mohrhard <[email protected]> Date: Sat Sep 22 02:48:02 2012 +0200 enable the cond format import test also for xls and xlsx Change-Id: I04d743ef9f38f4f65ba912f34ac641ea7031aed2 diff --git a/sc/qa/unit/data/xls/formats.xls b/sc/qa/unit/data/xls/formats.xls index 5868a93..982b62f 100644 Binary files a/sc/qa/unit/data/xls/formats.xls and b/sc/qa/unit/data/xls/formats.xls differ diff --git a/sc/qa/unit/data/xlsx/formats.xlsx b/sc/qa/unit/data/xlsx/formats.xlsx index 2cd31f5..6eb216c 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 57d3ba7..b5d845c 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)); } } commit 8c04e4234380b94590450822192defbd85271df4 Author: Markus Mohrhard <[email protected]> Date: Sat Sep 22 02:41:38 2012 +0200 test for imported cond format range from ods Change-Id: I08a876bfce8a6d9c0ff349b8956f0e13281afe5f diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 293b260..57d3ba7 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -632,6 +632,21 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n pFiltersTest->createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName); 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)); + + 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)); + } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
