cui/source/options/optopencl.cxx | 19
cui/source/options/optopencl.hxx | 1
cui/uiconfig/ui/optopenclpage.ui | 18
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7
sc/CppunitTest_sc_ucalc.mk | 4
sc/inc/calcconfig.hxx | 1
sc/inc/scmatrix.hxx | 19
sc/qa/unit/bugfix-test.cxx | 10
sc/qa/unit/copy_paste_test.cxx | 2
sc/qa/unit/filters-test.cxx | 60 -
sc/qa/unit/helper/qahelper.cxx | 6
sc/qa/unit/helper/qahelper.hxx | 20
sc/qa/unit/opencl-test.cxx | 454 +++++-----
sc/qa/unit/subsequent_export-test.cxx | 236 ++---
sc/qa/unit/subsequent_filters-test.cxx | 207 ++--
sc/qa/unit/ucalc_formula.cxx | 47 -
sc/source/core/data/formulacell.cxx | 2
sc/source/core/tool/calcconfig.cxx | 6
sc/source/core/tool/formulagroup.cxx | 231 -----
sc/source/core/tool/scmatrix.cxx | 544 +++++++++----
sc/source/core/tool/token.cxx | 11
21 files changed, 1035 insertions(+), 870 deletions(-)
New commits:
commit a0a9a5f0927fbc2f9ce5984ae65584c4ad7b0c68
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Dec 1 15:54:22 2015 +0100
sc interpreter: Improve the unit test for S/W Interpreter.
Some of the operations are blacklisted for vectorization there, so test both
the normal and s/w interpreter case.
Change-Id: I6d48831f6bdbbb1e150bea06fc97ea5d6e66365b
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 7fd90f8..07c74e5 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -90,6 +90,10 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\
udkapi \
))
+$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc,\
+ officecfg/registry \
+))
+
$(eval $(call gb_CppunitTest_use_ure,sc_ucalc))
$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc))
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ffcf834..be88c53 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -29,6 +29,7 @@
#include <docpool.hxx>
#include <formula/vectortoken.hxx>
+#include <officecfg/Office/Common.hxx>
#include <svl/broadcast.hxx>
#include <memory>
@@ -789,30 +790,46 @@ void Test::testFormulaHashAndTag()
// Test formula vectorization state.
struct {
- const char* pFormula; ScFormulaVectorState eState;
+ const char* pFormula;
+ ScFormulaVectorState eState;
+ ScFormulaVectorState eSwInterpreterState; // these can change when
more is whitelisted
} aVectorTests[] = {
- { "=SUM(1;2;3;4;5)", FormulaVectorEnabled },
- { "=NOW()", FormulaVectorDisabled },
- { "=AVERAGE(X1:Y200)", FormulaVectorCheckReference },
- { "=MAX(X1:Y200;10;20)", FormulaVectorCheckReference },
- { "=MIN(10;11;22)", FormulaVectorEnabled },
- { "=H4", FormulaVectorCheckReference },
+ { "=SUM(1;2;3;4;5)", FormulaVectorEnabled, FormulaVectorEnabled },
+ { "=NOW()", FormulaVectorDisabled, FormulaVectorDisabled },
+ { "=AVERAGE(X1:Y200)", FormulaVectorCheckReference,
FormulaVectorDisabled },
+ { "=MAX(X1:Y200;10;20)", FormulaVectorCheckReference,
FormulaVectorDisabled },
+ { "=MIN(10;11;22)", FormulaVectorEnabled, FormulaVectorDisabled },
+ { "=H4", FormulaVectorCheckReference, FormulaVectorCheckReference },
};
- for (size_t i = 0; i < SAL_N_ELEMENTS(aVectorTests); ++i)
+ bool bSwInterpreter =
officecfg::Office::Common::Misc::UseSwInterpreter::get();
+
+ for (bool bForceSwInterpreter : { false, true })
{
- m_pDoc->SetString(aPos1,
OUString::createFromAscii(aVectorTests[i].pFormula));
- ScFormulaVectorState eState = m_pDoc->GetFormulaVectorState(aPos1);
+ std::shared_ptr< comphelper::ConfigurationChanges >
xBatch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Misc::UseSwInterpreter::set(bForceSwInterpreter,
xBatch);
+ xBatch->commit();
- if (eState != aVectorTests[i].eState)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(aVectorTests); ++i)
{
- std::ostringstream os;
- os << "Unexpected vectorization state: expr:" <<
aVectorTests[i].pFormula;
- CPPUNIT_ASSERT_MESSAGE(os.str().c_str(), false);
+ m_pDoc->SetString(aPos1,
OUString::createFromAscii(aVectorTests[i].pFormula));
+ ScFormulaVectorState eState = m_pDoc->GetFormulaVectorState(aPos1);
+ ScFormulaVectorState eReferenceState = bForceSwInterpreter?
aVectorTests[i].eSwInterpreterState: aVectorTests[i].eState;
+
+ if (eState != eReferenceState)
+ {
+ std::ostringstream os;
+ os << "Unexpected vectorization state: expr: '" <<
aVectorTests[i].pFormula << "', using software interpreter: " <<
bForceSwInterpreter;
+ CPPUNIT_ASSERT_MESSAGE(os.str().c_str(), false);
+ }
+ aPos1.IncRow();
}
- aPos1.IncRow();
}
+ std::shared_ptr< comphelper::ConfigurationChanges >
xBatch(comphelper::ConfigurationChanges::create());
+ officecfg::Office::Common::Misc::UseSwInterpreter::set(bSwInterpreter,
xBatch);
+ xBatch->commit();
+
m_pDoc->DeleteTab(0);
}
commit e0285cd5e179037ebc0e7e33b65ae0386a6a68da
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Dec 1 16:35:49 2015 +0100
sc unit tests: Prefix the format names.
Otherwise we conflict with the officecfg includes; and it is a bad idea to
have too broad names for #define's anyway.
Change-Id: Ie48e6f109f654a9ee4aedb3eb37df5e67f88a905
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 8518e20..fcf3796 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -101,7 +101,7 @@ private:
void ScFiltersTest::testTdf64229()
{
- ScDocShellRef xDocSh = loadDoc("fdo64229b.", ODS);
+ ScDocShellRef xDocSh = loadDoc("fdo64229b.", FORMAT_ODS);
xDocSh->DoHardRecalc(true);
@@ -119,7 +119,7 @@ void ScFiltersTest::testTdf64229()
void ScFiltersTest::testTdf36933()
{
- ScDocShellRef xDocSh = loadDoc("fdo36933test.", ODS);
+ ScDocShellRef xDocSh = loadDoc("fdo36933test.", FORMAT_ODS);
xDocSh->DoHardRecalc(true);
@@ -137,7 +137,7 @@ void ScFiltersTest::testTdf36933()
void ScFiltersTest::testTdf43700()
{
- ScDocShellRef xDocSh = loadDoc("fdo43700test.", ODS);
+ ScDocShellRef xDocSh = loadDoc("fdo43700test.", FORMAT_ODS);
xDocSh->DoHardRecalc(true);
@@ -155,7 +155,7 @@ void ScFiltersTest::testTdf43700()
void ScFiltersTest::testTdf43534()
{
- ScDocShellRef xDocSh = loadDoc("fdo43534test.", ODS);
+ ScDocShellRef xDocSh = loadDoc("fdo43534test.", FORMAT_ODS);
xDocSh->DoHardRecalc(true);
@@ -213,7 +213,7 @@ void ScFiltersTest::testTdf91979()
/*
void ScFiltersTest::testTdf40110()
{
- ScDocShellRef xDocSh = loadDoc("fdo40110test.", ODS);
+ ScDocShellRef xDocSh = loadDoc("fdo40110test.", FORMAT_ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load fdo40110test.*", xDocSh.Is());
xDocSh->DoHardRecalc(true);
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index a2f305c..fd3af4f 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -53,7 +53,7 @@ void ScCopyPasteTest::testCopyPasteXLS()
CPPUNIT_ASSERT( xTargetFrame.is() );
// 1. Open the document
- ScDocShellRef xDocSh = loadDoc("chartx.", XLS);
+ ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS);
CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.Is());
uno::Reference< frame::XModel2 > xModel2 ( xDocSh->GetModel(), UNO_QUERY );
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 3509ea5..fac6c08 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -179,7 +179,7 @@ void testRangeNameImpl(ScDocument& rDoc)
void ScFiltersTest::testRangeNameODS()
{
- ScDocShellRef xDocSh = loadDoc("named-ranges-global.", ODS);
+ ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-globals.*",
xDocSh.Is());
@@ -224,7 +224,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat )
//same code for ods,
CPPUNIT_ASSERT_MESSAGE("=C1+C2", fValue == 11);
//check merged cells import
- if(nFormat != LOTUS123 && nFormat != DIF)
+ if (nFormat != FORMAT_LOTUS123 && nFormat != FORMAT_DIF)
{
SCCOL nCol = 4;
SCROW nRow = 1;
@@ -245,58 +245,58 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat
) //same code for ods,
void ScFiltersTest::testContentODS()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", ODS);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_ODS);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
- testContentImpl(rDoc, ODS);
+ testContentImpl(rDoc, FORMAT_ODS);
xDocSh->DoClose();
}
void ScFiltersTest::testContentXLS()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", XLS);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
- testContentImpl(rDoc, XLS);
+ testContentImpl(rDoc, FORMAT_XLS);
xDocSh->DoClose();
}
void ScFiltersTest::testContentXLSX()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", XLSX);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLSX);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
- testContentImpl(rDoc, XLSX);
+ testContentImpl(rDoc, FORMAT_XLSX);
xDocSh->DoClose();
}
void ScFiltersTest::testContentXLSXStrict()
{
- ScDocShellRef xDocSh = loadDoc("universal-content-strict.", XLSX);
+ ScDocShellRef xDocSh = loadDoc("universal-content-strict.", FORMAT_XLSX);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
- testContentImpl(rDoc, XLSX);
+ testContentImpl(rDoc, FORMAT_XLSX);
xDocSh->DoClose();
}
void ScFiltersTest::testContentLotus123()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", LOTUS123);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_LOTUS123);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
- testContentImpl(rDoc, LOTUS123);
+ testContentImpl(rDoc, FORMAT_LOTUS123);
xDocSh->DoClose();
}
void ScFiltersTest::testContentDIF()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", DIF);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_DIF);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
@@ -305,28 +305,28 @@ void ScFiltersTest::testContentDIF()
void ScFiltersTest::testContentXLSB()
{
- ScDocShellRef xDocSh = loadDoc("universal-content.", XLSB);
+ ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLSB);
xDocSh->DoHardRecalc(true);
ScDocument& rDoc = xDocSh->GetDocument();
- testContentImpl(rDoc, XLSB);
+ testContentImpl(rDoc, FORMAT_XLSB);
xDocSh->DoClose();
}
// void ScFiltersTest::testContentXLS_XML()
// {
-// ScDocShellRef xDocSh = loadDoc("universal-content.", XLS_XML);
+// ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML);
// CPPUNIT_ASSERT(xDocSh);
//
// ScDocument& rDoc = xDocSh->GetDocument();
// CPPUNIT_ASSERT(&rDoc);
-// testContentImpl(pDoc, XLS_XML);
+// testContentImpl(pDoc, FORMAT_XLS_XML);
// xDocSh->DoClose();
// }
void ScFiltersTest::testSharedFormulaXLS()
{
- ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", XLS);
+ ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLS);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
xDocSh->DoHardRecalc(true);
@@ -350,7 +350,7 @@ void ScFiltersTest::testSharedFormulaXLS()
// Excel can easily mess up shared formula ranges, so we need to be able
// to handle these wrong ranges that Excel stores.
- xDocSh = loadDoc("shared-formula/gap.", XLS);
+ xDocSh = loadDoc("shared-formula/gap.", FORMAT_XLS);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc2 = xDocSh->GetDocument();
rDoc2.CalcAll();
@@ -395,7 +395,7 @@ void ScFiltersTest::testSharedFormulaXLS()
void ScFiltersTest::testSharedFormulaXLSX()
{
- ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", XLSX);
+ ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
xDocSh->DoHardRecalc(true);
@@ -418,7 +418,7 @@ void ScFiltersTest::testSharedFormulaXLSX()
void ScFiltersTest::testSheetNamesXLSX()
{
- ScDocShellRef xDocSh = loadDoc("sheet-names.", XLSX);
+ ScDocShellRef xDocSh = loadDoc("sheet-names.", FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
std::vector<OUString> aTabNames = rDoc.GetAllTableNames();
@@ -469,7 +469,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// This example doc contains cell anchored shape that is rotated, the
// rotated shape is in fact clipped by the sheet boundries (and thus
// is a good edge case test to see if we import it still correctly)
- ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedclippedshape.", ODS);
+ ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedclippedshape.", FORMAT_ODS);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
@@ -486,7 +486,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// test save and reload
// for some reason having this test in subsequent_export-test.cxx
causes
// a core dump in editeng ( so moved to here )
- xDocSh = saveAndReload( &(*xDocSh), ODS);
+ xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
ScDocument& rDoc2 = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc2);
impl_testLegacyCellAnchoredRotatedShape( rDoc2, aRect, aAnchor );
@@ -498,7 +498,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// rotated shape is in fact clipped by the sheet boundries,
additionally
// the shape is completely hidden because the rows the shape occupies
// are hidden
- ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedhiddenshape.", ODS, true);
+ ScDocShellRef xDocSh =
loadDoc("legacycellanchoredrotatedhiddenshape.", FORMAT_ODS, true);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
// ensure the imported legacy rotated shape is in the expected position
@@ -525,7 +525,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
}
{
// This example doc contains cell anchored shape that is rotated
- ScDocShellRef xDocSh = loadDoc("legacycellanchoredrotatedshape.", ODS);
+ ScDocShellRef xDocSh = loadDoc("legacycellanchoredrotatedshape.",
FORMAT_ODS);
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc);
@@ -542,7 +542,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// test import
impl_testLegacyCellAnchoredRotatedShape( rDoc, aRect, aAnchor );
// test save and reload
- xDocSh = saveAndReload( &(*xDocSh), ODS);
+ xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS);
ScDocument& rDoc2 = xDocSh->GetDocument();
CPPUNIT_ASSERT(&rDoc2);
impl_testLegacyCellAnchoredRotatedShape( rDoc2, aRect, aAnchor );
@@ -570,7 +570,7 @@ void testEnhancedProtectionImpl( ScDocument& rDoc )
void ScFiltersTest::testEnhancedProtectionXLS()
{
- ScDocShellRef xDocSh = loadDoc("enhanced-protection.", XLS);
+ ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLS);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
@@ -581,7 +581,7 @@ void ScFiltersTest::testEnhancedProtectionXLS()
void ScFiltersTest::testEnhancedProtectionXLSX()
{
- ScDocShellRef xDocSh = loadDoc("enhanced-protection.", XLSX);
+ ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
@@ -592,7 +592,7 @@ void ScFiltersTest::testEnhancedProtectionXLSX()
void ScFiltersTest::testSortWithSharedFormulasODS()
{
- ScDocShellRef xDocSh = loadDoc("shared-formula/sort-crash.", ODS, true);
+ ScDocShellRef xDocSh = loadDoc("shared-formula/sort-crash.", FORMAT_ODS,
true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
@@ -644,7 +644,7 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
// Document contains cached external references.
void ScFiltersTest::testSortWithSheetExternalReferencesODS()
{
- ScDocShellRef xDocSh = loadDoc("sort-with-sheet-external-references.",
ODS, true);
+ ScDocShellRef xDocSh = loadDoc("sort-with-sheet-external-references.",
FORMAT_ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index c8b73c8..46e71fc 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -206,7 +206,7 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument*
pDoc, sal_Int32 nFormat)
pPattern->GetFont(aFont, SC_AUTOCOL_RAW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("font should be striked out with a single
line", STRIKEOUT_SINGLE, aFont.GetStrikeout());
//some tests on sheet2 only for ods
- if (nFormat == ODS)
+ if (nFormat == FORMAT_ODS)
{
pPattern = pDoc->GetPattern(1,2,1);
pPattern->GetFont(aFont, SC_AUTOCOL_RAW);
@@ -247,12 +247,12 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument*
pDoc, sal_Int32 nFormat)
CPPUNIT_ASSERT_EQUAL_MESSAGE("cell content should be aligned block
horizontally", SVX_HOR_JUSTIFY_BLOCK, eHorJustify);
//test Sheet3 only for ods and xlsx
- if ( nFormat == ODS || nFormat == XLSX )
+ if ( nFormat == FORMAT_ODS || nFormat == FORMAT_XLSX )
{
pTest->createCSVPath("conditionalFormatting.", aCSVFileName);
testCondFile(aCSVFileName, pDoc, 2);
// test parent cell style import ( fdo#55198 )
- if ( nFormat == XLSX )
+ if ( nFormat == FORMAT_XLSX )
{
pPattern = pDoc->GetPattern(1,1,3);
ScStyleSheet* pStyleSheet =
const_cast<ScStyleSheet*>(pPattern->GetStyleSheet());
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 1dd1b9c..1beb33c 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -50,16 +50,16 @@
#define XLS_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT
| SfxFilterFlags::ALIEN)
#define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT |
SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER |
SfxFilterFlags::PREFERED)
-#define ODS 0
-#define XLS 1
-#define XLSX 2
-#define XLSM 3
-#define CSV 4
-#define HTML 5
-#define LOTUS123 6
-#define DIF 7
-#define XLS_XML 8
-#define XLSB 9
+#define FORMAT_ODS 0
+#define FORMAT_XLS 1
+#define FORMAT_XLSX 2
+#define FORMAT_XLSM 3
+#define FORMAT_CSV 4
+#define FORMAT_HTML 5
+#define FORMAT_LOTUS123 6
+#define FORMAT_DIF 7
+#define FORMAT_XLS_XML 8
+#define FORMAT_XLSB 9
enum StringType { PureString, FormulaValue, StringValue };
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 237dbf6..53699a8 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -583,7 +583,7 @@ void ScOpenCLTest::enableOpenCL()
void ScOpenCLTest::testCompilerHorizontal()
{
- if(!initTestEnv("opencl/compiler/horizontal.", ODS, false))
+ if(!initTestEnv("opencl/compiler/horizontal.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -606,7 +606,7 @@ void ScOpenCLTest::testCompilerHorizontal()
void ScOpenCLTest::testCompilerNested()
{
- if(!initTestEnv("opencl/compiler/nested.", ODS, false))
+ if(!initTestEnv("opencl/compiler/nested.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -623,7 +623,7 @@ void ScOpenCLTest::testCompilerNested()
void ScOpenCLTest::testCompilerString()
{
- if(!initTestEnv("opencl/compiler/string.", ODS, false))
+ if(!initTestEnv("opencl/compiler/string.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -644,7 +644,7 @@ void ScOpenCLTest::testCompilerString()
void ScOpenCLTest::testCompilerInEq()
{
- if(!initTestEnv("opencl/compiler/ineq.", ODS, false))
+ if(!initTestEnv("opencl/compiler/ineq.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -662,7 +662,7 @@ void ScOpenCLTest::testCompilerInEq()
#if 0
void ScOpenCLTest::testSharedFormulaXLSStockHistory()
{
- if(!initTestEnv("stock-history.", XLS, false))
+ if(!initTestEnv("stock-history.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -686,7 +686,7 @@ void ScOpenCLTest::testSharedFormulaXLSStockHistory()
void ScOpenCLTest::testSharedFormulaXLSGroundWater()
{
- if(!initTestEnv("ground-water-daily.", XLS, false))
+ if(!initTestEnv("ground-water-daily.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -706,7 +706,7 @@ void ScOpenCLTest::testSharedFormulaXLSGroundWater()
void ScOpenCLTest::testSystematic()
{
- if(!initTestEnv("systematic.", XLS, false))
+ if(!initTestEnv("systematic.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
@@ -798,7 +798,7 @@ void ScOpenCLTest::testSystematic()
void ScOpenCLTest::testSharedFormulaXLS()
{
- if(!initTestEnv("sum_ex.", XLS, false))
+ if(!initTestEnv("sum_ex.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -887,7 +887,7 @@ void ScOpenCLTest::testSharedFormulaXLS()
void ScOpenCLTest::testMathFormulaCos()
{
- if(!initTestEnv("opencl/math/cos.", XLS, false))
+ if(!initTestEnv("opencl/math/cos.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -903,7 +903,7 @@ void ScOpenCLTest::testMathFormulaCos()
void ScOpenCLTest::testMathFormulaSinh()
{
- if(!initTestEnv("opencl/math/sinh.", XLS, false))
+ if(!initTestEnv("opencl/math/sinh.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -919,7 +919,7 @@ void ScOpenCLTest::testMathFormulaSinh()
void ScOpenCLTest::testMathFormulaPi()
{
- if(!initTestEnv("opencl/math/pi.", XLS, false))
+ if(!initTestEnv("opencl/math/pi.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -935,7 +935,7 @@ void ScOpenCLTest::testMathFormulaPi()
void ScOpenCLTest::testMathFormulaRandom()
{
- if(!initTestEnv("opencl/math/random.", XLS, false))
+ if(!initTestEnv("opencl/math/random.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -953,7 +953,7 @@ void ScOpenCLTest::testMathFormulaRandom()
}
void ScOpenCLTest::testFinacialFormula()
{
- if(!initTestEnv("opencl/financial/general.", XLS, false))
+ if(!initTestEnv("opencl/financial/general.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1103,7 +1103,7 @@ void ScOpenCLTest::testFinacialFormula()
void ScOpenCLTest::testStatisticalFormulaCorrel()
{
- if(!initTestEnv("opencl/statistical/Correl.", ODS, false))
+ if(!initTestEnv("opencl/statistical/Correl.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1119,7 +1119,7 @@ void ScOpenCLTest::testStatisticalFormulaCorrel()
}
void ScOpenCLTest::testStatisticalFormulaFisher()
{
- if(!initTestEnv("opencl/statistical/Fisher.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Fisher.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1136,7 +1136,7 @@ void ScOpenCLTest::testStatisticalFormulaFisher()
void ScOpenCLTest::testStatisticalFormulaFisherInv()
{
- if(!initTestEnv("opencl/statistical/FisherInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/FisherInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1153,7 +1153,7 @@ void ScOpenCLTest::testStatisticalFormulaFisherInv()
void ScOpenCLTest::testStatisticalFormulaGamma()
{
- if(!initTestEnv("opencl/statistical/Gamma.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Gamma.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1170,7 +1170,7 @@ void ScOpenCLTest::testStatisticalFormulaGamma()
void ScOpenCLTest::testFinacialFvscheduleFormula()
{
- if(!initTestEnv("opencl/financial/Fvschedule.", XLS, false))
+ if(!initTestEnv("opencl/financial/Fvschedule.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1186,7 +1186,7 @@ void ScOpenCLTest::testFinacialFvscheduleFormula()
void ScOpenCLTest::testMathFormulaAbs()
{
- if(!initTestEnv("opencl/math/Abs.", ODS, false))
+ if(!initTestEnv("opencl/math/Abs.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1203,7 +1203,7 @@ void ScOpenCLTest::testMathFormulaAbs()
void ScOpenCLTest::testFinacialSYDFormula()
{
- if(!initTestEnv("opencl/financial/SYD.", XLS, false))
+ if(!initTestEnv("opencl/financial/SYD.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1221,7 +1221,7 @@ void ScOpenCLTest::testFinacialSYDFormula()
#if !defined MACOSX
void ScOpenCLTest::testFinacialIRRFormula()
{
- if(!initTestEnv("opencl/financial/IRR.", XLS, false))
+ if(!initTestEnv("opencl/financial/IRR.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1238,7 +1238,7 @@ void ScOpenCLTest::testFinacialIRRFormula()
void ScOpenCLTest::testStatisticalFormulaGammaLn()
{
- if(!initTestEnv("opencl/statistical/GammaLn.", XLS, false))
+ if(!initTestEnv("opencl/statistical/GammaLn.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1255,7 +1255,7 @@ void ScOpenCLTest::testStatisticalFormulaGammaLn()
void ScOpenCLTest::testStatisticalFormulaGauss()
{
- if(!initTestEnv("opencl/statistical/Gauss.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Gauss.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1272,7 +1272,7 @@ void ScOpenCLTest::testStatisticalFormulaGauss()
void ScOpenCLTest::testStatisticalFormulaGeoMean()
{
- if(!initTestEnv("opencl/statistical/GeoMean.", XLS, false))
+ if(!initTestEnv("opencl/statistical/GeoMean.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1289,7 +1289,7 @@ void ScOpenCLTest::testStatisticalFormulaGeoMean()
void ScOpenCLTest::testStatisticalFormulaHarMean()
{
- if(!initTestEnv("opencl/statistical/HarMean.", XLS, false))
+ if(!initTestEnv("opencl/statistical/HarMean.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1306,7 +1306,7 @@ void ScOpenCLTest::testStatisticalFormulaHarMean()
void ScOpenCLTest::testFinacialSLNFormula()
{
- if(!initTestEnv("opencl/financial/SLN.", XLS, false))
+ if(!initTestEnv("opencl/financial/SLN.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1322,7 +1322,7 @@ void ScOpenCLTest::testFinacialSLNFormula()
void ScOpenCLTest::testFinacialMIRRFormula()
{
- if(!initTestEnv("opencl/financial/MIRR.", XLS, false))
+ if(!initTestEnv("opencl/financial/MIRR.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1338,7 +1338,7 @@ void ScOpenCLTest::testFinacialMIRRFormula()
void ScOpenCLTest::testFinancialCoupdaybsFormula()
{
- if(!initTestEnv("opencl/financial/Coupdaybs.", XLS, false))
+ if(!initTestEnv("opencl/financial/Coupdaybs.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1354,7 +1354,7 @@ void ScOpenCLTest::testFinancialCoupdaybsFormula()
void ScOpenCLTest::testFinacialDollardeFormula()
{
- if(!initTestEnv("opencl/financial/Dollarde.", XLS, false))
+ if(!initTestEnv("opencl/financial/Dollarde.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1370,7 +1370,7 @@ void ScOpenCLTest::testFinacialDollardeFormula()
void ScOpenCLTest::testFinancialCoupdaysFormula()
{
- if(!initTestEnv("opencl/financial/Coupdays.", XLS, false))
+ if(!initTestEnv("opencl/financial/Coupdays.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1387,7 +1387,7 @@ void ScOpenCLTest::testFinancialCoupdaysFormula()
void ScOpenCLTest::testFinancialCoupdaysncFormula()
{
- if(!initTestEnv("opencl/financial/Coupdaysnc.", XLS, false))
+ if(!initTestEnv("opencl/financial/Coupdaysnc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1402,7 +1402,7 @@ void ScOpenCLTest::testFinancialCoupdaysncFormula()
}
void ScOpenCLTest::testFinacialRateFormula()
{
- if(!initTestEnv("opencl/financial/RATE.", XLS, false))
+ if(!initTestEnv("opencl/financial/RATE.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1418,7 +1418,7 @@ void ScOpenCLTest::testFinacialRateFormula()
void ScOpenCLTest::testFinancialAccrintmFormula()
{
- if(!initTestEnv("opencl/financial/Accrintm.", XLS, false))
+ if(!initTestEnv("opencl/financial/Accrintm.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1434,7 +1434,7 @@ void ScOpenCLTest::testFinancialAccrintmFormula()
void ScOpenCLTest::testFinancialCoupnumFormula()
{
- if(!initTestEnv("opencl/financial/Coupnum.", XLS, false))
+ if(!initTestEnv("opencl/financial/Coupnum.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1450,7 +1450,7 @@ void ScOpenCLTest::testFinancialCoupnumFormula()
void ScOpenCLTest::testStatisticalFormulaNegbinomdist()
{
- if(!initTestEnv("opencl/statistical/Negbinomdist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Negbinomdist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1467,7 +1467,7 @@ void ScOpenCLTest::testStatisticalFormulaNegbinomdist()
void ScOpenCLTest::testMathFormulaSin()
{
- if(!initTestEnv("opencl/math/sin.", XLS, false))
+ if(!initTestEnv("opencl/math/sin.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1483,7 +1483,7 @@ void ScOpenCLTest::testMathFormulaSin()
void ScOpenCLTest::testMathFormulaSumSQ()
{
- if(!initTestEnv("opencl/math/sumsq.", XLS, false))
+ if(!initTestEnv("opencl/math/sumsq.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1499,7 +1499,7 @@ void ScOpenCLTest::testMathFormulaSumSQ()
void ScOpenCLTest::testMathFormulaTan()
{
- if(!initTestEnv("opencl/math/tan.", XLS, false))
+ if(!initTestEnv("opencl/math/tan.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1515,7 +1515,7 @@ void ScOpenCLTest::testMathFormulaTan()
void ScOpenCLTest::testMathFormulaTanH()
{
- if(!initTestEnv("opencl/math/tanh.", XLS, false))
+ if(!initTestEnv("opencl/math/tanh.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1531,7 +1531,7 @@ void ScOpenCLTest::testMathFormulaTanH()
void ScOpenCLTest::testMathFormulaSqrt()
{
- if(!initTestEnv("opencl/math/sqrt.", XLS, false))
+ if(!initTestEnv("opencl/math/sqrt.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1547,7 +1547,7 @@ void ScOpenCLTest::testMathFormulaSqrt()
void ScOpenCLTest::testFinacialPriceFormula()
{
- if(!initTestEnv("opencl/financial/Price.", XLS, false))
+ if(!initTestEnv("opencl/financial/Price.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1563,7 +1563,7 @@ void ScOpenCLTest::testFinacialPriceFormula()
void ScOpenCLTest::testFinacialDollarfrFormula()
{
- if(!initTestEnv("opencl/financial/Dollarfr.", XLS, false))
+ if(!initTestEnv("opencl/financial/Dollarfr.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1579,7 +1579,7 @@ void ScOpenCLTest::testFinacialDollarfrFormula()
void ScOpenCLTest::testFinacialPriceDiscFormula()
{
- if(!initTestEnv("opencl/financial/PriceDisc.", XLS, false))
+ if(!initTestEnv("opencl/financial/PriceDisc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1595,7 +1595,7 @@ void ScOpenCLTest::testFinacialPriceDiscFormula()
void ScOpenCLTest::testFinacialODDLPRICEFormula()
{
- if(!initTestEnv("opencl/financial/Oddlprice.", XLS, false))
+ if(!initTestEnv("opencl/financial/Oddlprice.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1611,7 +1611,7 @@ void ScOpenCLTest::testFinacialODDLPRICEFormula()
void ScOpenCLTest:: testFinacialOddlyieldFormula()
{
- if(!initTestEnv("opencl/financial/Oddlyield.", XLS, false))
+ if(!initTestEnv("opencl/financial/Oddlyield.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1627,7 +1627,7 @@ void ScOpenCLTest:: testFinacialOddlyieldFormula()
void ScOpenCLTest::testFinacialDISCFormula()
{
- if(!initTestEnv("opencl/financial/DISC.", XLS, false))
+ if(!initTestEnv("opencl/financial/DISC.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1643,7 +1643,7 @@ void ScOpenCLTest::testFinacialDISCFormula()
void ScOpenCLTest:: testFinacialPVFormula()
{
- if(!initTestEnv("opencl/financial/PV.", XLS, false))
+ if(!initTestEnv("opencl/financial/PV.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1659,7 +1659,7 @@ void ScOpenCLTest:: testFinacialPVFormula()
void ScOpenCLTest::testFinacialINTRATEFormula()
{
- if(!initTestEnv("opencl/financial/INTRATE.", XLS, false))
+ if(!initTestEnv("opencl/financial/INTRATE.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1675,7 +1675,7 @@ void ScOpenCLTest::testFinacialINTRATEFormula()
void ScOpenCLTest::testStatisticalFormulaStandard()
{
- if(!initTestEnv("opencl/statistical/Standard.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Standard.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1692,7 +1692,7 @@ void ScOpenCLTest::testStatisticalFormulaStandard()
void ScOpenCLTest::testStatisticalFormulaWeibull()
{
- if(!initTestEnv("opencl/statistical/Weibull.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Weibull.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1710,7 +1710,7 @@ void ScOpenCLTest::testStatisticalFormulaWeibull()
void ScOpenCLTest::testStatisticalFormulaVar()
{
- if(!initTestEnv("opencl/statistical/Var.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Var.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1727,7 +1727,7 @@ void ScOpenCLTest::testStatisticalFormulaVar()
void ScOpenCLTest::testStatisticalFormulaSkew()
{
- if(!initTestEnv("opencl/statistical/Skew.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Skew.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1744,7 +1744,7 @@ void ScOpenCLTest::testStatisticalFormulaSkew()
void ScOpenCLTest::testStatisticalFormulaSkewp()
{
- if(!initTestEnv("opencl/statistical/Skewp.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Skewp.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1761,7 +1761,7 @@ void ScOpenCLTest::testStatisticalFormulaSkewp()
void ScOpenCLTest::testStatisticalFormulaPearson()
{
- if(!initTestEnv("opencl/statistical/Pearson.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Pearson.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1778,7 +1778,7 @@ void ScOpenCLTest::testStatisticalFormulaPearson()
void ScOpenCLTest::testStatisticalFormulaRsq()
{
- if(!initTestEnv("opencl/statistical/Rsq.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Rsq.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1795,7 +1795,7 @@ void ScOpenCLTest::testStatisticalFormulaRsq()
void ScOpenCLTest::testMathFormulaTrunc()
{
- if(!initTestEnv("opencl/math/trunc.", XLS, false))
+ if(!initTestEnv("opencl/math/trunc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1811,7 +1811,7 @@ void ScOpenCLTest::testMathFormulaTrunc()
void ScOpenCLTest::testMathFormulaCosh()
{
- if(!initTestEnv("opencl/math/cosh.", XLS, false))
+ if(!initTestEnv("opencl/math/cosh.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1826,7 +1826,7 @@ void ScOpenCLTest::testMathFormulaCosh()
}
void ScOpenCLTest::testStatisticalFormulaCovar()
{
- if(!initTestEnv("opencl/statistical/Covar.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Covar.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1843,7 +1843,7 @@ void ScOpenCLTest::testStatisticalFormulaCovar()
void ScOpenCLTest::testStatisticalFormulaKurt()
{
- if(!initTestEnv("opencl/statistical/Kurt.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Kurt.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1860,7 +1860,7 @@ void ScOpenCLTest::testStatisticalFormulaKurt()
void ScOpenCLTest::testMathFormulaCot()
{
- if(!initTestEnv("opencl/math/cot.", ODS, false))
+ if(!initTestEnv("opencl/math/cot.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1876,7 +1876,7 @@ void ScOpenCLTest::testMathFormulaCot()
void ScOpenCLTest::testStatisticalFormulaDevSq()
{
- if(!initTestEnv("opencl/statistical/DevSq.", XLS, false))
+ if(!initTestEnv("opencl/statistical/DevSq.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1893,7 +1893,7 @@ void ScOpenCLTest::testStatisticalFormulaDevSq()
void ScOpenCLTest::testMathFormulaCsc()
{
- if(!initTestEnv("opencl/math/csc.", ODS, false))
+ if(!initTestEnv("opencl/math/csc.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1909,7 +1909,7 @@ void ScOpenCLTest::testMathFormulaCsc()
void ScOpenCLTest::testMathFormulaCoth()
{
- if(!initTestEnv("opencl/math/coth.", ODS, false))
+ if(!initTestEnv("opencl/math/coth.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1925,7 +1925,7 @@ void ScOpenCLTest::testMathFormulaCoth()
void ScOpenCLTest::testFinacialXNPVFormula()
{
- if(!initTestEnv("opencl/financial/XNPV.", XLS, false))
+ if(!initTestEnv("opencl/financial/XNPV.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1948,7 +1948,7 @@ void ScOpenCLTest::testFinacialXNPVFormula()
void ScOpenCLTest::testStatisticalFormulaIntercept()
{
- if(!initTestEnv("opencl/statistical/Intercept.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Intercept.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1964,7 +1964,7 @@ void ScOpenCLTest::testStatisticalFormulaIntercept()
void ScOpenCLTest::testFinancialAmordegrcFormula()
{
- if(!initTestEnv("opencl/financial/Amordegrc.", XLS, false))
+ if(!initTestEnv("opencl/financial/Amordegrc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1980,7 +1980,7 @@ void ScOpenCLTest::testFinancialAmordegrcFormula()
void ScOpenCLTest:: testFinancialISPMTFormula()
{
- if(!initTestEnv("opencl/financial/ISPMT.", XLS, false))
+ if(!initTestEnv("opencl/financial/ISPMT.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -1996,7 +1996,7 @@ void ScOpenCLTest:: testFinancialISPMTFormula()
void ScOpenCLTest::testStatisticalFormulaMedian()
{
- if(!initTestEnv("opencl/statistical/Median.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Median.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2013,7 +2013,7 @@ void ScOpenCLTest::testStatisticalFormulaMedian()
void ScOpenCLTest::testStatisticalFormulaNormdist()
{
- if(!initTestEnv("opencl/statistical/Normdist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Normdist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2030,7 +2030,7 @@ void ScOpenCLTest::testStatisticalFormulaNormdist()
void ScOpenCLTest::testStatisticalFormulaNormsdist()
{
- if(!initTestEnv("opencl/statistical/Normsdist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Normsdist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2047,7 +2047,7 @@ void ScOpenCLTest::testStatisticalFormulaNormsdist()
void ScOpenCLTest::testStatisticalFormulaPermut()
{
- if(!initTestEnv("opencl/statistical/Permut.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Permut.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2064,7 +2064,7 @@ void ScOpenCLTest::testStatisticalFormulaPermut()
void ScOpenCLTest::testStatisticalFormulaPermutation()
{
- if(!initTestEnv("opencl/statistical/Permutation.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Permutation.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2081,7 +2081,7 @@ void ScOpenCLTest::testStatisticalFormulaPermutation()
void ScOpenCLTest::testStatisticalFormulaPhi()
{
- if(!initTestEnv("opencl/statistical/Phi.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Phi.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2098,7 +2098,7 @@ void ScOpenCLTest::testStatisticalFormulaPhi()
void ScOpenCLTest::testMathFormulaCscH()
{
- if(!initTestEnv("opencl/math/csch.", ODS, false))
+ if(!initTestEnv("opencl/math/csch.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2114,7 +2114,7 @@ void ScOpenCLTest::testMathFormulaCscH()
void ScOpenCLTest::testStatisticalFormulaLogInv()
{
- if(!initTestEnv("opencl/statistical/LogInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/LogInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2131,7 +2131,7 @@ void ScOpenCLTest::testStatisticalFormulaLogInv()
void ScOpenCLTest::testFinacialNPERFormula()
{
- if(!initTestEnv("opencl/financial/NPER.", XLS, false))
+ if(!initTestEnv("opencl/financial/NPER.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2147,7 +2147,7 @@ void ScOpenCLTest::testFinacialNPERFormula()
void ScOpenCLTest::testStatisticalFormulaForecast()
{
- if(!initTestEnv("opencl/statistical/Forecast.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Forecast.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2164,7 +2164,7 @@ void ScOpenCLTest::testStatisticalFormulaForecast()
void ScOpenCLTest::testFinancialAmorlincFormula()
{
- if(!initTestEnv("opencl/financial/Amorlinc.", XLS, false))
+ if(!initTestEnv("opencl/financial/Amorlinc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2180,7 +2180,7 @@ void ScOpenCLTest::testFinancialAmorlincFormula()
void ScOpenCLTest::testFinancialDDBFormula()
{
- if(!initTestEnv("opencl/financial/ddb.", XLS, false))
+ if(!initTestEnv("opencl/financial/ddb.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2195,7 +2195,7 @@ void ScOpenCLTest::testFinancialDDBFormula()
}
void ScOpenCLTest::testFinacialPriceMatFormula()
{
- if(!initTestEnv("opencl/financial/PriceMat.", XLS, false))
+ if(!initTestEnv("opencl/financial/PriceMat.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2210,7 +2210,7 @@ void ScOpenCLTest::testFinacialPriceMatFormula()
}
void ScOpenCLTest::testFinacialFormulaReceived()
{
- if(!initTestEnv("opencl/financial/Received.", XLS, false))
+ if(!initTestEnv("opencl/financial/Received.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2226,7 +2226,7 @@ void ScOpenCLTest::testFinacialFormulaReceived()
}
void ScOpenCLTest::testFinancialFormulaCumipmt()
{
- if(!initTestEnv("opencl/financial/Cumipmt.", XLS, false))
+ if(!initTestEnv("opencl/financial/Cumipmt.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2242,7 +2242,7 @@ void ScOpenCLTest::testFinancialFormulaCumipmt()
}
void ScOpenCLTest::testFinancialFormulaCumprinc()
{
- if(!initTestEnv("opencl/financial/Cumprinc.", XLS, false))
+ if(!initTestEnv("opencl/financial/Cumprinc.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2258,7 +2258,7 @@ void ScOpenCLTest::testFinancialFormulaCumprinc()
}
void ScOpenCLTest::testFinacialRRIFormula()
{
- if(!initTestEnv("opencl/financial/RRI.", XLS, false))
+ if(!initTestEnv("opencl/financial/RRI.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2273,7 +2273,7 @@ void ScOpenCLTest::testFinacialRRIFormula()
}
void ScOpenCLTest::testFinacialEFFECT_ADDFormula()
{
- if(!initTestEnv("opencl/financial/EFFECT_ADD.", XLS, false))
+ if(!initTestEnv("opencl/financial/EFFECT_ADD.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2288,7 +2288,7 @@ void ScOpenCLTest::testFinacialEFFECT_ADDFormula()
}
void ScOpenCLTest::testFinacialNominalFormula()
{
- if(!initTestEnv("opencl/financial/Nominal.", XLS, false))
+ if(!initTestEnv("opencl/financial/Nominal.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2305,7 +2305,7 @@ void ScOpenCLTest::testFinacialNominalFormula()
}
void ScOpenCLTest::testFinacialTBILLEQFormula()
{
- if(!initTestEnv("opencl/financial/TBILLEQ.", XLS, false))
+ if(!initTestEnv("opencl/financial/TBILLEQ.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2320,7 +2320,7 @@ void ScOpenCLTest::testFinacialTBILLEQFormula()
}
void ScOpenCLTest::testFinacialTBILLPRICEFormula()
{
- if(!initTestEnv("opencl/financial/TBILLPRICE.", XLS, false))
+ if(!initTestEnv("opencl/financial/TBILLPRICE.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2335,7 +2335,7 @@ void ScOpenCLTest::testFinacialTBILLPRICEFormula()
}
void ScOpenCLTest::testFinacialTBILLYIELDFormula()
{
- if(!initTestEnv("opencl/financial/TBILLYIELD.", XLS, false))
+ if(!initTestEnv("opencl/financial/TBILLYIELD.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2350,7 +2350,7 @@ void ScOpenCLTest::testFinacialTBILLYIELDFormula()
}
void ScOpenCLTest::testFinacialYIELDFormula()
{
- if(!initTestEnv("opencl/financial/YIELD.", XLS, false))
+ if(!initTestEnv("opencl/financial/YIELD.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2366,7 +2366,7 @@ void ScOpenCLTest::testFinacialYIELDFormula()
void ScOpenCLTest::testFinacialYIELDDISCFormula()
{
- if(!initTestEnv("opencl/financial/YIELDDISC.", XLS, false))
+ if(!initTestEnv("opencl/financial/YIELDDISC.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2382,7 +2382,7 @@ void ScOpenCLTest::testFinacialYIELDDISCFormula()
void ScOpenCLTest::testFinacialYIELDMATFormula()
{
- if(!initTestEnv("opencl/financial/YIELDMAT.", XLS, false))
+ if(!initTestEnv("opencl/financial/YIELDMAT.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2397,7 +2397,7 @@ void ScOpenCLTest::testFinacialYIELDMATFormula()
}
void ScOpenCLTest:: testFinacialPMTFormula()
{
- if(!initTestEnv("opencl/financial/PMT.", XLS, false))
+ if(!initTestEnv("opencl/financial/PMT.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2413,7 +2413,7 @@ void ScOpenCLTest:: testFinacialPMTFormula()
void ScOpenCLTest:: testFinancialDurationFormula()
{
- if(!initTestEnv("opencl/financial/Duration.", ODS, false))
+ if(!initTestEnv("opencl/financial/Duration.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2429,7 +2429,7 @@ void ScOpenCLTest:: testFinancialDurationFormula()
void ScOpenCLTest::testStatisticalFormulaLogNormDist()
{
- if(!initTestEnv("opencl/statistical/LogNormDist.", ODS, false))
+ if(!initTestEnv("opencl/statistical/LogNormDist.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2446,7 +2446,7 @@ void ScOpenCLTest::testStatisticalFormulaLogNormDist()
void ScOpenCLTest::testMathFormulaArcCos()
{
- if(!initTestEnv("opencl/math/ArcCos.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcCos.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2463,7 +2463,7 @@ void ScOpenCLTest::testMathFormulaArcCos()
void ScOpenCLTest::testMathFormulaPower()
{
- if(!initTestEnv("opencl/math/power.", ODS, false))
+ if(!initTestEnv("opencl/math/power.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2479,7 +2479,7 @@ void ScOpenCLTest::testMathFormulaPower()
void ScOpenCLTest:: testFinacialPPMTFormula()
{
- if(!initTestEnv("opencl/financial/PPMT.", XLS, false))
+ if(!initTestEnv("opencl/financial/PPMT.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2495,7 +2495,7 @@ void ScOpenCLTest:: testFinacialPPMTFormula()
void ScOpenCLTest:: testFinacialNPVFormula()
{
- if(!initTestEnv("opencl/financial/NPV.", XLS, false))
+ if(!initTestEnv("opencl/financial/NPV.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2511,7 +2511,7 @@ void ScOpenCLTest:: testFinacialNPVFormula()
void ScOpenCLTest:: testFinancialDuration_ADDFormula()
{
- if(!initTestEnv("opencl/financial/Duration_ADD.", XLS, false))
+ if(!initTestEnv("opencl/financial/Duration_ADD.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2527,7 +2527,7 @@ void ScOpenCLTest:: testFinancialDuration_ADDFormula()
void ScOpenCLTest::testStatisticalFormulaNorminv()
{
- if(!initTestEnv("opencl/statistical/Norminv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Norminv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2544,7 +2544,7 @@ void ScOpenCLTest::testStatisticalFormulaNorminv()
void ScOpenCLTest::testStatisticalFormulaNormsinv()
{
- if(!initTestEnv("opencl/statistical/Normsinv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Normsinv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2561,7 +2561,7 @@ void ScOpenCLTest::testStatisticalFormulaNormsinv()
void ScOpenCLTest::testMathFormulaArcCosHyp()
{
- if(!initTestEnv("opencl/math/ArcCosHyp.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcCosHyp.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2578,7 +2578,7 @@ void ScOpenCLTest::testMathFormulaArcCosHyp()
void ScOpenCLTest:: testFinancialMDurationFormula()
{
- if(!initTestEnv("opencl/financial/MDuration.", XLS, false))
+ if(!initTestEnv("opencl/financial/MDuration.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2594,7 +2594,7 @@ void ScOpenCLTest:: testFinancialMDurationFormula()
void ScOpenCLTest::testMathFormulaArcCot()
{
- if(!initTestEnv("opencl/math/ArcCot.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcCot.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2611,7 +2611,7 @@ void ScOpenCLTest::testMathFormulaArcCot()
void ScOpenCLTest:: testFinancialFVFormula()
{
- if(!initTestEnv("opencl/financial/FV.", XLS, false))
+ if(!initTestEnv("opencl/financial/FV.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2627,7 +2627,7 @@ void ScOpenCLTest:: testFinancialFVFormula()
void ScOpenCLTest::testFinancialDBFormula()
{
- if(!initTestEnv("opencl/financial/db.", XLS, false))
+ if(!initTestEnv("opencl/financial/db.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2643,7 +2643,7 @@ void ScOpenCLTest::testFinancialDBFormula()
void ScOpenCLTest::testFinancialCouppcdFormula()
{
- if(!initTestEnv("opencl/financial/Couppcd.", XLS, false))
+ if(!initTestEnv("opencl/financial/Couppcd.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2659,7 +2659,7 @@ void ScOpenCLTest::testFinancialCouppcdFormula()
void ScOpenCLTest::testMathSumIfsFormula()
{
- if(!initTestEnv("opencl/math/sumifs.", XLS, false))
+ if(!initTestEnv("opencl/math/sumifs.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2693,7 +2693,7 @@ void ScOpenCLTest::testMathSumIfsFormula()
void ScOpenCLTest::testMathFormulaArcCotHyp()
{
- if(!initTestEnv("opencl/math/ArcCotHyp.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcCotHyp.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2710,7 +2710,7 @@ void ScOpenCLTest::testMathFormulaArcCotHyp()
void ScOpenCLTest::testMathFormulaArcSin()
{
- if(!initTestEnv("opencl/math/ArcSin.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcSin.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2727,7 +2727,7 @@ void ScOpenCLTest::testMathFormulaArcSin()
void ScOpenCLTest:: testFinancialVDBFormula()
{
- if(!initTestEnv("opencl/financial/VDB.", XLS, false))
+ if(!initTestEnv("opencl/financial/VDB.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2755,7 +2755,7 @@ void ScOpenCLTest:: testFinancialVDBFormula()
void ScOpenCLTest:: testFinancialIPMTFormula()
{
- if(!initTestEnv("opencl/financial/IPMT.", XLS, false))
+ if(!initTestEnv("opencl/financial/IPMT.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2771,7 +2771,7 @@ void ScOpenCLTest:: testFinancialIPMTFormula()
void ScOpenCLTest:: testFinancialXirrFormula()
{
- if(!initTestEnv("opencl/financial/XIRR.", ODS, false))
+ if(!initTestEnv("opencl/financial/XIRR.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
rDoc.CalcAll();
@@ -2794,7 +2794,7 @@ void ScOpenCLTest:: testFinancialXirrFormula()
void ScOpenCLTest::testStatisticalFormulaChiSqDist()
{
- if(!initTestEnv("opencl/statistical/CHISQDIST.", ODS, false))
+ if(!initTestEnv("opencl/statistical/CHISQDIST.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2817,7 +2817,7 @@ void ScOpenCLTest::testStatisticalFormulaChiSqDist()
void ScOpenCLTest::testStatisticalFormulaConfidence()
{
- if(!initTestEnv("opencl/statistical/Confidence.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Confidence.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2834,7 +2834,7 @@ void ScOpenCLTest::testStatisticalFormulaConfidence()
void ScOpenCLTest::testStatisticalFormulaFDist()
{
- if(!initTestEnv("opencl/statistical/Fdist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Fdist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2851,7 +2851,7 @@ void ScOpenCLTest::testStatisticalFormulaFDist()
void ScOpenCLTest::testFinancialCoupncdFormula()
{
- if(!initTestEnv("opencl/financial/Coupncd.", XLS, false))
+ if(!initTestEnv("opencl/financial/Coupncd.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2867,7 +2867,7 @@ void ScOpenCLTest::testFinancialCoupncdFormula()
void ScOpenCLTest::testFinancialAccrintFormula()
{
- if(!initTestEnv("opencl/financial/Accrint.", XLS, false))
+ if(!initTestEnv("opencl/financial/Accrint.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2883,7 +2883,7 @@ void ScOpenCLTest::testFinancialAccrintFormula()
void ScOpenCLTest::testStatisticalFormulaCritBinom()
{
- if(!initTestEnv("opencl/statistical/CritBinom.", XLS, false))
+ if(!initTestEnv("opencl/statistical/CritBinom.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2900,7 +2900,7 @@ void ScOpenCLTest::testStatisticalFormulaCritBinom()
void ScOpenCLTest::testMathFormulaArcSinHyp()
{
- if(!initTestEnv("opencl/math/ArcSinHyp.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcSinHyp.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2917,7 +2917,7 @@ void ScOpenCLTest::testMathFormulaArcSinHyp()
void ScOpenCLTest::testMathFormulaArcTan()
{
- if(!initTestEnv("opencl/math/ArcTan.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcTan.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2934,7 +2934,7 @@ void ScOpenCLTest::testMathFormulaArcTan()
void ScOpenCLTest::testMathFormulaArcTanHyp()
{
- if(!initTestEnv("opencl/math/ArcTanHyp.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcTanHyp.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2951,7 +2951,7 @@ void ScOpenCLTest::testMathFormulaArcTanHyp()
void ScOpenCLTest:: testFinacialNPER1Formula()
{
- if(!initTestEnv("opencl/financial/NPER1.", XLS, false))
+ if(!initTestEnv("opencl/financial/NPER1.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2967,7 +2967,7 @@ void ScOpenCLTest:: testFinacialNPER1Formula()
void ScOpenCLTest::testMathFormulaArcTan2()
{
- if(!initTestEnv("opencl/math/ArcTan2.", ODS, false))
+ if(!initTestEnv("opencl/math/ArcTan2.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -2984,7 +2984,7 @@ void ScOpenCLTest::testMathFormulaArcTan2()
void ScOpenCLTest::testStatisticalFormulaChiSqInv()
{
- if(!initTestEnv("opencl/statistical/CHISQINV.", ODS, false))
+ if(!initTestEnv("opencl/statistical/CHISQINV.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3001,7 +3001,7 @@ void ScOpenCLTest::testStatisticalFormulaChiSqInv()
void ScOpenCLTest::testMathFormulaBitAnd()
{
- if(!initTestEnv("opencl/math/BitAnd.", ODS, false))
+ if(!initTestEnv("opencl/math/BitAnd.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3018,7 +3018,7 @@ void ScOpenCLTest::testMathFormulaBitAnd()
void ScOpenCLTest::testStatisticalFormulaPoisson()
{
- if(!initTestEnv("opencl/statistical/Poisson.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Poisson.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3035,7 +3035,7 @@ void ScOpenCLTest::testStatisticalFormulaPoisson()
void ScOpenCLTest::testStatisticalFormulaExpondist()
{
- if(!initTestEnv("opencl/statistical/Expondist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Expondist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3052,7 +3052,7 @@ void ScOpenCLTest::testStatisticalFormulaExpondist()
void ScOpenCLTest::testMathFormulaBitOr()
{
- if(!initTestEnv("opencl/math/BitOr.", ODS, false))
+ if(!initTestEnv("opencl/math/BitOr.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3069,7 +3069,7 @@ void ScOpenCLTest::testMathFormulaBitOr()
void ScOpenCLTest::testMathFormulaOdd()
{
- if(!initTestEnv("opencl/math/odd.", XLS, false))
+ if(!initTestEnv("opencl/math/odd.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3085,7 +3085,7 @@ void ScOpenCLTest::testMathFormulaOdd()
void ScOpenCLTest::testMathFormulaLN()
{
- if(!initTestEnv("opencl/math/LN.", XLS, false))
+ if(!initTestEnv("opencl/math/LN.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3102,7 +3102,7 @@ void ScOpenCLTest::testMathFormulaLN()
void ScOpenCLTest::testMathFormulaMod()
{
- if(!initTestEnv("opencl/math/mod.", XLS, false))
+ if(!initTestEnv("opencl/math/mod.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3121,7 +3121,7 @@ void ScOpenCLTest::testMathFormulaMod()
void ScOpenCLTest::testMathFormulaRound()
{
- if(!initTestEnv("opencl/math/ROUND.", XLS, false))
+ if(!initTestEnv("opencl/math/ROUND.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3144,7 +3144,7 @@ void ScOpenCLTest::testMathFormulaRound()
void ScOpenCLTest::testStatisticalFormulaGammaDist()
{
- if(!initTestEnv("opencl/statistical/GammaDist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/GammaDist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3161,7 +3161,7 @@ void ScOpenCLTest::testStatisticalFormulaGammaDist()
void ScOpenCLTest::testStatisticalFormulaGammaInv()
{
- if(!initTestEnv("opencl/statistical/GammaInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/GammaInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3181,7 +3181,7 @@ void ScOpenCLTest::testStatisticalFormulaGammaInv()
void ScOpenCLTest::testStatisticalFormulaFInv()
{
- if(!initTestEnv("opencl/statistical/FInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/FInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3201,7 +3201,7 @@ void ScOpenCLTest::testStatisticalFormulaFInv()
void ScOpenCLTest::testStatisticalFormulaFTest()
{
- if(!initTestEnv("opencl/statistical/FTest.", XLS, false))
+ if(!initTestEnv("opencl/statistical/FTest.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3218,7 +3218,7 @@ void ScOpenCLTest::testStatisticalFormulaFTest()
void ScOpenCLTest::testStatisticalFormulaB()
{
- if(!initTestEnv("opencl/statistical/B.", XLS, false))
+ if(!initTestEnv("opencl/statistical/B.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3238,7 +3238,7 @@ void ScOpenCLTest::testStatisticalFormulaB()
void ScOpenCLTest::testStatisticalFormulaBetaDist()
{
- if(!initTestEnv("opencl/statistical/BetaDist.", ODS, false))
+ if(!initTestEnv("opencl/statistical/BetaDist.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3258,7 +3258,7 @@ void ScOpenCLTest::testStatisticalFormulaBetaDist()
void ScOpenCLTest::testMathFormulaEven()
{
- if(!initTestEnv("opencl/math/even.", XLS, false))
+ if(!initTestEnv("opencl/math/even.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3274,7 +3274,7 @@ void ScOpenCLTest::testMathFormulaEven()
void ScOpenCLTest::testMathFormulaExp()
{
- if(!initTestEnv("opencl/math/exp.", ODS, false))
+ if(!initTestEnv("opencl/math/exp.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3290,7 +3290,7 @@ void ScOpenCLTest::testMathFormulaExp()
void ScOpenCLTest::testStatisticalFormulaChiDist()
{
- if(!initTestEnv("opencl/statistical/ChiDist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/ChiDist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3307,7 +3307,7 @@ void ScOpenCLTest::testStatisticalFormulaChiDist()
void ScOpenCLTest::testMathFormulaBitLshift()
{
- if(!initTestEnv("opencl/math/BitLshift.", ODS, false))
+ if(!initTestEnv("opencl/math/BitLshift.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3324,7 +3324,7 @@ void ScOpenCLTest::testMathFormulaBitLshift()
void ScOpenCLTest::testMathFormulaBitRshift()
{
- if(!initTestEnv("opencl/math/BitRshift.", ODS, false))
+ if(!initTestEnv("opencl/math/BitRshift.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3341,7 +3341,7 @@ void ScOpenCLTest::testMathFormulaBitRshift()
void ScOpenCLTest::testMathFormulaFloor()
{
- if(!initTestEnv("opencl/math/floor.", ODS, false))
+ if(!initTestEnv("opencl/math/floor.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3357,7 +3357,7 @@ void ScOpenCLTest::testMathFormulaFloor()
void ScOpenCLTest::testMathFormulaLog()
{
- if(!initTestEnv("opencl/math/log.", XLS, false))
+ if(!initTestEnv("opencl/math/log.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3373,7 +3373,7 @@ void ScOpenCLTest::testMathFormulaLog()
void ScOpenCLTest::testSpreadSheetFormulaVLookup()
{
- if(!initTestEnv("opencl/spreadsheet/VLookup.", XLS, false))
+ if(!initTestEnv("opencl/spreadsheet/VLookup.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3396,7 +3396,7 @@ void ScOpenCLTest::testSpreadSheetFormulaVLookup()
void ScOpenCLTest::testStatisticalFormulaChiInv()
{
- if(!initTestEnv("opencl/statistical/ChiInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/ChiInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3413,7 +3413,7 @@ void ScOpenCLTest::testStatisticalFormulaChiInv()
void ScOpenCLTest::testMathFormulaConvert()
{
- if(!initTestEnv("opencl/math/convert.", XLS, false))
+ if(!initTestEnv("opencl/math/convert.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3429,7 +3429,7 @@ void ScOpenCLTest::testMathFormulaConvert()
void ScOpenCLTest::testMathCountIfsFormula()
{
- if(!initTestEnv("opencl/math/countifs.", XLS, false))
+ if(!initTestEnv("opencl/math/countifs.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3445,7 +3445,7 @@ void ScOpenCLTest::testMathCountIfsFormula()
void ScOpenCLTest::testMathFormulaBitXor()
{
- if(!initTestEnv("opencl/math/BitXor.", ODS, false))
+ if(!initTestEnv("opencl/math/BitXor.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3462,7 +3462,7 @@ void ScOpenCLTest::testMathFormulaBitXor()
void ScOpenCLTest::testMathAverageIfsFormula()
{
- if(!initTestEnv("opencl/math/averageifs.", XLS, false))
+ if(!initTestEnv("opencl/math/averageifs.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3479,7 +3479,7 @@ void ScOpenCLTest::testMathAverageIfsFormula()
void ScOpenCLTest::testMathFormulaLog10()
{
- if(!initTestEnv("opencl/math/log10.", ODS, false))
+ if(!initTestEnv("opencl/math/log10.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3495,7 +3495,7 @@ void ScOpenCLTest::testMathFormulaLog10()
void ScOpenCLTest::testMathFormulaCombina()
{
- if(!initTestEnv("opencl/math/combina.", XLS, false))
+ if(!initTestEnv("opencl/math/combina.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3511,7 +3511,7 @@ void ScOpenCLTest::testMathFormulaCombina()
void ScOpenCLTest::testMathFormulaCeil()
{
- if(!initTestEnv("opencl/math/Ceil.", ODS, false))
+ if(!initTestEnv("opencl/math/Ceil.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3528,7 +3528,7 @@ void ScOpenCLTest::testMathFormulaCeil()
void ScOpenCLTest::testMathFormulaSqrtPi()
{
- if(!initTestEnv("opencl/math/sqrtpi.", XLS, false))
+ if(!initTestEnv("opencl/math/sqrtpi.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3544,7 +3544,7 @@ void ScOpenCLTest::testMathFormulaSqrtPi()
void ScOpenCLTest::testStatisticalFormulaVarP()
{
- if(!initTestEnv("opencl/statistical/VarP.", XLS, false))
+ if(!initTestEnv("opencl/statistical/VarP.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3561,7 +3561,7 @@ void ScOpenCLTest::testStatisticalFormulaVarP()
void ScOpenCLTest::testStatisticalFormulaStDev()
{
- if(!initTestEnv("opencl/statistical/StDev.", XLS, false))
+ if(!initTestEnv("opencl/statistical/StDev.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3578,7 +3578,7 @@ void ScOpenCLTest::testStatisticalFormulaStDev()
void ScOpenCLTest::testStatisticalFormulaStDevP()
{
- if(!initTestEnv("opencl/statistical/StDevP.", XLS, false))
+ if(!initTestEnv("opencl/statistical/StDevP.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3595,7 +3595,7 @@ void ScOpenCLTest::testStatisticalFormulaStDevP()
void ScOpenCLTest::testStatisticalFormulaSlope()
{
- if(!initTestEnv("opencl/statistical/Slope.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Slope.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3612,7 +3612,7 @@ void ScOpenCLTest::testStatisticalFormulaSlope()
void ScOpenCLTest::testStatisticalFormulaSTEYX()
{
- if(!initTestEnv("opencl/statistical/STEYX.", XLS, false))
+ if(!initTestEnv("opencl/statistical/STEYX.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3629,7 +3629,7 @@ void ScOpenCLTest::testStatisticalFormulaSTEYX()
void ScOpenCLTest::testStatisticalFormulaZTest()
{
- if(!initTestEnv("opencl/statistical/ZTest.", XLS, false))
+ if(!initTestEnv("opencl/statistical/ZTest.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3646,7 +3646,7 @@ void ScOpenCLTest::testStatisticalFormulaZTest()
void ScOpenCLTest::testStatisticalFormulaTTest()
{
- if(!initTestEnv("opencl/statistical/TTest.", XLS, false))
+ if(!initTestEnv("opencl/statistical/TTest.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3663,7 +3663,7 @@ void ScOpenCLTest::testStatisticalFormulaTTest()
void ScOpenCLTest::testStatisticalFormulaTDist()
{
- if(!initTestEnv("opencl/statistical/TDist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/TDist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3680,7 +3680,7 @@ void ScOpenCLTest::testStatisticalFormulaTDist()
void ScOpenCLTest::testStatisticalFormulaTInv()
{
- if(!initTestEnv("opencl/statistical/TInv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/TInv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3697,7 +3697,7 @@ void ScOpenCLTest::testStatisticalFormulaTInv()
void ScOpenCLTest::testStatisticalFormulaBinomDist()
{
- if(!initTestEnv("opencl/statistical/BinomDist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/BinomDist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3714,7 +3714,7 @@ void ScOpenCLTest::testStatisticalFormulaBinomDist()
void ScOpenCLTest::testMathFormulaProduct()
{
- if(!initTestEnv("opencl/math/product.", XLS, false))
+ if(!initTestEnv("opencl/math/product.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3731,7 +3731,7 @@ void ScOpenCLTest::testMathFormulaProduct()
#if 0 //Disabled temporarily
void ScOpenCLTest::testMathFormulaKombin()
{
- if(!initTestEnv("opencl/math/Kombin.", ODS, false))
+ if(!initTestEnv("opencl/math/Kombin.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3749,7 +3749,7 @@ void ScOpenCLTest::testMathFormulaKombin()
void ScOpenCLTest:: testArrayFormulaSumX2MY2()
{
- if(!initTestEnv("opencl/array/SUMX2MY2.", XLS, false))
+ if(!initTestEnv("opencl/array/SUMX2MY2.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3771,7 +3771,7 @@ void ScOpenCLTest:: testArrayFormulaSumX2MY2()
void ScOpenCLTest::testStatisticalFormulaHypGeomDist()
{
- if(!initTestEnv("opencl/statistical/HypGeomDist.", XLS, false))
+ if(!initTestEnv("opencl/statistical/HypGeomDist.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3788,7 +3788,7 @@ void ScOpenCLTest::testStatisticalFormulaHypGeomDist()
void ScOpenCLTest:: testArrayFormulaSumX2PY2()
{
- if(!initTestEnv("opencl/array/SUMX2PY2.", XLS, false))
+ if(!initTestEnv("opencl/array/SUMX2PY2.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3810,7 +3810,7 @@ void ScOpenCLTest:: testArrayFormulaSumX2PY2()
void ScOpenCLTest::testStatisticalFormulaBetainv()
{
- if(!initTestEnv("opencl/statistical/Betainv.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Betainv.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3827,7 +3827,7 @@ void ScOpenCLTest::testStatisticalFormulaBetainv()
void ScOpenCLTest::testStatisticalFormulaMina()
{
- if(!initTestEnv("opencl/statistical/Mina.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Mina.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3843,7 +3843,7 @@ void ScOpenCLTest::testStatisticalFormulaMina()
void ScOpenCLTest:: testArrayFormulaSumXMY2()
{
- if(!initTestEnv("opencl/array/SUMXMY2.", XLS, false))
+ if(!initTestEnv("opencl/array/SUMXMY2.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3865,7 +3865,7 @@ void ScOpenCLTest:: testArrayFormulaSumXMY2()
void ScOpenCLTest::testStatisticalFormulaCountA()
{
- if(!initTestEnv("opencl/statistical/counta.", XLS, false))
+ if(!initTestEnv("opencl/statistical/counta.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3881,7 +3881,7 @@ void ScOpenCLTest::testStatisticalFormulaCountA()
void ScOpenCLTest::testStatisticalFormulaMaxa()
{
- if(!initTestEnv("opencl/statistical/Maxa.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Maxa.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3897,7 +3897,7 @@ void ScOpenCLTest::testStatisticalFormulaMaxa()
void ScOpenCLTest::testMathFormulaSumProduct()
{
- if(!initTestEnv("opencl/math/sumproduct_mixSliding.", XLS, false))
+ if(!initTestEnv("opencl/math/sumproduct_mixSliding.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3927,7 +3927,7 @@ void ScOpenCLTest::testMathFormulaSumProduct()
void ScOpenCLTest::testMathFormulaAverageIf()
{
- if(!initTestEnv("opencl/math/averageif.", XLS, false))
+ if(!initTestEnv("opencl/math/averageif.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3943,7 +3943,7 @@ void ScOpenCLTest::testMathFormulaAverageIf()
void ScOpenCLTest::testStatisticalFormulaAverageA()
{
- if(!initTestEnv("opencl/statistical/AverageA.", XLS, false))
+ if(!initTestEnv("opencl/statistical/AverageA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3959,7 +3959,7 @@ void ScOpenCLTest::testStatisticalFormulaAverageA()
void ScOpenCLTest:: testLogicalFormulaAnd()
{
- if(!initTestEnv("opencl/logical/and.", XLS, false))
+ if(!initTestEnv("opencl/logical/and.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3981,7 +3981,7 @@ void ScOpenCLTest:: testLogicalFormulaAnd()
void ScOpenCLTest::testStatisticalFormulaVarA()
{
- if(!initTestEnv("opencl/statistical/VarA.", XLS, false))
+ if(!initTestEnv("opencl/statistical/VarA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -3998,7 +3998,7 @@ void ScOpenCLTest::testStatisticalFormulaVarA()
void ScOpenCLTest::testStatisticalFormulaVarPA()
{
- if(!initTestEnv("opencl/statistical/VarPA.", XLS, false))
+ if(!initTestEnv("opencl/statistical/VarPA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4014,7 +4014,7 @@ void ScOpenCLTest::testStatisticalFormulaVarPA()
void ScOpenCLTest::testStatisticalFormulaStDevA()
{
- if(!initTestEnv("opencl/statistical/StDevA.", XLS, false))
+ if(!initTestEnv("opencl/statistical/StDevA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4031,7 +4031,7 @@ void ScOpenCLTest::testStatisticalFormulaStDevA()
void ScOpenCLTest::testStatisticalFormulaStDevPA()
{
- if(!initTestEnv("opencl/statistical/StDevPA.", XLS, false))
+ if(!initTestEnv("opencl/statistical/StDevPA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4048,7 +4048,7 @@ void ScOpenCLTest::testStatisticalFormulaStDevPA()
void ScOpenCLTest:: testFinancialMDurationFormula1()
{
- if(!initTestEnv("opencl/financial/MDuration1.", XLS, false))
+ if(!initTestEnv("opencl/financial/MDuration1.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4064,7 +4064,7 @@ void ScOpenCLTest:: testFinancialMDurationFormula1()
void ScOpenCLTest::testMathFormulaSumProduct2()
{
- if(!initTestEnv("opencl/math/sumproductTest.", XLS, false))
+ if(!initTestEnv("opencl/math/sumproductTest.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4081,7 +4081,7 @@ void ScOpenCLTest::testMathFormulaSumProduct2()
void ScOpenCLTest:: testStatisticalParallelCountBug()
{
- if(!initTestEnv("opencl/statistical/parallel_count_bug_243.", ODS, false))
+ if(!initTestEnv("opencl/statistical/parallel_count_bug_243.", FORMAT_ODS,
false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4097,7 +4097,7 @@ void ScOpenCLTest:: testStatisticalParallelCountBug()
void ScOpenCLTest:: testLogicalFormulaOr()
{
- if(!initTestEnv("opencl/logical/or.", XLS, false))
+ if(!initTestEnv("opencl/logical/or.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4113,7 +4113,7 @@ void ScOpenCLTest:: testLogicalFormulaOr()
void ScOpenCLTest:: testLogicalFormulaNot()
{
- if(!initTestEnv("opencl/logical/not.", XLS, false))
+ if(!initTestEnv("opencl/logical/not.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4129,7 +4129,7 @@ void ScOpenCLTest:: testLogicalFormulaNot()
void ScOpenCLTest:: testLogicalFormulaXor()
{
- if(!initTestEnv("opencl/logical/xor.", XLS, false))
+ if(!initTestEnv("opencl/logical/xor.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4145,7 +4145,7 @@ void ScOpenCLTest:: testLogicalFormulaXor()
void ScOpenCLTest::testDatabaseFormulaDcount()
{
- if(!initTestEnv("opencl/database/dcount.", XLS, false))
+ if(!initTestEnv("opencl/database/dcount.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4162,7 +4162,7 @@ void ScOpenCLTest::testDatabaseFormulaDcount()
void ScOpenCLTest::testDatabaseFormulaDcountA()
{
- if(!initTestEnv("opencl/database/dcountA.", XLS, false))
+ if(!initTestEnv("opencl/database/dcountA.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4179,7 +4179,7 @@ void ScOpenCLTest::testDatabaseFormulaDcountA()
void ScOpenCLTest::testDatabaseFormulaDmax()
{
- if(!initTestEnv("opencl/database/dmax.", XLS, false))
+ if(!initTestEnv("opencl/database/dmax.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4196,7 +4196,7 @@ void ScOpenCLTest::testDatabaseFormulaDmax()
void ScOpenCLTest::testDatabaseFormulaDmin()
{
- if(!initTestEnv("opencl/database/dmin.", XLS, false))
+ if(!initTestEnv("opencl/database/dmin.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4213,7 +4213,7 @@ void ScOpenCLTest::testDatabaseFormulaDmin()
void ScOpenCLTest::testDatabaseFormulaDproduct()
{
- if(!initTestEnv("opencl/database/dproduct.", XLS, false))
+ if(!initTestEnv("opencl/database/dproduct.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4230,7 +4230,7 @@ void ScOpenCLTest::testDatabaseFormulaDproduct()
void ScOpenCLTest::testDatabaseFormulaDaverage()
{
- if(!initTestEnv("opencl/database/daverage.", XLS, false))
+ if(!initTestEnv("opencl/database/daverage.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4248,7 +4248,7 @@ void ScOpenCLTest::testDatabaseFormulaDaverage()
void ScOpenCLTest::testDatabaseFormulaDstdev()
{
- if(!initTestEnv("opencl/database/dstdev.", XLS, false))
+ if(!initTestEnv("opencl/database/dstdev.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4266,7 +4266,7 @@ void ScOpenCLTest::testDatabaseFormulaDstdev()
void ScOpenCLTest::testDatabaseFormulaDstdevp()
{
- if(!initTestEnv("opencl/database/dstdevp.", XLS, false))
+ if(!initTestEnv("opencl/database/dstdevp.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4284,7 +4284,7 @@ void ScOpenCLTest::testDatabaseFormulaDstdevp()
void ScOpenCLTest::testDatabaseFormulaDsum()
{
- if(!initTestEnv("opencl/database/dsum.", XLS, false))
+ if(!initTestEnv("opencl/database/dsum.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4302,7 +4302,7 @@ void ScOpenCLTest::testDatabaseFormulaDsum()
void ScOpenCLTest::testDatabaseFormulaDvar()
{
- if(!initTestEnv("opencl/database/dvar.", XLS, false))
+ if(!initTestEnv("opencl/database/dvar.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4320,7 +4320,7 @@ void ScOpenCLTest::testDatabaseFormulaDvar()
void ScOpenCLTest::testDatabaseFormulaDvarp()
{
- if(!initTestEnv("opencl/database/dvarp.", XLS, false))
+ if(!initTestEnv("opencl/database/dvarp.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4337,7 +4337,7 @@ void ScOpenCLTest::testDatabaseFormulaDvarp()
void ScOpenCLTest::testMathFormulaRoundUp()
{
- if(!initTestEnv("opencl/math/roundup.", XLS, false))
+ if(!initTestEnv("opencl/math/roundup.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4354,7 +4354,7 @@ void ScOpenCLTest::testMathFormulaRoundUp()
void ScOpenCLTest::testMathFormulaRoundDown()
{
- if(!initTestEnv("opencl/math/rounddown.", XLS, false))
+ if(!initTestEnv("opencl/math/rounddown.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4371,7 +4371,7 @@ void ScOpenCLTest::testMathFormulaRoundDown()
void ScOpenCLTest::testMathFormulaInt()
{
- if(!initTestEnv("opencl/math/int.", XLS, false))
+ if(!initTestEnv("opencl/math/int.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4388,7 +4388,7 @@ void ScOpenCLTest::testMathFormulaInt()
void ScOpenCLTest::testMathFormulaRadians()
{
- if(!initTestEnv("opencl/math/radians.", XLS, false))
+ if(!initTestEnv("opencl/math/radians.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4405,7 +4405,7 @@ void ScOpenCLTest::testMathFormulaRadians()
void ScOpenCLTest::testMathFormulaDegrees()
{
- if(!initTestEnv("opencl/math/degrees.", XLS, false))
+ if(!initTestEnv("opencl/math/degrees.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4421,7 +4421,7 @@ void ScOpenCLTest::testMathFormulaDegrees()
void ScOpenCLTest::testMathFormulaIsEven()
{
- if(!initTestEnv("opencl/math/iseven.", XLS, false))
+ if(!initTestEnv("opencl/math/iseven.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4438,7 +4438,7 @@ void ScOpenCLTest::testMathFormulaIsEven()
void ScOpenCLTest::testMathFormulaCountIf()
{
- if(!initTestEnv("opencl/math/countif.", XLS, false))
+ if(!initTestEnv("opencl/math/countif.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4454,7 +4454,7 @@ void ScOpenCLTest::testMathFormulaCountIf()
void ScOpenCLTest::testMathFormulaIsOdd()
{
- if(!initTestEnv("opencl/math/isodd.", XLS, false))
+ if(!initTestEnv("opencl/math/isodd.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4471,7 +4471,7 @@ void ScOpenCLTest::testMathFormulaIsOdd()
void ScOpenCLTest::testMathFormulaFact()
{
- if(!initTestEnv("opencl/math/fact.", XLS, false))
+ if(!initTestEnv("opencl/math/fact.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4487,7 +4487,7 @@ void ScOpenCLTest::testMathFormulaFact()
void ScOpenCLTest::testMathFormulaSEC()
{
- if(!initTestEnv("opencl/math/sec.", ODS, false))
+ if(!initTestEnv("opencl/math/sec.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4503,7 +4503,7 @@ void ScOpenCLTest::testMathFormulaSEC()
void ScOpenCLTest::testMathFormulaSECH()
{
- if(!initTestEnv("opencl/math/sech.", ODS, false))
+ if(!initTestEnv("opencl/math/sech.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4519,7 +4519,7 @@ void ScOpenCLTest::testMathFormulaSECH()
void ScOpenCLTest::testMathFormulaMROUND()
{
- if(!initTestEnv("opencl/math/MROUND.", XLS, false))
+ if(!initTestEnv("opencl/math/MROUND.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4535,7 +4535,7 @@ void ScOpenCLTest::testMathFormulaMROUND()
void ScOpenCLTest::testMathFormulaQuotient()
{
- if(!initTestEnv("opencl/math/Quotient.", ODS, false))
+ if(!initTestEnv("opencl/math/Quotient.", FORMAT_ODS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4552,7 +4552,7 @@ void ScOpenCLTest::testMathFormulaQuotient()
void ScOpenCLTest::testMathFormulaSeriesSum()
{
- if(!initTestEnv("opencl/math/seriessum.", XLS, false))
+ if(!initTestEnv("opencl/math/seriessum.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4568,7 +4568,7 @@ void ScOpenCLTest::testMathFormulaSeriesSum()
void ScOpenCLTest::testMathFormulaSumIf()
{
- if(!initTestEnv("opencl/math/sumif.", XLS, false))
+ if(!initTestEnv("opencl/math/sumif.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4584,7 +4584,7 @@ void ScOpenCLTest::testMathFormulaSumIf()
void ScOpenCLTest::testAddInFormulaBesseLJ()
{
- if(!initTestEnv("opencl/addin/besselj.", XLS, false))
+ if(!initTestEnv("opencl/addin/besselj.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4601,7 +4601,7 @@ void ScOpenCLTest::testAddInFormulaBesseLJ()
void ScOpenCLTest::testStatisticalFormulaAvedev()
{
- if(!initTestEnv("opencl/statistical/Avedev.", XLS, false))
+ if(!initTestEnv("opencl/statistical/Avedev.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4618,7 +4618,7 @@ void ScOpenCLTest::testStatisticalFormulaAvedev()
void ScOpenCLTest::testNegSub()
{
- if(!initTestEnv("opencl/math/NegSub.", XLS, false))
+ if(!initTestEnv("opencl/math/NegSub.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4635,7 +4635,7 @@ void ScOpenCLTest::testNegSub()
void ScOpenCLTest::testMathFormulaAverageIf_Mix()
{
- if(!initTestEnv("opencl/math/averageif_mix.", XLS, false))
+ if(!initTestEnv("opencl/math/averageif_mix.", FORMAT_XLS, false))
return;
ScDocument& rDoc = xDocSh->GetDocument();
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
