diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-26 00:37:07 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-26 03:22:49 +0200 |
commit | 240464f62bcd95a62ee1692aaa7e5f74a693a5ba (patch) | |
tree | 8812c0ad7e6d03f4171ce56617307749bf9c177c /sc | |
parent | 891574788ad6ab612c1c2653c070ab8b7e297072 (diff) |
clean-up sc's macros_test a bit
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/extras/macros-test.cxx | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index cfba25818917..9a68b7706fa2 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -47,31 +47,9 @@ #include "scitems.hxx" #include "document.hxx" -#define ODS_FORMAT_TYPE 50331943 -#define XLS_FORMAT_TYPE 318767171 -#define XLSX_FORMAT_TYPE 268959811 - -#define ODS 0 -#define XLS 1 -#define XLSX 2 - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace { - -struct FileFormat { - const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType; -}; - -FileFormat aFileFormats[] = { - { "ods" , "calc8", "", ODS_FORMAT_TYPE }, - { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE }, - { "xlsx", "Calc MS Excel 2007 XML" , "MS Excel 2007 XML", XLSX_FORMAT_TYPE } -}; - -} - /* Implementation of Macros test */ class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest @@ -114,12 +92,10 @@ void ScMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt void ScMacrosTest::testStarBasic() { const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("StarBasic.")); - rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 ); - rtl::OUString aFilterName(aFileFormats[0].pFilterName, strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ; + rtl::OUString aFileExtension("ods"); rtl::OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); - rtl::OUString aFilterType(aFileFormats[0].pTypeName, strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[0].pName << " Test" << std::endl; + std::cout << "StarBasic test" << std::endl; uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); @@ -159,10 +135,7 @@ void ScMacrosTest::testVba() } }; - rtl::OUString aFileExtension(aFileFormats[1].pName, strlen(aFileFormats[1].pName), RTL_TEXTENCODING_UTF8 ); - rtl::OUString aFilterName(aFileFormats[1].pFilterName, strlen(aFileFormats[1].pFilterName), RTL_TEXTENCODING_UTF8) ; - rtl::OUString aFilterType(aFileFormats[1].pTypeName, strlen(aFileFormats[1].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[1].pName << " Test" << std::endl; + rtl::OUString aFileExtension("xls"); for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) { rtl::OUString aFileName; |