summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-01-24 11:40:16 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-01-24 11:41:49 -0500
commit585b080046eca4d2bb60c92e5cf6bf5e644e7590 (patch)
tree4f8df219e6d245e48d95657f198027d1ecef6e65 /sc
parent08706f37737a2b5c92ef3c6e492b152e75fcd11b (diff)
calling loadDoc is simpler.
Change-Id: I6a507825252f316c8106ea4b856bf166a010c15b
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx14
1 files changed, 1 insertions, 13 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index d934ce925656..233340696e0d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1328,19 +1328,7 @@ void ScFiltersTest::testPasswordOld()
void ScFiltersTest::testControlImport()
{
- const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("singlecontrol."));
- rtl::OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 );
- rtl::OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
- rtl::OUString aFileName;
- createFileURL(aFileNameBase, aFileExtension, aFileName);
- rtl::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 = load(aFilterName, aFileName, rtl::OUString(), aFilterType,
- nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
+ ScDocShellRef xDocSh = loadDoc("singlecontrol.", XLSX);
CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.Is());
uno::Reference< frame::XModel > xModel = xDocSh->GetModel();