mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make MS Excel 2003 XML filter tests great again!

Browse Source 
Change-Id: Ica8a5a2f6046eabf4fa8081db0aa50ade23b5b3a
This commit is contained in:
David Tardon
2016-11-09 16:26:56 +01:00
parent 4017f59303
commit 1115281560
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/CppunitTest_sc_bugfix_test.mk
View File

@@ -77,6 +77,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
embeddedobj/util/embobj \ embeddedobj/util/embobj \
eventattacher/source/evtatt \ eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \ filter/source/config/cache/filterconfig1 \
filter/source/xmlfilteradaptor/xmlfa \
filter/source/xsltfilter/xsltfilter \
forms/util/frm \ forms/util/frm \
framework/util/fwk \ framework/util/fwk \
i18npool/source/search/i18nsearch \ i18npool/source/search/i18nsearch \

2
sc/CppunitTest_sc_filters_test.mk
View File

@@ -80,6 +80,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
embeddedobj/util/embobj \ embeddedobj/util/embobj \
eventattacher/source/evtatt \ eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \ filter/source/config/cache/filterconfig1 \
filter/source/xmlfilteradaptor/xmlfa \
filter/source/xsltfilter/xsltfilter \
forms/util/frm \ forms/util/frm \
framework/util/fwk \ framework/util/fwk \
i18npool/util/i18npool \ i18npool/util/i18npool \

6
sc/qa/unit/bugfix-test.cxx
View File

@@ -89,7 +89,7 @@ public:
void testTdf98657(); void testTdf98657();
void testTdf88821(); void testTdf88821();
void testTdf88821_2(); void testTdf88821_2();
// void testRhbz1390776(); void testRhbz1390776();
CPPUNIT_TEST_SUITE(ScFiltersTest); CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testTdf64229); CPPUNIT_TEST(testTdf64229);
@@ -101,7 +101,7 @@ public:
CPPUNIT_TEST(testTdf98657); CPPUNIT_TEST(testTdf98657);
CPPUNIT_TEST(testTdf88821); CPPUNIT_TEST(testTdf88821);
CPPUNIT_TEST(testTdf88821_2); CPPUNIT_TEST(testTdf88821_2);
// CPPUNIT_TEST(testRhbz1390776); CPPUNIT_TEST(testRhbz1390776);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
uno::Reference<uno::XInterface> m_xCalcComponent; uno::Reference<uno::XInterface> m_xCalcComponent;
@@ -271,7 +271,6 @@ void ScFiltersTest::testTdf88821_2()
xDocSh->DoClose(); xDocSh->DoClose();
} }
#if 0
void ScFiltersTest::testRhbz1390776() void ScFiltersTest::testRhbz1390776()
{ {
ScDocShellRef xDocSh = loadDoc("rhbz1390776.", FORMAT_XLS_XML); ScDocShellRef xDocSh = loadDoc("rhbz1390776.", FORMAT_XLS_XML);
@@ -281,7 +280,6 @@ void ScFiltersTest::testRhbz1390776()
xDocSh->DoClose(); xDocSh->DoClose();
} }
#endif
ScFiltersTest::ScFiltersTest() ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "/sc/qa/unit/data" ) : ScBootstrapFixture( "/sc/qa/unit/data" )

24
sc/qa/unit/filters-test.cxx
View File

@@ -73,7 +73,7 @@ public:
void testContentLotus123(); void testContentLotus123();
void testContentDIF(); void testContentDIF();
void testContentXLSB(); void testContentXLSB();
//void testContentXLS_XML(); void testContentXLS_XML();
void testSharedFormulaXLS(); void testSharedFormulaXLS();
void testSharedFormulaXLSX(); void testSharedFormulaXLSX();
void testSheetNamesXLSX(); void testSheetNamesXLSX();
@@ -95,7 +95,7 @@ public:
CPPUNIT_TEST(testContentLotus123); CPPUNIT_TEST(testContentLotus123);
CPPUNIT_TEST(testContentDIF); CPPUNIT_TEST(testContentDIF);
CPPUNIT_TEST(testContentXLSB); CPPUNIT_TEST(testContentXLSB);
//CPPUNIT_TEST(testContentXLS_XML); CPPUNIT_TEST(testContentXLS_XML);
CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testSharedFormulaXLS);
CPPUNIT_TEST(testSharedFormulaXLSX); CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testSheetNamesXLSX); CPPUNIT_TEST(testSheetNamesXLSX);
@@ -230,7 +230,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) //same code for ods,
ASSERT_DOUBLES_EQUAL_MESSAGE("=C1+C2", 11.0, fValue); ASSERT_DOUBLES_EQUAL_MESSAGE("=C1+C2", 11.0, fValue);
//check merged cells import //check merged cells import
if (nFormat != FORMAT_LOTUS123 && nFormat != FORMAT_DIF) if (nFormat != FORMAT_LOTUS123 && nFormat != FORMAT_DIF && nFormat != FORMAT_XLS_XML)
{ {
SCCOL nCol = 4; SCCOL nCol = 4;
SCROW nRow = 1; SCROW nRow = 1;
@@ -317,15 +317,15 @@ void ScFiltersTest::testContentXLSB()
xDocSh->DoClose(); xDocSh->DoClose();
} }
// void ScFiltersTest::testContentXLS_XML() void ScFiltersTest::testContentXLS_XML()
// { {
// ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML); ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML);
// CPPUNIT_ASSERT(xDocSh); CPPUNIT_ASSERT(xDocSh.Is());
//
// ScDocument& rDoc = xDocSh->GetDocument(); ScDocument& rDoc = xDocSh->GetDocument();
// testContentImpl(pDoc, FORMAT_XLS_XML); testContentImpl(rDoc, FORMAT_XLS_XML);
// xDocSh->DoClose(); xDocSh->DoClose();
// } }
void ScFiltersTest::testSharedFormulaXLS() void ScFiltersTest::testSharedFormulaXLS()
{ {

2
sc/qa/unit/helper/qahelper.hxx
View File

@@ -49,7 +49,7 @@
#define CSV_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) #define CSV_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN )
#define HTML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) #define HTML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN )
#define DIF_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) #define DIF_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN )
#define XLS_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN) #define XLS_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER)
#define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED) #define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED)
#define FODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::OWN | SfxFilterFlags::STARONEFILTER ) #define FODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::OWN | SfxFilterFlags::STARONEFILTER )