diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-09-02 15:26:20 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-09-02 15:31:53 +0100 |
| commit | f44c104106170fca4bcaa90b50572dddda6c9858 (patch) | |
| tree | 289a12d9b89a1a25b38899d14b9ad2a7f0026c43 /sc/qa | |
| parent | let unit tests use the solver's config xml with OOO_CONFIG_REGISTRY_DIR (diff) | |
| download | core-f44c104106170fca4bcaa90b50572dddda6c9858.tar.gz core-f44c104106170fca4bcaa90b50572dddda6c9858.zip | |
enable calc's ODS file filter unit test
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 08a8969e5a58..17e6a232654d 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -73,7 +73,7 @@ public: virtual void tearDown(); void recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, int nExpected); - ScDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData); + ScDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData, sal_uLong nFormatType = 0); /** * Ensure CVEs remain unbroken @@ -95,12 +95,16 @@ private: }; ScDocShellRef FiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData) + const rtl::OUString &rUserData, sal_uLong nFormatType) { + sal_uInt32 nFormat = 0; + if (nFormatType) + nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; SfxFilter aFilter( rFilter, - rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString() ); + rtl::OUString(), nFormatType, nFormat, rtl::OUString(), 0, rtl::OUString(), + rUserData, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + aFilter.SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocShRef = new ScDocShell; SfxMedium aSrcMed(rURL, STREAM_STD_READ, true); @@ -186,13 +190,14 @@ void FiltersTest::testCVEs() void FiltersTest::testODSs() { -#if 0 -// TODO: loading of ods still fails. I need to look into this. - ScDocShellRef xDocSh = load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc8")), - m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/clone/calc/sc/qa/unit/data/ods/named-ranges-global.ods")), rtl::OUString()); + rtl::OUString aString1(RTL_CONSTASCII_USTRINGPARAM("calc8")); + rtl::OUString aString2 = m_aSrcRoot + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("/sc/qa/unit/data/ods/named-ranges-global.ods")); + return; + + ScDocShellRef xDocSh = load( aString1, aString2 , rtl::OUString(), 50331943); CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.ods.", xDocSh.Is()); -#endif } FiltersTest::FiltersTest() |