diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-22 04:41:34 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-22 07:09:23 +0100 |
| commit | 86ff8ec2a6da2e7eb50694c1f8242c9e9b713920 (patch) | |
| tree | 72def85e49d21f0fc24a6f390fe2f3c2d35c29c9 | |
| parent | 0d8db7a49354de97977d1cfcea534fbcdc250078 (diff) | |
let us use ScBootstrapFixture::loadDoc here
Change-Id: Ia5d29da921e53b8443541e5f69e2bbc7fd99edfa
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 72a5dc36a122..b2133dbd591b 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1730,18 +1730,7 @@ void ScFiltersTest::testDataBarODS() void ScFiltersTest::testNewCondFormatXLSX() { - const OUString aFileNameBase("new_cond_format_test."); - OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); - OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; - OUString aFileName; - createFileURL(aFileNameBase, aFileExtension, aFileName); - OUString aFilterType(aFileFormats[XLSX].pTypeName, strlen(aFileFormats[XLSX].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[XLSX].pName << " Test" << std::endl; - - unsigned int nFormatType = aFileFormats[XLSX].nFormatType; - unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS : 0; - ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType, - nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT); + ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "new_cond_format_test.", XLSX ); CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.Is()); @@ -1757,18 +1746,7 @@ void ScFiltersTest::testNewCondFormatXLSX() void ScFiltersTest::testFormulaDependency() { - const OUString aFileNameBase("dependencyTree."); - OUString aFileExtension(aFileFormats[ODS].pName, strlen(aFileFormats[ODS].pName), RTL_TEXTENCODING_UTF8 ); - OUString aFilterName(aFileFormats[ODS].pFilterName, strlen(aFileFormats[ODS].pFilterName), RTL_TEXTENCODING_UTF8) ; - OUString aFileName; - createFileURL(aFileNameBase, aFileExtension, aFileName); - OUString aFilterType(aFileFormats[ODS].pTypeName, strlen(aFileFormats[ODS].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[ODS].pName << " Test" << std::endl; - - unsigned int nFormatType = aFileFormats[ODS].nFormatType; - unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS : 0; - ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType, - nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT); + ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "dependencyTree.", ODS ); ScDocument* pDoc = xDocSh->GetDocument(); |