diff options
author | Noel Power <noel.power@suse.com> | 2013-06-25 10:28:27 +0100 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2013-06-25 10:30:16 +0100 |
commit | 69dcacedaccd1d698a54eed615ee8739747bc975 (patch) | |
tree | d333ba3cb76a7d1306cda37ff8efbb064586f47f /sc | |
parent | Add Ignore-Diacritics to find toolbar for CTL fdo#52204 (diff) | |
download | core-69dcacedaccd1d698a54eed615ee8739747bc975.tar.gz core-69dcacedaccd1d698a54eed615ee8739747bc975.zip |
unit test for commit:1680a8cd4f4393ec15c4f85cb63b6654117d56d1 (fdo#56960)
expand the existing borders import check to cater for xlsx ( and
testing for fine/hair border styles )
Change-Id: Ic5c3cd46e0049dbce9997f0881c4d98e0d64e00c
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/unit/data/xls/border.xls | bin | 21504 -> 28160 bytes | |||
-rwxr-xr-x | sc/qa/unit/data/xlsx/border.xlsx | bin | 0 -> 9784 bytes | |||
-rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 25 |
3 files changed, 22 insertions, 3 deletions
diff --git a/sc/qa/unit/data/xls/border.xls b/sc/qa/unit/data/xls/border.xls Binary files differindex b314f7d19be3..876839b1fcb1 100644 --- a/sc/qa/unit/data/xls/border.xls +++ b/sc/qa/unit/data/xls/border.xls diff --git a/sc/qa/unit/data/xlsx/border.xlsx b/sc/qa/unit/data/xlsx/border.xlsx Binary files differnew file mode 100755 index 000000000000..e33c083b3838 --- /dev/null +++ b/sc/qa/unit/data/xlsx/border.xlsx diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index f55cb9bf966b..8861a9d2d8a2 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -96,6 +96,7 @@ public: void testMatrixXLS(); void testBorderODS(); void testBorderXLS(); + void testBorderXLSX(); void testBordersOoo33(); void testBugFixesODS(); void testBugFixesXLS(); @@ -158,6 +159,7 @@ public: CPPUNIT_TEST(testMatrixXLS); CPPUNIT_TEST(testBorderODS); CPPUNIT_TEST(testBorderXLS); + CPPUNIT_TEST(testBorderXLSX); CPPUNIT_TEST(testBordersOoo33); CPPUNIT_TEST(testBugFixesODS); CPPUNIT_TEST(testBugFixesXLS); @@ -208,7 +210,7 @@ public: private: void testPassword_Impl(const OUString& rFileNameBase); - + void testBorderImpl( sal_uLong nFormatType ); uno::Reference<uno::XInterface> m_xCalcComponent; }; @@ -750,9 +752,9 @@ void ScFiltersTest::testBorderODS() xDocSh->DoClose(); } -void ScFiltersTest::testBorderXLS() +void ScFiltersTest::testBorderImpl( sal_uLong nFormatType ) { - ScDocShellRef xDocSh = loadDoc("border.", XLS); + ScDocShellRef xDocSh = loadDoc("border.", nFormatType ); CPPUNIT_ASSERT_MESSAGE("Failed to load border.xls", xDocSh.Is()); ScDocument* pDoc = xDocSh->GetDocument(); @@ -779,7 +781,24 @@ void ScFiltersTest::testBorderXLS() CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),30L); + + pDoc->GetBorderLines( 7, 9, 0, &pLeft, &pTop, &pRight, &pBottom ); + CPPUNIT_ASSERT(pRight); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::FINE_DASHED); + CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),1L); +} + +void ScFiltersTest::testBorderXLS() +{ + testBorderImpl( XLS ); } + +void ScFiltersTest::testBorderXLSX() +{ + testBorderImpl( XLSX ); +} + struct Border { sal_Int16 column; |