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

8 files changed, 497 insertions, 498 deletions

diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 8518e20212be..fcf37961a14e 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 a2f305cbb9a0..fd3af4f66036 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 3509ea55dd97..fac6c0820ea1 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 c8b73c890281..46e71fc87269 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 1dd1b9c40a43..1beb33cb866c 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 237dbf6248ba..53699a8d6928 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();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4651,7 +4651,7 @@ void ScOpenCLTest::testMathFormulaAverageIf_Mix()
 
 void ScOpenCLTest::testStatisticalFormulaKurt1()
 {
-    if(!initTestEnv("opencl/statistical/Kurt1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/Kurt1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4668,7 +4668,7 @@ void ScOpenCLTest::testStatisticalFormulaKurt1()
 
 void ScOpenCLTest::testStatisticalFormulaHarMean1()
 {
-    if(!initTestEnv("opencl/statistical/HarMean1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/HarMean1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4685,7 +4685,7 @@ void ScOpenCLTest::testStatisticalFormulaHarMean1()
 
 void ScOpenCLTest::testStatisticalFormulaVarA1()
 {
-    if(!initTestEnv("opencl/statistical/VarA1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/VarA1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4702,7 +4702,7 @@ void ScOpenCLTest::testStatisticalFormulaVarA1()
 
 void ScOpenCLTest::testStatisticalFormulaVarPA1()
 {
-    if(!initTestEnv("opencl/statistical/VarPA1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/VarPA1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4719,7 +4719,7 @@ void ScOpenCLTest::testStatisticalFormulaVarPA1()
 
 void ScOpenCLTest::testStatisticalFormulaStDevA1()
 {
-    if(!initTestEnv("opencl/statistical/StDevA1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/StDevA1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
@@ -4736,7 +4736,7 @@ void ScOpenCLTest::testStatisticalFormulaStDevA1()
 
 void ScOpenCLTest::testStatisticalFormulaStDevPA1()
 {
-    if(!initTestEnv("opencl/statistical/StDevPA1.", XLS, false))
+    if(!initTestEnv("opencl/statistical/StDevPA1.", FORMAT_XLS, false))
         return;
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDocument& rDocRes = xDocShRes->GetDocument();
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 0a16302312f7..b8dc55150b2f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -313,7 +313,7 @@ void ScExportTest::test()
 
     rDoc.SetValue(0,0,0, 1.0);
 
-    ScDocShellRef xDocSh = saveAndReload( pShell, ODS );
+    ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS);
 
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rLoadedDoc = xDocSh->GetDocument();
@@ -335,7 +335,7 @@ void ScExportTest::testPasswordExport()
 
     rDoc.SetValue(0,0,0, 1.0);
 
-    sal_Int32 nFormat = ODS;
+    sal_Int32 nFormat = FORMAT_ODS;
     OUString aFilterName(getFileFormats()[nFormat].pFilterName, strlen(getFileFormats()[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
     OUString aFilterType(getFileFormats()[nFormat].pTypeName, strlen(getFileFormats()[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
     ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName, OUString(), aFilterType, getFileFormats()[nFormat].nFormatType);
@@ -351,10 +351,10 @@ void ScExportTest::testPasswordExport()
 
 void ScExportTest::testConditionalFormatExportODS()
 {
-    ScDocShellRef xShell = loadDoc("new_cond_format_test.", ODS);
+    ScDocShellRef xShell = loadDoc("new_cond_format_test.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), ODS);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     OUString aCSVFile("new_cond_format_test.");
@@ -367,10 +367,10 @@ void ScExportTest::testConditionalFormatExportODS()
 
 void ScExportTest::testConditionalFormatExportXLSX()
 {
-    ScDocShellRef xShell = loadDoc("new_cond_format_test.", XLSX);
+    ScDocShellRef xShell = loadDoc("new_cond_format_test.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     {
@@ -391,10 +391,10 @@ void ScExportTest::testConditionalFormatExportXLSX()
 
 void ScExportTest::testColorScaleExportODS()
 {
-    ScDocShellRef xShell = loadDoc("colorscale.", ODS);
+    ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -407,10 +407,10 @@ void ScExportTest::testColorScaleExportODS()
 
 void ScExportTest::testColorScaleExportXLSX()
 {
-    ScDocShellRef xShell = loadDoc("colorscale.", XLSX);
+    ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLSX);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -423,10 +423,10 @@ void ScExportTest::testColorScaleExportXLSX()
 
 void ScExportTest::testDataBarExportODS()
 {
-    ScDocShellRef xShell = loadDoc("databar.", ODS);
+    ScDocShellRef xShell = loadDoc("databar.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -438,25 +438,25 @@ void ScExportTest::testDataBarExportODS()
 
 void ScExportTest::testFormatExportODS()
 {
-    ScDocShellRef xShell = loadDoc("formats.", ODS);
+    ScDocShellRef xShell = loadDoc("formats.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
-    testFormats(this, &rDoc, ODS);
+    testFormats(this, &rDoc, FORMAT_ODS);
 
     xDocSh->DoClose();
 }
 
 void ScExportTest::testDataBarExportXLSX()
 {
-    ScDocShellRef xShell = loadDoc("databar.", XLSX);
+    ScDocShellRef xShell = loadDoc("databar.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLSX);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -495,13 +495,13 @@ void ScExportTest::testMiscRowHeightExport()
         // additionally there is effectively a default row height ( 5.29 mm ). So we test the
         // unset rows at the end of the document to ensure the effective xlsx default height
         // is set there too.
-        { "miscrowheights.", XLSX, XLSX, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
+        { "miscrowheights.", FORMAT_XLSX, FORMAT_XLSX, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
         // Checks that some distributed ( non-empty ) heights remain set after export (to xls)
-        { "miscrowheights.", XLSX, XLS, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
+        { "miscrowheights.", FORMAT_XLSX, FORMAT_XLS, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
         // Checks that repreated rows ( of various heights ) remain set after export ( to xlsx )
-        { "miscemptyrepeatedrowheights.", ODS, XLSX, SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+        { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLSX, SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
         // Checks that repreated rows ( of various heights ) remain set after export ( to xls )
-        { "miscemptyrepeatedrowheights.", ODS, XLS, SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+        { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLS, SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
     };
     miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
 }
@@ -575,7 +575,7 @@ void setFont( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart, sal_Int
 
 void ScExportTest::testNamedRangeBugfdo62729()
 {
-    ScDocShellRef xShell = loadDoc("fdo62729.", ODS);
+    ScDocShellRef xShell = loadDoc("fdo62729.", FORMAT_ODS);
     CPPUNIT_ASSERT(xShell.Is());
     ScDocument& rDoc = xShell->GetDocument();
 
@@ -585,7 +585,7 @@ void ScExportTest::testNamedRangeBugfdo62729()
     rDoc.DeleteTab(0);
     //should be still a single named range
     CPPUNIT_ASSERT(pNames->size() == 1 );
-    ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_ODS);
     xShell->DoClose();
 
     CPPUNIT_ASSERT(xDocSh.Is());
@@ -902,7 +902,7 @@ void ScExportTest::testRichTextExportODS()
 
     // Start with an empty document, put one edit text cell, and make sure it
     // survives the save and reload.
-    ScDocShellRef xOrigDocSh = loadDoc("empty.", ODS, true);
+    ScDocShellRef xOrigDocSh = loadDoc("empty.", FORMAT_ODS, true);
     const EditTextObject* pEditText;
     {
         ScDocument& rDoc = xOrigDocSh->GetDocument();
@@ -925,7 +925,7 @@ void ScExportTest::testRichTextExportODS()
     }
 
     // Now, save and reload this document.
-    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, ODS);
+    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, FORMAT_ODS);
     {
         xOrigDocSh->DoClose();
         CPPUNIT_ASSERT(xNewDocSh.Is());
@@ -945,7 +945,7 @@ void ScExportTest::testRichTextExportODS()
     }
 
     // Reload the doc again, and check the content of B2 and B4.
-    ScDocShellRef xNewDocSh2 = saveAndReload(xNewDocSh, ODS);
+    ScDocShellRef xNewDocSh2 = saveAndReload(xNewDocSh, FORMAT_ODS);
     {
         ScDocument& rDoc3 = xNewDocSh2->GetDocument();
         ScFieldEditEngine* pEE = &rDoc3.GetEditEngine();
@@ -992,7 +992,7 @@ void ScExportTest::testRichTextExportODS()
     }
 
     // Reload the doc again, and check the content of B2, B4, B6 and B7.
-    ScDocShellRef xNewDocSh3 = saveAndReload(xNewDocSh2, ODS);
+    ScDocShellRef xNewDocSh3 = saveAndReload(xNewDocSh2, FORMAT_ODS);
     ScDocument& rDoc4 = xNewDocSh3->GetDocument();
     xNewDocSh2->DoClose();
 
@@ -1014,7 +1014,7 @@ void ScExportTest::testRichTextExportODS()
 
 void ScExportTest::testFormulaRefSheetNameODS()
 {
-    ScDocShellRef xDocSh = loadDoc("formula-quote-in-sheet-name.", ODS, true);
+    ScDocShellRef xDocSh = loadDoc("formula-quote-in-sheet-name.", FORMAT_ODS, true);
     {
         ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -1025,7 +1025,7 @@ void ScExportTest::testFormulaRefSheetNameODS()
             CPPUNIT_FAIL("Wrong formula");
     }
     // Now, save and reload this document.
-    ScDocShellRef xNewDocSh = saveAndReload(xDocSh, ODS);
+    ScDocShellRef xNewDocSh = saveAndReload(xDocSh, FORMAT_ODS);
     xDocSh->DoClose();
 
     ScDocument& rDoc = xNewDocSh->GetDocument();
@@ -1040,7 +1040,7 @@ void ScExportTest::testFormulaRefSheetNameODS()
 void ScExportTest::testCellValuesExportODS()
 {
     // Start with an empty document
-    ScDocShellRef xOrigDocSh = loadDoc("empty.", ODS);
+    ScDocShellRef xOrigDocSh = loadDoc("empty.", FORMAT_ODS);
     {
         ScDocument& rDoc = xOrigDocSh->GetDocument();
         CPPUNIT_ASSERT_MESSAGE("This document should at least have one sheet.", rDoc.GetTableCount() > 0);
@@ -1068,7 +1068,7 @@ void ScExportTest::testCellValuesExportODS()
         rDoc.SetString(ScAddress(0,7,0), "=$A$6"); //A8
     }
     // save and reload
-    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, ODS);
+    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, FORMAT_ODS);
     xOrigDocSh->DoClose();
     CPPUNIT_ASSERT(xNewDocSh.Is());
     ScDocument& rDoc = xNewDocSh->GetDocument();
@@ -1113,7 +1113,7 @@ void ScExportTest::testCellValuesExportODS()
 
 void ScExportTest::testCellNoteExportODS()
 {
-    ScDocShellRef xOrigDocSh = loadDoc("single-note.", ODS);
+    ScDocShellRef xOrigDocSh = loadDoc("single-note.", FORMAT_ODS);
     ScAddress aPos(0,0,0); // Start with A1.
     {
         ScDocument& rDoc = xOrigDocSh->GetDocument();
@@ -1127,7 +1127,7 @@ void ScExportTest::testCellNoteExportODS()
         CPPUNIT_ASSERT_MESSAGE("There should be a note at A2.", rDoc.HasNote(aPos));
     }
     // save and reload
-    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, ODS);
+    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, FORMAT_ODS);
     xOrigDocSh->DoClose();
     CPPUNIT_ASSERT(xNewDocSh.Is());
     ScDocument& rDoc = xNewDocSh->GetDocument();
@@ -1143,7 +1143,7 @@ void ScExportTest::testCellNoteExportODS()
 void ScExportTest::testCellNoteExportXLS()
 {
     // Start with an empty document.s
-    ScDocShellRef xOrigDocSh = loadDoc("notes-on-3-sheets.", ODS);
+    ScDocShellRef xOrigDocSh = loadDoc("notes-on-3-sheets.", FORMAT_ODS);
     {
         ScDocument& rDoc = xOrigDocSh->GetDocument();
         CPPUNIT_ASSERT_MESSAGE("This document should have 3 sheets.", rDoc.GetTableCount() == 3);
@@ -1162,7 +1162,7 @@ void ScExportTest::testCellNoteExportXLS()
         CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,2,2)));
     }
     // save and reload as XLS.
-    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, XLS);
+    ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, FORMAT_XLS);
     {
         xOrigDocSh->DoClose();
         CPPUNIT_ASSERT(xNewDocSh.Is());
@@ -1214,10 +1214,10 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange)
 
 void ScExportTest::testInlineArrayXLS()
 {
-    ScDocShellRef xShell = loadDoc("inline-array.", XLS);
+    ScDocShellRef xShell = loadDoc("inline-array.", FORMAT_XLS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLS);
     xShell->DoClose();
     CPPUNIT_ASSERT(xDocSh.Is());
 
@@ -1237,10 +1237,10 @@ void ScExportTest::testInlineArrayXLS()
 
 void ScExportTest::testEmbeddedChartXLS()
 {
-    ScDocShellRef xShell = loadDoc("embedded-chart.", XLS);
+    ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLS);
     xShell->DoClose();
     CPPUNIT_ASSERT(xDocSh.Is());
 
@@ -1264,10 +1264,10 @@ void ScExportTest::testEmbeddedChartXLS()
 
 void ScExportTest::testFormulaReferenceXLS()
 {
-    ScDocShellRef xShell = loadDoc("formula-reference.", XLS);
+    ScDocShellRef xShell = loadDoc("formula-reference.", FORMAT_XLS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLS);
     xShell->DoClose();
     CPPUNIT_ASSERT(xDocSh.Is());
 
@@ -1302,10 +1302,10 @@ void ScExportTest::testFormulaReferenceXLS()
 
 void ScExportTest::testSheetProtectionXLSX()
 {
-    ScDocShellRef xShell = loadDoc("ProtecteSheet1234Pass.", XLSX);
+    ScDocShellRef xShell = loadDoc("ProtecteSheet1234Pass.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLSX);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1405,12 +1405,12 @@ void ScExportTest::testExcelCellBorders( sal_uLong nFormatType )
 
 void ScExportTest::testCellBordersXLS()
 {
-    testExcelCellBorders(XLS);
+    testExcelCellBorders(FORMAT_XLS);
 }
 
 void ScExportTest::testCellBordersXLSX()
 {
-    testExcelCellBorders(XLSX);
+    testExcelCellBorders(FORMAT_XLSX);
 }
 
 OUString toString( const ScBigRange& rRange )
@@ -1614,13 +1614,13 @@ void ScExportTest::testTrackChangesSimpleXLSX()
 
     // First, test the xls variant.
 
-    ScDocShellRef xDocSh = loadDoc("track-changes/simple-cell-changes.", XLS);
+    ScDocShellRef xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument* pDoc = &xDocSh->GetDocument();
     bool bGood = aTest.check(*pDoc);
     CPPUNIT_ASSERT_MESSAGE("Initial check failed (xls).", bGood);
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLS);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLS);
     xDocSh->DoClose();
     pDoc = &xDocSh2->GetDocument();
     bGood = aTest.check(*pDoc);
@@ -1642,13 +1642,13 @@ void ScExportTest::testTrackChangesSimpleXLSX()
 
     // Now, test the xlsx variant the same way.
 
-    xDocSh = loadDoc("track-changes/simple-cell-changes.", XLSX);
+    xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     pDoc = &xDocSh->GetDocument();
     aTest.check(*pDoc);
     CPPUNIT_ASSERT_MESSAGE("Initial check failed (xlsx).", bGood);
 
-    xDocSh2 = saveAndReload(xDocSh, XLSX);
+    xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     xDocSh->DoClose();
     pDoc = &xDocSh2->GetDocument();
     bGood = aTest.check(*pDoc);
@@ -1709,7 +1709,7 @@ void ScExportTest::testSheetTabColorsXLSX()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("sheet-tab-color.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("sheet-tab-color.", FORMAT_XLSX);
     {
         CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -1717,7 +1717,7 @@ void ScExportTest::testSheetTabColorsXLSX()
         CPPUNIT_ASSERT_MESSAGE("Failed on the initial content check.", bRes);
     }
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is());
     xDocSh->DoClose();
     ScDocument& rDoc = xDocSh2->GetDocument();
@@ -1796,7 +1796,7 @@ void ScExportTest::testSharedFormulaExportXLS()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", ODS);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_ODS);
     {
         CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -1806,7 +1806,7 @@ void ScExportTest::testSharedFormulaExportXLS()
         CPPUNIT_ASSERT_MESSAGE("Content check on the original document failed.", bRes);
     }
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLS);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLS);
     xDocSh->DoClose();
     CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is());
 
@@ -1887,7 +1887,7 @@ void ScExportTest::testSharedFormulaExportXLSX()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_XLSX);
     {
         CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -1901,7 +1901,7 @@ void ScExportTest::testSharedFormulaExportXLSX()
     }
 
     // Save and reload, and check the content again.
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     xDocSh->DoClose();
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh2.Is());
@@ -1957,7 +1957,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("shared-formula/text-results.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/text-results.", FORMAT_XLSX);
     {
         CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -1972,7 +1972,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX()
         CPPUNIT_ASSERT_MESSAGE("Content check on the initial recalculated document failed.", bRes);
     }
     // Reload and check again.
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     xDocSh->DoClose();
     CPPUNIT_ASSERT_MESSAGE("Failed to re-load file.", xDocSh2.Is());
     ScDocument& rDoc = xDocSh2->GetDocument();
@@ -1985,7 +1985,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX()
 
 void ScExportTest::testFunctionsExcel2010( sal_uLong nFormatType )
 {
-    ScDocShellRef xShell = loadDoc("functions-excel-2010.", XLSX);
+    ScDocShellRef xShell = loadDoc("functions-excel-2010.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is());
 
     ScDocShellRef xDocSh = saveAndReload(xShell, nFormatType);
@@ -1999,17 +1999,17 @@ void ScExportTest::testFunctionsExcel2010( sal_uLong nFormatType )
 
 void ScExportTest::testFunctionsExcel2010XLSX()
 {
-    testFunctionsExcel2010(XLSX);
+    testFunctionsExcel2010(FORMAT_XLSX);
 }
 
 void ScExportTest::testFunctionsExcel2010XLS()
 {
-    testFunctionsExcel2010(XLS);
+    testFunctionsExcel2010(FORMAT_XLS);
 }
 
 void ScExportTest::testCeilingFloor( sal_uLong nFormatType )
 {
-    ScDocShellRef xShell = loadDoc("ceiling-floor.", XLSX);
+    ScDocShellRef xShell = loadDoc("ceiling-floor.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is());
 
     ScDocShellRef xDocSh = saveAndReload(xShell, nFormatType);
@@ -2023,25 +2023,25 @@ void ScExportTest::testCeilingFloor( sal_uLong nFormatType )
 
 void ScExportTest::testCeilingFloorXLSX()
 {
-    testCeilingFloor(XLSX);
+    testCeilingFloor(FORMAT_XLSX);
 }
 
 void ScExportTest::testCeilingFloorXLS()
 {
-    testCeilingFloor(XLS);
+    testCeilingFloor(FORMAT_XLS);
 }
 
 void ScExportTest::testCeilingFloorODS()
 {
-    testCeilingFloor(ODS);
+    testCeilingFloor(FORMAT_ODS);
 }
 
 void ScExportTest::testRelativePaths()
 {
-    ScDocShellRef xDocSh = loadDoc("fdo79305.", ODS);
+    ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "content.xml", ODS);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "content.xml", FORMAT_ODS);
     CPPUNIT_ASSERT(pDoc);
     OUString aURL = getXPath(pDoc,
             "/office:document-content/office:body/office:spreadsheet/table:table/table:table-row[2]/table:table-cell[2]/text:p/text:a", "href");
@@ -2064,7 +2064,7 @@ void testSheetProtection_Impl(ScDocument& rDoc)
 
 void ScExportTest::testSheetProtection()
 {
-    ScDocShellRef xDocSh = loadDoc("sheet-protection.", ODS);
+    ScDocShellRef xDocSh = loadDoc("sheet-protection.", FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     {
@@ -2072,7 +2072,7 @@ void ScExportTest::testSheetProtection()
         testSheetProtection_Impl(rDoc);
     }
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, ODS);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_ODS);
     {
         ScDocument& rDoc = xDocSh2->GetDocument();
         testSheetProtection_Impl(rDoc);
@@ -2199,7 +2199,7 @@ void ScExportTest::testPivotTableXLSX()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("pivot-table/many-fields-in-cache.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("pivot-table/many-fields-in-cache.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument* pDoc = &xDocSh->GetDocument();
 
@@ -2207,7 +2207,7 @@ void ScExportTest::testPivotTableXLSX()
     bool bCheck = aTest.check(*pDoc);
     CPPUNIT_ASSERT_MESSAGE("Initial check failed.", bCheck);
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     xDocSh->DoClose();
     CPPUNIT_ASSERT(xDocSh2.Is());
     pDoc = &xDocSh2->GetDocument();
@@ -2319,7 +2319,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX()
 
     } aTest;
 
-    ScDocShellRef xDocSh = loadDoc("pivot-table/two-data-fields.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("pivot-table/two-data-fields.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument* pDoc = &xDocSh->GetDocument();
 
@@ -2327,7 +2327,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX()
     bool bCheck = aTest.check(*pDoc);
     CPPUNIT_ASSERT_MESSAGE("Initial check failed.", bCheck);
 
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLSX);
     xDocSh->DoClose();
     CPPUNIT_ASSERT(xDocSh2.Is());
     pDoc = &xDocSh2->GetDocument();
@@ -2341,7 +2341,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX()
 
 void ScExportTest::testFunctionsExcel2010ODS()
 {
-    //testFunctionsExcel2010(ODS);
+    //testFunctionsExcel2010(FORMAT_ODS);
 }
 
 void ScExportTest::testSwappedOutImageExport()
@@ -2361,7 +2361,7 @@ void ScExportTest::testSwappedOutImageExport()
     for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter )
     {
         // Check whether the export code swaps in the image which was swapped out before.
-        ScDocShellRef xDocSh = loadDoc("document_with_two_images.", ODS);
+        ScDocShellRef xDocSh = loadDoc("document_with_two_images.", FORMAT_ODS);
 
         const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter];
         CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is());
@@ -2441,10 +2441,10 @@ void ScExportTest::tearDown()
 
 void ScExportTest::testSupBookVirtualPath()
 {
-    ScDocShellRef xShell = loadDoc("external-ref.", XLS);
+    ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+    ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_XLS);
     xShell->DoClose();
     CPPUNIT_ASSERT(xDocSh.Is());
 
@@ -2469,7 +2469,7 @@ void ScExportTest::testLinkedGraphicRT()
     for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter )
     {
         // Load the original file with one image
-        ScDocShellRef xDocSh = loadDoc("document_with_linked_graphic.", ODS);
+        ScDocShellRef xDocSh = loadDoc("document_with_linked_graphic.", FORMAT_ODS);
         const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter];
 
         // Export the document and import again for a check
@@ -2511,7 +2511,7 @@ void ScExportTest::testImageWithSpecialID()
 
     for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter )
     {
-        ScDocShellRef xDocSh = loadDoc("images_with_special_IDs.", ODS);
+        ScDocShellRef xDocSh = loadDoc("images_with_special_IDs.", FORMAT_ODS);
 
         const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter];
         CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is());
@@ -2569,9 +2569,9 @@ void ScExportTest::testImageWithSpecialID()
 
 void ScExportTest::testSheetLocalRangeNameXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("named-ranges-local.", XLS);
+    ScDocShellRef xDocSh = loadDoc("named-ranges-local.", FORMAT_XLS);
     xDocSh->DoHardRecalc(true);
-    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLS);
+    ScDocShellRef xDocSh2 = saveAndReload(xDocSh, FORMAT_XLS);
     xDocSh->DoClose();
     xDocSh2->DoHardRecalc(true);
 
@@ -2593,13 +2593,13 @@ void ScExportTest::testSheetLocalRangeNameXLS()
 
 void ScExportTest::testSheetTextBoxHyperlink()
 {
-    ScDocShellRef xShell = loadDoc("textbox-hyperlink.", XLSX);
+    ScDocShellRef xShell = loadDoc("textbox-hyperlink.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
 
     assertXPath(pDoc, "/xdr:wsDr[1]/xdr:twoCellAnchor[1]/xdr:sp[1]/xdr:nvSpPr[1]/xdr:cNvPr[1]/a:hlinkClick[1]", 1);
@@ -2609,10 +2609,10 @@ void ScExportTest::testSheetTextBoxHyperlink()
 
 void ScExportTest::testFontSize()
 {
-    ScDocShellRef xDocSh = loadDoc("fontSize.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
     OUString fontSize = getXPath(pDoc,
                 "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:txBody/a:p[1]/a:r[1]/a:rPr", "sz");
@@ -2622,13 +2622,13 @@ void ScExportTest::testFontSize()
 
 void ScExportTest::testSheetCharacterKerningSpace()
 {
-    ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", XLSX);
+    ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
 
     OUString CharKerningSpace = getXPath(pDoc,
@@ -2642,13 +2642,13 @@ void ScExportTest::testSheetCharacterKerningSpace()
 
 void ScExportTest::testSheetCondensedCharacterSpace()
 {
-    ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", XLSX);
+    ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
 
     OUString CondensedCharSpace = getXPath(pDoc,
@@ -2663,10 +2663,10 @@ void ScExportTest::testSheetCondensedCharacterSpace()
 void ScExportTest::testTextUnderlineColor()
 {
 
-    ScDocShellRef xDocSh = loadDoc("underlineColor.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
     OUString color = getXPath(pDoc,
             "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:txBody/a:p[1]/a:r[1]/a:rPr/a:uFill/a:solidFill/a:srgbClr", "val");
@@ -2676,13 +2676,13 @@ void ScExportTest::testTextUnderlineColor()
 
 void ScExportTest::testSheetRunParagraphProperty()
 {
-    ScDocShellRef xShell = loadDoc("TextColor.", XLSX);
+    ScDocShellRef xShell = loadDoc("TextColor.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/sharedStrings.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
 
     OUString aColor = getXPath(pDoc, "/x:sst/x:si/x:r[1]/x:rPr[1]/x:color", "rgb");
@@ -2693,11 +2693,11 @@ void ScExportTest::testSheetRunParagraphProperty()
 
 void ScExportTest::testPreserveTextWhitespaceXLSX()
 {
-    ScDocShellRef xShell = loadDoc("preserve-whitespace.", XLSX);
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xShell = loadDoc("preserve-whitespace.", FORMAT_XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/sharedStrings.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
     assertXPath(pDoc, "/x:sst/x:si/x:t", "space", "preserve");
     xDocSh->DoClose();
@@ -2705,26 +2705,26 @@ void ScExportTest::testPreserveTextWhitespaceXLSX()
 
 void ScExportTest::testHiddenShape()
 {
-    ScDocShellRef xDocSh = loadDoc("hiddenShape.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
     assertXPath(pDoc, "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:nvSpPr/xdr:cNvPr", "hidden", "1");
 }
 void ScExportTest::testHyperlinkXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("hyperlink.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
     assertXPath(pDoc, "/r:Relationships/r:Relationship", "Target", "#Sheet2!A1");
 }
 
 void ScExportTest::testMoveCellAnchoredShapes()
 {
-    ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", ODS);
+    ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.Is());
 
     // There are two cell-anchored objects on the first sheet.
@@ -2787,7 +2787,7 @@ void ScExportTest::testMoveCellAnchoredShapes()
     aNDataEnd   = pNData->maEnd;
 
     // Save the document and load again to check anchor persist
-    ScDocShellRef xDocSh1 = saveAndReload(&(*xDocSh), ODS);
+    ScDocShellRef xDocSh1 = saveAndReload(&(*xDocSh), FORMAT_ODS);
 
     // There are two cell-anchored objects on the first sheet.
     ScDocument& rDoc1 = xDocSh1->GetDocument();
@@ -2848,7 +2848,7 @@ void ScExportTest::testMoveCellAnchoredShapes()
     aNDataEnd   = pNData->maEnd;
 
     // Save the document and load again to check anchor persist
-    ScDocShellRef xDocSh2 = saveAndReload(&(*xDocSh1), ODS);
+    ScDocShellRef xDocSh2 = saveAndReload(&(*xDocSh1), FORMAT_ODS);
 
     // There are two cell-anchored objects on the first sheet.
     ScDocument& rDoc2 = xDocSh2->GetDocument();
@@ -2887,13 +2887,13 @@ void ScExportTest::testMoveCellAnchoredShapes()
 
 void ScExportTest::testMatrixMultiplication()
 {
-    ScDocShellRef xShell = loadDoc("matrix-multiplication.", XLSX);
+    ScDocShellRef xShell = loadDoc("matrix-multiplication.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xShell.Is());
 
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), XLSX);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
-    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/worksheets/sheet1.xml", XLSX);
+    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX);
     CPPUNIT_ASSERT(pDoc);
 
     OUString CellFormulaRange = getXPath(pDoc,
@@ -2914,11 +2914,11 @@ void ScExportTest::testMatrixMultiplication()
 
 void ScExportTest::testRefStringXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("ref_string.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
     //make sure ref syntax gets saved for MSO-produced docs
-    xDocSh = saveAndReload( &(*xDocSh), XLSX);
+    xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2931,10 +2931,10 @@ void ScExportTest::testRefStringXLSX()
 void ScExportTest::testRefStringConfigXLSX()
 {
     // this doc is configured with CalcA1 ref syntax
-    ScDocShellRef xDocSh = loadDoc("empty.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
-    xDocSh = saveAndReload( &(*xDocSh), XLSX);
+    xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2943,7 +2943,7 @@ void ScExportTest::testRefStringConfigXLSX()
                             aConfig.meStringRefAddressSyntax);
 
     // this doc has no entry for ref syntax
-    xDocSh = loadDoc("empty-noconf.", XLSX);
+    xDocSh = loadDoc("empty-noconf.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open 2nd doc", xDocSh.Is());
 
     ScDocument& rDoc2 = xDocSh->GetDocument();
@@ -2956,7 +2956,7 @@ void ScExportTest::testRefStringConfigXLSX()
     aConfig.meStringRefAddressSyntax = formula::FormulaGrammar::CONV_XL_R1C1;
     rDoc2.SetCalcConfig( aConfig );
 
-    ScDocShellRef xNewDocSh = saveAndReload( &(*xDocSh), XLSX);
+    ScDocShellRef xNewDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to reload 2nd doc", xNewDocSh.Is());
 
     // ... and make sure it got saved
@@ -2985,7 +2985,7 @@ void ScExportTest::testRefStringUnspecified()
     // change formula syntax (i.e. not string ref syntax) to ExcelA1
     rDoc.SetGrammar( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 
-    ScDocShellRef xDocSh = saveAndReload( pShell, ODS );
+    ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is());
 
     // with string ref syntax at its default value, we should've saved ExcelA1
@@ -3000,8 +3000,8 @@ void ScExportTest::testRefStringUnspecified()
 void ScExportTest::testHeaderImage()
 {
     // Graphic as header background was lost on export.
-    ScDocShellRef xShell = loadDoc("header-image.", ODS);
-    ScDocShellRef xDocSh = saveAndReload(&(*xShell), ODS);
+    ScDocShellRef xShell = loadDoc("header-image.", FORMAT_ODS);
+    ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_ODS);
     uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(xDocSh->GetModel(), uno::UNO_QUERY);
     uno::Reference<container::XNameAccess> xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies();
     uno::Reference<container::XNameAccess> xPageStyles(xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index f3abf7de5e7b..d47557944f28 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -367,7 +367,7 @@ void testRangeNameImpl(ScDocument& rDoc)
 
 void ScFiltersTest::testBasicCellContentODS()
 {
-    ScDocShellRef xDocSh = loadDoc("basic-cell-content.", ODS);
+    ScDocShellRef xDocSh = loadDoc("basic-cell-content.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load basic-cell-content.ods", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -390,7 +390,7 @@ void ScFiltersTest::testBasicCellContentODS()
 
 void ScFiltersTest::testBooleanFormatXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("check-boolean.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("check-boolean.", FORMAT_XLSX);
     ScDocument& rDoc = xDocSh->GetDocument();
     SvNumberFormatter* pNumFormatter = rDoc.GetFormatTable();
     const OUString aBooleanTypeStr = "\"TRUE\";\"TRUE\";\"FALSE\"";
@@ -411,7 +411,7 @@ void ScFiltersTest::testBooleanFormatXLSX()
 
 void ScFiltersTest::testRangeNameXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("named-ranges-global.", XLS);
+    ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_XLS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -428,7 +428,7 @@ void ScFiltersTest::testRangeNameXLS()
 
 void ScFiltersTest::testRangeNameLocalXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("named-ranges-local.", XLS);
+    ScDocShellRef xDocSh = loadDoc("named-ranges-local.", FORMAT_XLS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -449,7 +449,7 @@ void ScFiltersTest::testRangeNameLocalXLS()
 
 void ScFiltersTest::testRangeNameXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("named-ranges-global.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_XLSX);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -460,7 +460,7 @@ void ScFiltersTest::testRangeNameXLSX()
 
 void ScFiltersTest::testHyperlinksXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("hyperlinks.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("hyperlinks.", FORMAT_XLSX);
     ScDocument& rDoc = xDocSh->GetDocument();
 
     CPPUNIT_ASSERT_EQUAL(OUString("10:ABC10"), rDoc.GetString(ScAddress(0,1,0)));
@@ -472,7 +472,7 @@ void ScFiltersTest::testHyperlinksXLSX()
 
 void ScFiltersTest::testHardRecalcODS()
 {
-    ScDocShellRef xDocSh = loadDoc("hard-recalc.", ODS);
+    ScDocShellRef xDocSh = loadDoc("hard-recalc.", FORMAT_ODS);
     xDocSh->DoHardRecalc(true);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.Is());
@@ -489,7 +489,7 @@ void ScFiltersTest::testHardRecalcODS()
 
 void ScFiltersTest::testFunctionsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("functions.", ODS);
+    ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS);
     xDocSh->DoHardRecalc(true);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is());
@@ -520,7 +520,7 @@ void ScFiltersTest::testFunctionsODS()
 
     xDocSh->DoClose();
 
-    xDocSh = loadDoc("database-functions.", ODS);
+    xDocSh = loadDoc("database-functions.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is());
     xDocSh->DoHardRecalc(true);
     ScDocument& rDoc2 = xDocSh->GetDocument();
@@ -530,7 +530,7 @@ void ScFiltersTest::testFunctionsODS()
 
     xDocSh->DoClose();
 
-    xDocSh = loadDoc("date-time-functions.", ODS);
+    xDocSh = loadDoc("date-time-functions.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is());
     xDocSh->DoHardRecalc(true);
     ScDocument& rDoc3 = xDocSh->GetDocument();
@@ -540,7 +540,7 @@ void ScFiltersTest::testFunctionsODS()
     xDocSh->DoClose();
 
     // crashes at exit while unloading StarBasic code
-    // xDocSh = loadDoc("user-defined-function.", ODS);
+    // xDocSh = loadDoc("user-defined-function.", FORMAT_ODS);
     // xDocSh->DoHardRecalc(true);
     // ScDocument& rDocUserDef = xDocSh->GetDocument();
     // createCSVPath("user-defined-function.", aCSVFileName);
@@ -549,7 +549,7 @@ void ScFiltersTest::testFunctionsODS()
 
 void ScFiltersTest::testFunctionsExcel2010()
 {
-    ScDocShellRef xDocSh = loadDoc("functions-excel-2010.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("functions-excel-2010.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll(); // perform hard re-calculation.
@@ -561,7 +561,7 @@ void ScFiltersTest::testFunctionsExcel2010()
 
 void ScFiltersTest::testCeilingFloorXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("ceiling-floor.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("ceiling-floor.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll(); // perform hard re-calculation.
@@ -574,7 +574,7 @@ void ScFiltersTest::testCeilingFloorXLSX()
 void ScFiltersTest::testCachedFormulaResultsODS()
 {
     {
-        ScDocShellRef xDocSh = loadDoc("functions.", ODS);
+        ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS);
         CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is());
 
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -600,7 +600,7 @@ void ScFiltersTest::testCachedFormulaResultsODS()
     }
 
     {
-        ScDocShellRef xDocSh = loadDoc("cachedValue.", ODS);
+        ScDocShellRef xDocSh = loadDoc("cachedValue.", FORMAT_ODS);
         CPPUNIT_ASSERT_MESSAGE("Failed to load cachedValue.*", xDocSh.Is());
 
         ScDocument& rDoc = xDocSh->GetDocument();
@@ -646,7 +646,7 @@ void ScFiltersTest::testCachedFormulaResultsODS()
 
 void ScFiltersTest::testCachedMatrixFormulaResultsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("matrix.", ODS);
+    ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_ODS);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -680,7 +680,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS()
 
 void ScFiltersTest::testFormulaDepAcrossSheetsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("formula-across-sheets.", ODS);
+    ScDocShellRef xDocSh = loadDoc("formula-across-sheets.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -704,7 +704,7 @@ void ScFiltersTest::testFormulaDepAcrossSheetsODS()
 
 void ScFiltersTest::testFormulaDepDeleteContentsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("formula-delete-contents.", ODS, true);
+    ScDocShellRef xDocSh = loadDoc("formula-delete-contents.", FORMAT_ODS, true);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -758,7 +758,7 @@ void testDBRanges_Impl(ScDocument& rDoc, sal_Int32 nFormat)
     CPPUNIT_ASSERT_MESSAGE("Sheet1: row 4-5 should be hidden", bHidden && nRow1 == 4 && nRow2 == 5);
     bHidden = rDoc.RowHidden(6, 0, &nRow1, &nRow2);
     CPPUNIT_ASSERT_MESSAGE("Sheet1: row 6-end should be visible", !bHidden && nRow1 == 6 && nRow2 == MAXROW);
-    if(nFormat == ODS) //excel doesn't support named db ranges
+    if (nFormat == FORMAT_ODS) //excel doesn't support named db ranges
     {
         double aValue;
         rDoc.GetValue(0,10,1, aValue);
@@ -771,80 +771,79 @@ void testDBRanges_Impl(ScDocument& rDoc, sal_Int32 nFormat)
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: D11: formula result is incorrect", 4.0, aValue);
     rDoc.GetValue(4, 10, 1, aValue);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: E11: formula result is incorrect", 2.0, aValue);
-
 }
 
 }
 
 void ScFiltersTest::testDatabaseRangesODS()
 {
-    ScDocShellRef xDocSh = loadDoc("database.", ODS);
+    ScDocShellRef xDocSh = loadDoc("database.", FORMAT_ODS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
-    testDBRanges_Impl(rDoc, ODS);
+    testDBRanges_Impl(rDoc, FORMAT_ODS);
     xDocSh->DoClose();
 }
 
 void ScFiltersTest::testDatabaseRangesXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("database.", XLS);
+    ScDocShellRef xDocSh = loadDoc("database.", FORMAT_XLS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
-    testDBRanges_Impl(rDoc, XLS);
+    testDBRanges_Impl(rDoc, FORMAT_XLS);
     xDocSh->DoClose();
 }
 
 void ScFiltersTest::testDatabaseRangesXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("database.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("database.", FORMAT_XLSX);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
-    testDBRanges_Impl(rDoc, XLSX);
+    testDBRanges_Impl(rDoc, FORMAT_XLSX);
     xDocSh->DoClose();
 }
 
 void ScFiltersTest::testFormatsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("formats.", ODS);
+    ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_ODS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
-    testFormats(this, &rDoc, ODS);
+    testFormats(this, &rDoc, FORMAT_ODS);
     xDocSh->DoClose();
 }
 
 // void ScFiltersTest::testFormatsXLS()
 // {
-//     ScDocShellRef xDocSh = loadDoc("formats.", XLS);
+//     ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_XLS);
 //     xDocSh->DoHardRecalc(true);
 //
 //     ScDocument& rDoc = xDocSh->GetDocument();
 //
-//     testFormats(this, rDoc, XLS);
+//     testFormats(this, rDoc, FORMAT_XLS);
 //     xDocSh->DoClose();
 // }
 
 // void ScFiltersTest::testFormatsXLSX()
 // {
-//     ScDocShellRef xDocSh = loadDoc("formats.", XLSX);
+//     ScDocShellRef xDocSh = loadDoc("formats.", FORMAT_XLSX);
 //     xDocSh->DoHardRecalc(true);
 //
 //     ScDocument& rDoc = xDocSh->GetDocument();
 //
-//     testFormats(this, rDoc, XLSX);
+//     testFormats(this, rDoc, FORMAT_XLSX);
 //     xDocSh->DoClose();
 // }
 
 void ScFiltersTest::testMatrixODS()
 {
-    ScDocShellRef xDocSh = loadDoc("matrix.", ODS);
+    ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_ODS);
     xDocSh->DoHardRecalc(true);
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -858,7 +857,7 @@ void ScFiltersTest::testMatrixODS()
 
 void ScFiltersTest::testMatrixXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("matrix.", XLS);
+    ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_XLS);
     xDocSh->DoHardRecalc(true);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is());
@@ -873,7 +872,7 @@ void ScFiltersTest::testMatrixXLS()
 
 void ScFiltersTest::testBorderODS()
 {
-    ScDocShellRef xDocSh = loadDoc("border.", ODS);
+    ScDocShellRef xDocSh = loadDoc("border.", FORMAT_ODS);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load border.*", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -969,7 +968,7 @@ void ScFiltersTest::testBordersOoo33()
     borders.push_back(Border(4, 9, 80, 80, 80, 80, 80, 0, 0, 80, 0, 0, 80, 0, 0, 80, 0, 0, 0, 0, 0, 0));
     borders.push_back(Border(4, 11, 100, 100, 100, 100, 100, 0, 0, 100, 0, 0, 100, 0, 0, 100, 0, 0, 0, 0, 0, 0));
 
-    ScDocShellRef xDocSh = loadDoc("borders_ooo33.", ODS);
+    ScDocShellRef xDocSh = loadDoc("borders_ooo33.", FORMAT_ODS);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load borders_ooo33.*", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1022,7 +1021,7 @@ void ScFiltersTest::testBordersOoo33()
 
 void ScFiltersTest::testBugFixesODS()
 {
-    ScDocShellRef xDocSh = loadDoc("bug-fixes.", ODS);
+    ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.Is());
 
     xDocSh->DoHardRecalc(true);
@@ -1058,7 +1057,7 @@ void ScFiltersTest::testBugFixesODS()
 
 void ScFiltersTest::testBugFixesXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("bug-fixes.", XLS);
+    ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is());
 
     xDocSh->DoHardRecalc(true);
@@ -1068,7 +1067,7 @@ void ScFiltersTest::testBugFixesXLS()
 
 void ScFiltersTest::testBugFixesXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("bug-fixes.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is());
 
     xDocSh->DoHardRecalc(true);
@@ -1097,7 +1096,7 @@ void checkMergedCells( ScDocument& rDoc, const ScAddress& rStartAddress,
 
 void ScFiltersTest::testMergedCellsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("merged.", ODS);
+    ScDocShellRef xDocSh = loadDoc("merged.", FORMAT_ODS);
     ScDocument& rDoc = xDocSh->GetDocument();
 
     //check sheet1 content
@@ -1123,7 +1122,7 @@ void ScFiltersTest::testMergedCellsODS()
 
 void ScFiltersTest::testRepeatedColumnsODS()
 {
-    ScDocShellRef xDocSh = loadDoc("repeatedColumns.", ODS);
+    ScDocShellRef xDocSh = loadDoc("repeatedColumns.", FORMAT_ODS);
     ScDocument& rDoc = xDocSh->GetDocument();
 
     //text
@@ -1244,7 +1243,7 @@ void checkCellValidity( const ScAddress& rValBaseAddr, const ScRange& rRange, co
 
 void ScFiltersTest::testDataValidityODS()
 {
-    ScDocShellRef xDocSh = loadDoc("dataValidity.", ODS);
+    ScDocShellRef xDocSh = loadDoc("dataValidity.", FORMAT_ODS);
     ScDocument& rDoc = xDocSh->GetDocument();
 
     ScAddress aValBaseAddr1( 2,6,0 ); //sheet1
@@ -1290,7 +1289,7 @@ void ScFiltersTest::testDataValidityODS()
 
 void ScFiltersTest::testDataTableMortgageXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("data-table/mortgage.", XLS);
+    ScDocShellRef xDocSh = loadDoc("data-table/mortgage.", FORMAT_XLS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is());
 
     ScFormulaOptions aOptions;
@@ -1343,7 +1342,7 @@ void ScFiltersTest::testDataTableMortgageXLS()
 
 void ScFiltersTest::testDataTableOneVarXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("data-table/one-variable.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("data-table/one-variable.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is());
 
     ScFormulaOptions aOptions;
@@ -1390,7 +1389,7 @@ void ScFiltersTest::testDataTableOneVarXLSX()
 
 void ScFiltersTest::testDataTableMultiTableXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("data-table/multi-table.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("data-table/multi-table.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is());
 
     ScFormulaOptions aOptions;
@@ -1425,14 +1424,14 @@ void ScFiltersTest::testDataTableMultiTableXLSX()
 void ScFiltersTest::testBrokenQuotesCSV()
 {
     const OUString aFileNameBase("fdo48621_broken_quotes.");
-    OUString aFileExtension(getFileFormats()[CSV].pName, strlen(getFileFormats()[CSV].pName), RTL_TEXTENCODING_UTF8 );
-    OUString aFilterName(getFileFormats()[CSV].pFilterName, strlen(getFileFormats()[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ;
+    OUString aFileExtension(getFileFormats()[FORMAT_CSV].pName, strlen(getFileFormats()[FORMAT_CSV].pName), RTL_TEXTENCODING_UTF8 );
+    OUString aFilterName(getFileFormats()[FORMAT_CSV].pFilterName, strlen(getFileFormats()[FORMAT_CSV].pFilterName), RTL_TEXTENCODING_UTF8) ;
     OUString aFileName;
     createFileURL(aFileNameBase, aFileExtension, aFileName);
-    OUString aFilterType(getFileFormats()[CSV].pTypeName, strlen(getFileFormats()[CSV].pTypeName), RTL_TEXTENCODING_UTF8);
-    std::cout << getFileFormats()[CSV].pName << " Test" << std::endl;
+    OUString aFilterType(getFileFormats()[FORMAT_CSV].pTypeName, strlen(getFileFormats()[FORMAT_CSV].pTypeName), RTL_TEXTENCODING_UTF8);
+    std::cout << getFileFormats()[FORMAT_CSV].pName << " Test" << std::endl;
 
-    SfxFilterFlags nFormatType = getFileFormats()[CSV].nFormatType;
+    SfxFilterFlags nFormatType = getFileFormats()[FORMAT_CSV].nFormatType;
     SotClipboardFormatId nClipboardId = bool(nFormatType) ? SotClipboardFormatId::STARCALC_8 : SotClipboardFormatId::NONE;
     ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType,
         nFormatType, nClipboardId);
@@ -1452,14 +1451,14 @@ void ScFiltersTest::testBrokenQuotesCSV()
 void ScFiltersTest::testCellValueXLSX()
 {
     const OUString aFileNameBase("cell-value.");
-    OUString aFileExtension(getFileFormats()[XLSX].pName, strlen(getFileFormats()[XLSX].pName), RTL_TEXTENCODING_UTF8 );
-    OUString aFilterName(getFileFormats()[XLSX].pFilterName, strlen(getFileFormats()[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
+    OUString aFileExtension(getFileFormats()[FORMAT_XLSX].pName, strlen(getFileFormats()[FORMAT_XLSX].pName), RTL_TEXTENCODING_UTF8 );
+    OUString aFilterName(getFileFormats()[FORMAT_XLSX].pFilterName, strlen(getFileFormats()[FORMAT_XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
     OUString aFileName;
     createFileURL(aFileNameBase, aFileExtension, aFileName);
-    OUString aFilterType(getFileFormats()[XLSX].pTypeName, strlen(getFileFormats()[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
-    std::cout << getFileFormats()[XLSX].pName << " Test" << std::endl;
+    OUString aFilterType(getFileFormats()[FORMAT_XLSX].pTypeName, strlen(getFileFormats()[FORMAT_XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
+    std::cout << getFileFormats()[FORMAT_XLSX].pName << " Test" << std::endl;
 
-    SfxFilterFlags nFormatType = getFileFormats()[XLSX].nFormatType;
+    SfxFilterFlags nFormatType = getFileFormats()[FORMAT_XLSX].nFormatType;
     SotClipboardFormatId nClipboardId = bool(nFormatType) ? SotClipboardFormatId::STARCALC_8 : SotClipboardFormatId::NONE;
     ScDocShellRef xDocSh = ScBootstrapFixture::load( aFileName, aFilterName, OUString(), aFilterType,
         nFormatType, nClipboardId);
@@ -1476,7 +1475,7 @@ void ScFiltersTest::testCellValueXLSX()
 
 void ScFiltersTest::testRowIndex1BasedXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("row-index-1-based.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("row-index-1-based.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -1564,7 +1563,7 @@ void ScFiltersTest::testPasswordWrongSHA()
 
 void ScFiltersTest::testControlImport()
 {
-    ScDocShellRef xDocSh = loadDoc("singlecontrol.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("singlecontrol.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load singlecontrol.xlsx", xDocSh.Is());
 
     uno::Reference< frame::XModel > xModel = xDocSh->GetModel();
@@ -1580,7 +1579,7 @@ void ScFiltersTest::testControlImport()
 
 void ScFiltersTest::testChartImportODS()
 {
-    ScDocShellRef xDocSh = loadDoc("chart-import-basic.", ODS);
+    ScDocShellRef xDocSh = loadDoc("chart-import-basic.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load chart-import-basic.ods.", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1614,7 +1613,7 @@ void ScFiltersTest::testChartImportODS()
 
 void ScFiltersTest::testChartImportXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("chartx.", XLS);
+    ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1631,7 +1630,7 @@ void ScFiltersTest::testChartImportXLS()
 
 void ScFiltersTest::testNumberFormatHTML()
 {
-    ScDocShellRef xDocSh = loadDoc("numberformat.", HTML);
+    ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_HTML);
     CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1658,7 +1657,7 @@ void ScFiltersTest::testNumberFormatHTML()
 
 void ScFiltersTest::testNumberFormatCSV()
 {
-    ScDocShellRef xDocSh = loadDoc("numberformat.", CSV);
+    ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_CSV);
     CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1685,7 +1684,7 @@ void ScFiltersTest::testNumberFormatCSV()
 
 void ScFiltersTest::testCellAnchoredShapesODS()
 {
-    ScDocShellRef xDocSh = loadDoc("cell-anchored-shapes.", ODS);
+    ScDocShellRef xDocSh = loadDoc("cell-anchored-shapes.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.ods", xDocSh.Is());
 
     // There are two cell-anchored objects on the first sheet.
@@ -1713,7 +1712,7 @@ void ScFiltersTest::testCellAnchoredShapesODS()
 
 void ScFiltersTest::testCellAnchoredHiddenShapesXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("cell-anchored-hidden-shapes.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("cell-anchored-hidden-shapes.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.xlsx", xDocSh.Is());
 
     // There are two cell-anchored objects on the first sheet.
@@ -1755,7 +1754,7 @@ bool hasDimension(const std::vector<const ScDPSaveDimension*>& rDims, const OUSt
 
 void ScFiltersTest::testPivotTableBasicODS()
 {
-    ScDocShellRef xDocSh = loadDoc("pivot-table-basic.", ODS);
+    ScDocShellRef xDocSh = loadDoc("pivot-table-basic.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1818,7 +1817,7 @@ void ScFiltersTest::testPivotTableBasicODS()
 
 void ScFiltersTest::testPivotTableNamedRangeSourceODS()
 {
-    ScDocShellRef xDocSh = loadDoc("pivot-table-named-range-source.", ODS);
+    ScDocShellRef xDocSh = loadDoc("pivot-table-named-range-source.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-named-range-source.ods", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -1874,7 +1873,7 @@ bool checkVisiblePageFieldMember( const ScDPSaveDimension::MemberList& rMembers,
 
 void ScFiltersTest::testPivotTableSharedCacheGroupODS()
 {
-    ScDocShellRef xDocSh = loadDoc("pivot-table-shared-cache-with-group.", ODS);
+    ScDocShellRef xDocSh = loadDoc("pivot-table-shared-cache-with-group.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2009,7 +2008,7 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS()
 
 void ScFiltersTest::testGetPivotDataXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("pivot-getpivotdata.", XLS);
+    ScDocShellRef xDocSh = loadDoc("pivot-getpivotdata.", FORMAT_XLS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll();
@@ -2025,7 +2024,7 @@ void ScFiltersTest::testGetPivotDataXLS()
 
 void ScFiltersTest::testRowHeightODS()
 {
-    ScDocShellRef xDocSh = loadDoc("row-height-import.", ODS);
+    ScDocShellRef xDocSh = loadDoc("row-height-import.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load row-height-import.ods", xDocSh.Is());
 
     SCTAB nTab = 0;
@@ -2068,7 +2067,7 @@ void ScFiltersTest::testRowHeightODS()
 
 void ScFiltersTest::testRichTextContentODS()
 {
-    ScDocShellRef xDocSh = loadDoc("rich-text-cells.", ODS);
+    ScDocShellRef xDocSh = loadDoc("rich-text-cells.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to load rich-text-cells.ods", xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2328,7 +2327,7 @@ void ScFiltersTest::testRichTextContentODS()
 
 void ScFiltersTest::testDataBarODS()
 {
-    ScDocShellRef xDocSh = loadDoc("databar.", ODS);
+    ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2339,7 +2338,7 @@ void ScFiltersTest::testDataBarODS()
 
 void ScFiltersTest::testDataBarXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("databar.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2350,7 +2349,7 @@ void ScFiltersTest::testDataBarXLSX()
 
 void ScFiltersTest::testColorScaleODS()
 {
-    ScDocShellRef xDocSh = loadDoc("colorscale.", ODS);
+    ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2362,7 +2361,7 @@ void ScFiltersTest::testColorScaleODS()
 
 void ScFiltersTest::testColorScaleXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("colorscale.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2374,7 +2373,7 @@ void ScFiltersTest::testColorScaleXLSX()
 
 void ScFiltersTest::testNewCondFormatODS()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "new_cond_format_test.", ODS );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_ODS);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods", xDocSh.Is());
 
@@ -2390,7 +2389,7 @@ void ScFiltersTest::testNewCondFormatODS()
 
 void ScFiltersTest::testNewCondFormatXLSX()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "new_cond_format_test.", XLSX );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_XLSX);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.Is());
 
@@ -2406,7 +2405,7 @@ void ScFiltersTest::testNewCondFormatXLSX()
 
 void ScFiltersTest::testCondFormatThemeColorXLSX()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "condformat_theme_color.", XLSX );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("condformat_theme_color.", FORMAT_XLSX);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load condformat_theme_color.xlsx", xDocSh.Is());
 
@@ -2442,7 +2441,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX()
 
 void ScFiltersTest::testCondFormatThemeColor2XLSX()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "cond_format_theme_color2.", XLSX );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_format_theme_color2.", FORMAT_XLSX);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load cond_format_theme_color2.xlsx", xDocSh.Is());
 
@@ -2499,7 +2498,7 @@ void testCustomIconSetsXLSX_Impl(ScDocument& rDoc, SCCOL nCol, SCROW nRow, ScIco
 
 void ScFiltersTest::testComplexIconSetsXLSX()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "complex_icon_set.", XLSX );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("complex_icon_set.", FORMAT_XLSX);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load complex_icon_set.xlsx", xDocSh.Is());
 
@@ -2523,7 +2522,7 @@ void ScFiltersTest::testComplexIconSetsXLSX()
 
 void ScFiltersTest::testCondFormatParentXLSX()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "cond_parent.", XLSX );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_parent.", FORMAT_XLSX);
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load cond_parent.xlsx", xDocSh.Is());
 
@@ -2537,7 +2536,7 @@ void ScFiltersTest::testCondFormatParentXLSX()
 
 void ScFiltersTest::testLiteralInFormulaXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("shared-string/literal-in-formula.", XLS);
+    ScDocShellRef xDocSh = loadDoc("shared-string/literal-in-formula.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2550,7 +2549,7 @@ void ScFiltersTest::testLiteralInFormulaXLS()
 
 void ScFiltersTest::testFormulaDependency()
 {
-    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc( "dependencyTree.", ODS );
+    ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("dependencyTree.", FORMAT_ODS);
 
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2592,11 +2591,11 @@ void ScFiltersTest::testMiscRowHeights()
            have default row heights ( there was a problem where the optimal
            height was being calcuated after import if no hard height )
         */
-        { "alldefaultheights.", ODS, -1, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
+        { "alldefaultheights.", FORMAT_ODS, -1, SAL_N_ELEMENTS(DfltRowData), DfltRowData },
         /* Checks the imported height of some multiline input, additionally checks
            that the optimal height flag is set ( or not )
         */
-        { "multilineoptimal.", ODS, -1, SAL_N_ELEMENTS(MultiLineOptData), MultiLineOptData },
+        { "multilineoptimal.", FORMAT_ODS, -1, SAL_N_ELEMENTS(MultiLineOptData), MultiLineOptData },
     };
     miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
 }
@@ -2607,7 +2606,7 @@ void ScFiltersTest::testMiscRowHeights()
 
 void ScFiltersTest::testOptimalHeightReset()
 {
-    ScDocShellRef xDocSh = loadDoc("multilineoptimal.", ODS, true);
+    ScDocShellRef xDocSh = loadDoc("multilineoptimal.", FORMAT_ODS, true);
     SCTAB nTab = 0;
     SCROW nRow = 0;
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2643,7 +2642,7 @@ void ScFiltersTest::testOptimalHeightReset()
 
 void ScFiltersTest::testPrintRangeODS()
 {
-    ScDocShellRef xDocSh = loadDoc("print-range.", ODS);
+    ScDocShellRef xDocSh = loadDoc("print-range.", FORMAT_ODS);
     ScDocument& rDoc = xDocSh->GetDocument();
     const ScRange* pRange = rDoc.GetRepeatRowRange(0);
     CPPUNIT_ASSERT(pRange);
@@ -2658,7 +2657,7 @@ void ScFiltersTest::testPrintRangeODS()
 
 void ScFiltersTest::testOutlineODS()
 {
-    ScDocShellRef xDocSh = loadDoc("outline.", ODS);
+    ScDocShellRef xDocSh = loadDoc("outline.", FORMAT_ODS);
     ScDocument& rDoc = xDocSh->GetDocument();
 
     const ScOutlineTable* pTable = rDoc.GetOutlineTable(0);
@@ -2713,7 +2712,7 @@ void ScFiltersTest::testOutlineODS()
 
 void ScFiltersTest::testColumnStyleXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("column-style.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("column-style.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2734,7 +2733,7 @@ void ScFiltersTest::testColumnStyleXLSX()
 
 void ScFiltersTest::testSharedFormulaHorizontalXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("shared-formula/horizontal.", XLS);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/horizontal.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2774,7 +2773,7 @@ void ScFiltersTest::testSharedFormulaHorizontalXLS()
 
 void ScFiltersTest::testSharedFormulaWrappedRefsXLS()
 {
-    ScDocShellRef xDocSh = loadDoc("shared-formula/wrapped-refs.", XLS);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/wrapped-refs.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll();
@@ -2802,7 +2801,7 @@ void ScFiltersTest::testSharedFormulaWrappedRefsXLS()
 
 void ScFiltersTest::testSharedFormulaBIFF5()
 {
-    ScDocShellRef xDocSh = loadDoc("shared-formula/biff5.", XLS);
+    ScDocShellRef xDocSh = loadDoc("shared-formula/biff5.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll();
@@ -2818,7 +2817,7 @@ void ScFiltersTest::testSharedFormulaBIFF5()
 
 void ScFiltersTest::testSharedFormulaXLSB()
 {
-    ScDocShellRef xDocSh = loadDoc("shared_formula.", XLSB);
+    ScDocShellRef xDocSh = loadDoc("shared_formula.", FORMAT_XLSB);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
     rDoc.CalcAll();
@@ -2841,7 +2840,7 @@ void ScFiltersTest::testSharedFormulaXLS()
 {
     {
         // fdo#80091
-        ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs1.", XLS);
+        ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs1.", FORMAT_XLS);
         CPPUNIT_ASSERT(xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
         rDoc.CalcAll();
@@ -2862,7 +2861,7 @@ void ScFiltersTest::testSharedFormulaXLS()
 
     {
         // fdo#84556 and some related tests
-        ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs2.", XLS);
+        ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs2.", FORMAT_XLS);
         CPPUNIT_ASSERT(xDocSh.Is());
         ScDocument& rDoc = xDocSh->GetDocument();
         rDoc.CalcAll();
@@ -2930,7 +2929,7 @@ void ScFiltersTest::testSharedFormulaXLS()
 
 void ScFiltersTest::testExternalRefCacheXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("external-refs.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("external-refs.", FORMAT_XLSX);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -2945,7 +2944,7 @@ void ScFiltersTest::testExternalRefCacheXLSX()
 
 void ScFiltersTest::testExternalRefCacheODS()
 {
-    ScDocShellRef xDocSh = loadDoc("external-ref-cache.", ODS);
+    ScDocShellRef xDocSh = loadDoc("external-ref-cache.", FORMAT_ODS);
 
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2964,7 +2963,7 @@ void ScFiltersTest::testExternalRefCacheODS()
 
 void ScFiltersTest::testHybridSharedStringODS()
 {
-    ScDocShellRef xDocSh = loadDoc("hybrid-shared-string.", ODS);
+    ScDocShellRef xDocSh = loadDoc("hybrid-shared-string.", FORMAT_ODS);
 
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -2977,7 +2976,7 @@ void ScFiltersTest::testHybridSharedStringODS()
 
 void ScFiltersTest::testCopyMergedNumberFormats()
 {
-    ScDocShellRef xDocSh = loadDoc("copy-merged-number-formats.", ODS);
+    ScDocShellRef xDocSh = loadDoc("copy-merged-number-formats.", FORMAT_ODS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -3000,7 +2999,7 @@ void ScFiltersTest::testCopyMergedNumberFormats()
 
 void ScFiltersTest::testVBAUserFunctionXLSM()
 {
-    ScDocShellRef xDocSh = loadDoc("vba-user-function.", XLSM);
+    ScDocShellRef xDocSh = loadDoc("vba-user-function.", FORMAT_XLSM);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -3028,7 +3027,7 @@ void ScFiltersTest::testEmbeddedImageXLS()
     // The document has one embedded image on the first sheet.  Make sure it's
     // imported properly.
 
-    ScDocShellRef xDocSh = loadDoc("file-with-png-image.", XLS);
+    ScDocShellRef xDocSh = loadDoc("file-with-png-image.", FORMAT_XLS);
     CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument& rDoc = xDocSh->GetDocument();
 
@@ -3049,7 +3048,7 @@ void ScFiltersTest::testEmbeddedImageXLS()
 
 void ScFiltersTest::testErrorOnExternalReferences()
 {
-    ScDocShellRef xDocSh = loadDoc("blank.", ODS);
+    ScDocShellRef xDocSh = loadDoc("blank.", FORMAT_ODS);
     CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -3069,7 +3068,7 @@ void ScFiltersTest::testErrorOnExternalReferences()
 
 void ScFiltersTest::testEditEngStrikeThroughXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("strike-through.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("strike-through.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -3102,7 +3101,7 @@ void ScFiltersTest::testEditEngStrikeThroughXLSX()
 
 void ScFiltersTest::testRefStringXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("ref_string.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -3117,7 +3116,7 @@ void ScFiltersTest::testRefStringXLSX()
 
 void ScFiltersTest::testBnc762542()
 {
-    ScDocShellRef xDocSh = loadDoc("bnc762542.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("bnc762542.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();
@@ -3143,7 +3142,7 @@ void ScFiltersTest::testBnc762542()
 
 void ScFiltersTest::testHiddenSheetsXLSX()
 {
-    ScDocShellRef xDocSh = loadDoc("hidden_sheets.", XLSX);
+    ScDocShellRef xDocSh = loadDoc("hidden_sheets.", FORMAT_XLSX);
     CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
 
     ScDocument& rDoc = xDocSh->GetDocument();