diff options
| author | Raal <raal@post.cz> | 2015-01-12 11:25:00 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-13 16:37:00 +0100 |
| commit | 731a9aab0fa42ed42b5470e2c6f7e9fc6b1e3a85 (patch) | |
| tree | d7e94425700ae735244d3c12327dfe449f441624 /sc/qa/unit | |
| parent | 964ddc1469fb7fb7f1c4b66ad8c1479c6283d56e (diff) | |
add first test for user defined functions
currently disabled as we have a crash on exit in the test related to the
star basic code
Change-Id: If321561a117ea2c55107916c9cb5e99a2c07bdc6
Diffstat (limited to 'sc/qa/unit')
| -rw-r--r-- | sc/qa/unit/data/contentCSV/user-defined-function.csv | 1 | ||||
| -rw-r--r-- | sc/qa/unit/data/ods/user-defined-function.ods | bin | 0 -> 12180 bytes | |||
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 4 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 7 |
4 files changed, 11 insertions, 1 deletions
diff --git a/sc/qa/unit/data/contentCSV/user-defined-function.csv b/sc/qa/unit/data/contentCSV/user-defined-function.csv new file mode 100644 index 000000000000..45a4fb75db86 --- /dev/null +++ b/sc/qa/unit/data/contentCSV/user-defined-function.csv @@ -0,0 +1 @@ +8 diff --git a/sc/qa/unit/data/ods/user-defined-function.ods b/sc/qa/unit/data/ods/user-defined-function.ods Binary files differnew file mode 100644 index 000000000000..1976c85bc40c --- /dev/null +++ b/sc/qa/unit/data/ods/user-defined-function.ods diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index e0ade4cc2d7e..c64cac111b9f 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> +#include <com/sun/star/document/MacroExecMode.hpp> using namespace com::sun::star; using namespace ::com::sun::star::uno; @@ -546,11 +547,12 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, SfxMedium* pSrcMed = new SfxMedium(rURL, bReadWrite ? STREAM_STD_READWRITE : STREAM_STD_READ ); pSrcMed->SetFilter(pFilter); pSrcMed->UseInteractionHandler(false); + SfxItemSet* pSet = pSrcMed->GetItemSet(); if (pPassword) { - SfxItemSet* pSet = pSrcMed->GetItemSet(); pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword)); } + pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); SAL_INFO( "sc.qa", "about to load " << rURL ); if (!xDocShRef->DoLoad(pSrcMed)) { diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 87978d54391e..13c616d350e2 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -481,6 +481,13 @@ void ScFiltersTest::testFunctionsODS() testFile(aCSVFileName, rDoc3, 0, PureString); xDocSh->DoClose(); + + // crashes at exit while unloading StarBasic code + // xDocSh = loadDoc("user-defined-function.", ODS); + // xDocSh->DoHardRecalc(true); + // ScDocument& rDocUserDef = xDocSh->GetDocument(); + // createCSVPath("user-defined-function.", aCSVFileName); + // testFile(aCSVFileName, rDocUserDef, 0); } void ScFiltersTest::testFunctionsExcel2010() |