automationdev300m87: Merge with changes from HDE (23bd77f198c9)

10 files changed, 562 insertions, 505 deletions

diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index ebcb1f4d8e57..a5ab31c82cdc 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -33,6 +33,9 @@
 
 testcase tEPS
 
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
     dim x as integer
     dim i as integer
 
@@ -96,6 +99,11 @@ endcase 'tEPS
 '-------------------------------------------------------------------------
 testcase tPCT
 
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
+
     dim x as integer
     dim i as integer
     dim iWaitIndex as integer
@@ -172,6 +180,10 @@ testcase tPCT
 endcase 'tPCT
 '-------------------------------------------------------------------------------
 testcase tPBM
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "PBM - Portable Bitmap (.pbm)"
     const sExt = ".pbm"
@@ -202,6 +214,10 @@ testcase tPBM
 endcase 'tPBM
 '-------------------------------------------------------------------------------
 testcase tPGM
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "PGM - Portable Graymap (.pgm)"
     const sExt = ".pgm"
@@ -231,6 +247,10 @@ testcase tPGM
 endcase 'tPGM
 '-------------------------------------------------------------------------------
 testcase tPPM
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "PPM - Portable Pixelmap (.ppm)"
     const sExt = ".ppm"
@@ -260,6 +280,10 @@ testcase tPPM
 endcase 'tPPM
 '------------------------------------------------------------------------------
 testcase tRAS
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "RAS - Sun Raster Image (.ras)"
     const sExt = ".ras"
@@ -280,6 +304,10 @@ testcase tRAS
 endcase 'tRAS
 '------------------------------------------------------------------------------
 testcase tTIFF
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     dim x as integer
     dim i as integer
@@ -303,6 +331,10 @@ testcase tTIFF
 endcase 'tTIFF
 '------------------------------------------------------------------------------
 testcase tXPM
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "XPM - X PixMap (.xpm)"
     const sExt = ".xpm"
@@ -323,6 +355,10 @@ testcase tXPM
 endcase 'tXPM
 '-------------------------------------------------------------------------------
 testcase tGIF
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "GIF - Graphics Interchange Format (.gif)"
     const sExt = ".gif"
@@ -353,6 +389,10 @@ testcase tGIF
 endcase 'tGIF
 '-------------------------------------------------------------------------------
 testcase tJPEG
+    warnlog( "#i115138# - Test document freezes draw" )
+    goto endsub
+
+
 
     const sFilter = "JPEG - Joint Photographic Experts Group (.jpg;.jpeg;.jfif;.jif;.jpe)"
     const sExt = ".jpg"
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index 3beefb13dd64..1e9d6e04f631 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -32,6 +32,9 @@
 '\******************************************************************************
 testcase tPNG
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim x as integer
     dim i as integer
     dim iWaitIndex as integer
@@ -73,6 +76,10 @@ endcase 'tPNG
 '-------------------------------------------------------------------------------
 testcase tSVM
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
+
     dim x as integer
     dim i as integer
     dim sFilter as string
@@ -238,6 +245,10 @@ endcase 'tSVM
 '-------------------------------------------------------------------------------
 testcase tPDF
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
+
     dim sPath as string
     dim sTemp as string
     dim iFileSize(12) as long
@@ -589,6 +600,9 @@ endcase 'tPDF_Creator
 '-------------------------------------------------------------------------------
 testcase tSVG
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim x as integer
     dim i as integer
     dim sFilter as string
@@ -654,6 +668,9 @@ endcase 'tSVG
 '-------------------------------------------------------------------------------
 testcase tBMP
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
    dim x as integer
    dim i as integer
    dim bTemp as boolean
@@ -821,6 +838,9 @@ endcase 'tBMP
 '-------------------------------------------------------------------------------
 testcase tEMF
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim x as integer
     dim i as integer
     dim sFilter as string
@@ -952,6 +972,9 @@ endcase 'tEMF
 '-------------------------------------------------------------------------------
 testcase tMET
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim x as integer
     dim i as integer
     dim iWaitIndex as integer
@@ -1145,6 +1168,9 @@ endcase 'tMET
 '-------------------------------------------------------------------------------
 testcase tSWF
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim sFilter as string
     dim sExt as string
     dim x as integer
@@ -1170,6 +1196,9 @@ endcase 'tSWF
 '------------------------------------------------------------------------------
 testcase tWMF
 
+    warnlog( "#i115138 - Loading test document freezes the office" )
+    goto endsub
+
     dim x as integer
     dim i as integer
     dim iWaitIndex as integer
diff --git a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc
index 62057f32c798..6d57e1f13fcf 100644
--- a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc
+++ b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc
@@ -204,6 +204,7 @@ testcase tArrayconstants01
     '///Close Document
     printlog "Close Document"
     call hCloseDocument
+    hFileDelete( sLocalFile )
 
 endcase
 '
@@ -212,13 +213,11 @@ endcase
 testcase tArrayconstants02
 
     Dim sImportFile as string
-    Dim sLocalFile as string
     Dim sFunctionSUM as string
     Dim sFunctionMDETERM as string
     Dim sCellcontent as string
     
     sImportFile = convertpath ( gTesttoolpath & "spreadsheet/optional/input/arrayconstants.xls" )
-    sLocalFile = convertpath ( gOfficepath & "user/work/arrayconstants.xls" )
     sFunctionSUM = fFunctionName ("SUM")
     sFunctionMDETERM = fFunctionName ("MDETERM")
     
@@ -260,7 +259,7 @@ testcase tArrayconstants02
     
     '/// Save document back to xls locally
     printlog "Save document back to xls locally"
-    call hFileSaveAsKill ( slocalfile )
+    call hFileSaveAsKill ( gLastWorkFile )
     
     '/// Close document
     printlog "Close document"
@@ -268,7 +267,7 @@ testcase tArrayconstants02
 
     '/// Load Document
     printlog "Load Document"
-    call hFileOpen ( slocalfile )
+    call hFileOpen ( gLastWorkFile )
     sleep (2)
 
     '///Check that all cellvalues are the same as before
@@ -308,5 +307,6 @@ testcase tArrayconstants02
     '///Close document
     printlog "Close document"
     call hCloseDocument
+    hFileDelete( gLastWorkFile )
 
 endcase
diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
index 3afee9815c89..9e25d898d8ce 100644
--- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
+++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
@@ -40,7 +40,8 @@
 testcase tIBIS111099
 
     Dim testdoc as string
-    testdoc = convertpath(gTesttoolpath & "spreadsheet\optional\input\111099.xls")
+    testdoc = convertpath( gTesttoolpath & "spreadsheet\optional\input\111099.xls" )
+
     printlog " Open the test document"
     hFileOpenLocally(testdoc)
 
@@ -67,7 +68,7 @@ testcase tIBIS111158
 
     Dim testdoc as string
     Dim testString as string
-    testdoc = convertpath(gTesttoolpath & "spreadsheet\optional\input\111158.xls")
+    testdoc = convertpath( gTesttoolpath & "spreadsheet\optional\input\111158.xls" )
 
     printlog " Open the test document"
     hFileOpenLocally(testdoc)
diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc
index e6e8030da3e5..873ca1bddabc 100644
--- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc
+++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc
@@ -31,16 +31,16 @@
 '**
 '************************************************************************
 ' **
-' #1 tIZ19381             ' I/O error when OLE object is thrown out of undo/redo buffer  
+' #1 tIZ19381             ' I/O error when OLE object is thrown out of undo/redo buffer
 ' #1 tIZ21036             ' Crash after shifting cells with paste special
 ' **
 '\***********************************************************************
 
 testcase tIZ19381
-    Dim sOutputFile as string 
+    Dim sOutputFile as string
     Dim i as integer
-    
-    sOutputFile = convertpath(gOfficepath & "user/work/i19381.ods") 
+
+    sOutputFile = convertpath(gOfficepath & "user/work/i19381.ods")
     printlog "IssueZilla Task 19381"
 
     '/// File / New / Spreadsheet
@@ -52,10 +52,10 @@ testcase tIZ19381
     Kontext "DocumentCalc"
     DocumentCalc.typekeys "1<RETURN>2<RETURN><UP>"
     sleep(2)
-    '/// Insert / Chart    
-    InsertChartCalc    
+    '/// Insert / Chart
+    InsertChartCalc
     Kontext "ChartWizard"
-    '/// On the chart wizard press OK button 
+    '/// On the chart wizard press OK button
     if ChartWizard.Exists(2) then
         printlog "Create chart"
         ChartWizard.OK
@@ -64,18 +64,18 @@ testcase tIZ19381
         warnlog "Chart wizard did not occour! Exiting test case."
         call hCloseDocument
         goto endsub
-    end if    
+    end if
     Kontext "DocumentCalc"
     '/// Type [ESCAPE]
-    DocumentCalc.typekeys "<Escape>"    
-    sleep(2)    
+    DocumentCalc.typekeys "<Escape>"
+    sleep(2)
     '/// File Save As <i>gOfficepath</i>user/work/i19381.ods
     if NOT hFileSaveAsWithFilterKill (sOutputFile, "calc8") then
         warnlog "Saving test document localy failed -> Aborting"
         call hCloseDocument
         goto endsub
     end if
-    sleep(2)  
+    sleep(2)
     '/// File / Close
     call hCloseDocument
     sleep(2)
@@ -83,21 +83,21 @@ testcase tIZ19381
     if hFileOpen(sOutputFile) then
         Kontext "DocumentCalc"
         '/// Click into the chart
-        call gMouseClick(95,95)        
+        call gMouseClick(95,95)
         Kontext "DocumentCalc"
         '/// Press [F5] to open the Navigator
         '/// Select the first Chart/OLE object in the navigator
         call fselectFirstOLE
         '/// Edit / Cut
-        sleep(2)         
+        sleep(2)
         EditCut
-        sleep(2)        
+        sleep(2)
         Kontext "DocumentCalc"
         '/// Type [ESCAPE] twice
         DocumentCalc.TypeKeys "<ESCAPE>" , 2
         '/// Edit / Paste
         EditPaste
-        sleep(2)        
+        sleep(2)
         Kontext "DocumentCalc"
         '/// press [CTRL+S] to save the document again
         DocumentCalc.typekeys "<MOD1 S>"
@@ -112,7 +112,7 @@ testcase tIZ19381
             Active.OK
             call hCloseDocument
             goto endsub
-        end if        
+        end if
         Kontext "DocumentCalc"
         '/// Type [ESCAPE]
         DocumentCalc.TypeKeys "<ESCAPE>"
@@ -120,10 +120,10 @@ testcase tIZ19381
         call fCalcSelectRange("E42")
         for i = 1 to 21
             Kontext "DocumentCalc"
-            '/// Enter 1 and [RETURN] 21 times 
+            '/// Enter 1 and [RETURN] 21 times
             '///+ as changes to get chart cut/paste out of the undo buffer
             DocumentCalc.typekeys "1<Return>"
-        next i        
+        next i
         Kontext "DocumentCalc"
         '/// Type [CTRL + S] to save the document again
         DocumentCalc.typekeys "<MOD1 S>"
@@ -137,8 +137,8 @@ testcase tIZ19381
             end if
         else
             printlog "No message box is in the way!"
-        end if    
-        '/// File / Close        
+        end if
+        '/// File / Close
         call hCloseDocument
     else
         warnlog "It was not possible to open the saved document again!"
@@ -149,63 +149,63 @@ endcase
 
 testcase tIZ21036
 
-printlog "IssueZilla Task 21036"
-
-'/// open new document
-call hNewDocument
-sleep(2)
-
-'/// select a whole row (e.g. A1:IV1)
-Kontext "DocumentCalc"
-DocumentCalc.typekeys "<SHIFT MOD1 RIGHT>"
-sleep(2)
-
-'/// cut selection
-try
-  EditCut
-catch
-  QAErrorLog "Is this a crash?? Please check it out!"
-  goto endsub
-endcatch
-sleep(2)
-
-'/// go to A2
-Kontext "DocumentCalc"
-call fCalcSelectRange("A2")
-sleep(2)
-Kontext "DocumentCalc"
-'/// call edit->paste special
-EditPasteSpecialCalc
-sleep(2)
-
-'/// check shift cells->right
-Kontext "InhalteEinfuegenCalc"
-NachRechts.Check
-
-'/// OK
-InhalteEinfuegenCalc.OK
-
-'/// confirm MsgBox
-Kontext "Active"
-  if Active.Exists(2) then
-     if Active.GetRT = 304 then
-        printlog Active.GetText
-        Active.OK
-        sleep(2)
-     end if
-  else
-     warnlog "No message box came up!"
-     goto endsub
-  end if
-
-'/// check for crash
-try
-   printlog "OK, there are still " & GetDocumentCount & " documents open"
-catch 
-   warnlog "Probably the office did crash -> #I21036#"
-   goto endsub
-endcatch
-  
-call hCloseDocument
+    printlog "IssueZilla Task 21036"
+
+    '/// open new document
+    call hNewDocument
+    sleep(2)
+
+    '/// select a whole row (e.g. A1:IV1)
+    Kontext "DocumentCalc"
+    DocumentCalc.typekeys "<SHIFT MOD1 RIGHT>"
+    sleep(2)
+
+    '/// cut selection
+    try
+        EditCut
+    catch
+        QAErrorLog "Is this a crash?? Please check it out!"
+        goto endsub
+    endcatch
+    sleep(2)
+
+    '/// go to A2
+    Kontext "DocumentCalc"
+    call fCalcSelectRange("A2")
+    sleep(2)
+    Kontext "DocumentCalc"
+    '/// call edit->paste special
+    EditPasteSpecialCalc
+    sleep(2)
+
+    '/// check shift cells->right
+    Kontext "InhalteEinfuegenCalc"
+    NachRechts.Check
+
+    '/// OK
+    InhalteEinfuegenCalc.OK
+
+    '/// confirm MsgBox
+    Kontext "Active"
+    if Active.Exists(2) then
+        if Active.GetRT = 304 then
+            printlog Active.GetText
+            Active.OK
+            sleep(2)
+        end if
+    else
+        warnlog "No message box came up!"
+        goto endsub
+    end if
+
+    '/// check for crash
+    try
+        printlog "OK, there are still " & GetDocumentCount & " documents open"
+    catch
+        warnlog "Probably the office did crash -> #I21036#"
+        goto endsub
+    endcatch
+
+    call hCloseDocument
 endcase
 
diff --git a/testautomation/spreadsheet/optional/includes/validity/c_validity.inc b/testautomation/spreadsheet/optional/includes/validity/c_validity.inc
index 8eaf0401afeb..f1f33573f66e 100644
--- a/testautomation/spreadsheet/optional/includes/validity/c_validity.inc
+++ b/testautomation/spreadsheet/optional/includes/validity/c_validity.inc
@@ -29,194 +29,189 @@
 '**
 '** short description :  Complete test for data validity
 '**
-'************************************************************************
-' **
-' #1 tValidity_Check_Message
-' #1 tValidity_Check_Excel
-' **
 '\***********************************************************************
 
 testcase tValidity_Check_Message
 
-	printlog "This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells"
+    printlog "This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells"
 
     dim sInputFile as string
     dim sOutputFile as string
     dim sMType as string
     dim sInfoStr as string
     dim iCount as integer
-    
+
     sInputFile = convertpath(gTesttoolPath & "spreadsheet/optional/input/validity.ods")
-	sOutputFile = convertpath (gOfficepath & "user/work/validity.ods.ods)"
+    sOutputFile = convertpath (gOfficepath & "user/work/validity.ods.ods)"
 
-	printlog " Open document  <i>gTesttoolPath</i>spreadsheet/optional/input/validity.ods"
-	call hFileOpen (sInputFile)
-	printlog " Save the document under <i>gOfficePath</i>user/work/validity.ods"
-	if NOT hFileSaveAsWithFilter ( sOutputFile, "calc8" ) then
-		warnlog "Saving test document localy failed -> Aborting"
-		call hCloseDocument
-		goto endsub
-	endif
+    printlog " Open document  <i>gTesttoolPath</i>spreadsheet/optional/input/validity.ods"
+    call hFileOpen (sInputFile)
+    printlog " Save the document under <i>gOfficePath</i>user/work/validity.ods"
+    if NOT hFileSaveAsWithFilter ( sOutputFile, "calc8" ) then
+        warnlog "Saving test document localy failed -> Aborting"
+        call hCloseDocument
+        goto endsub
+    endif
 
-	printlog " Do the following operations (see values in table) with every of the 4 sheets."
-	printlog " Goto first cell and insert the correct value"
-	printlog " Press RETURN"
-	printlog "  No warning or information message should appear"
-	printlog " Enter the incorrect value"
-	printlog " Press RETURN"
-	printlog "  A warning or information message should appear"
-	for iCount = 1 to 4
-		select case iCount
-			case 1 : sMType = "Stop"          : sInfoStr = "First"
-			case 2 : sMType = "Warning"       : sInfoStr = "Second"
-			case 3 : sMType = "Information"   : sInfoStr = "Third"
-			case 4 : sMType = "Macro"         : sInfoStr = "Macro"
-		end select
+    printlog " Do the following operations (see values in table) with every of the 4 sheets."
+    printlog " Goto first cell and insert the correct value"
+    printlog " Press RETURN"
+    printlog "  No warning or information message should appear"
+    printlog " Enter the incorrect value"
+    printlog " Press RETURN"
+    printlog "  A warning or information message should appear"
+    for iCount = 1 to 4
+        select case iCount
+        case 1 : sMType = "Stop"          : sInfoStr = "First"
+        case 2 : sMType = "Warning"       : sInfoStr = "Second"
+        case 3 : sMType = "Information"   : sInfoStr = "Third"
+        case 4 : sMType = "Macro"         : sInfoStr = "Macro"
+        end select
 
-		call fCalcSelectSheet(sMType)
+        call fCalcSelectSheet(sMType)
         printlog " *** " & sInfoStr & " it is checked, if the " & sMType & " messages appears, if wrong contents are inserted into the appropriate cells"
-    '///+<UL>            
-    '///+<LI>Goto first cell and insert the <i>correct value</i></LI> 
-    '///+<LI>Press RETURN</LI>
-    '///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI>
-    '///+<LI>Enter the <i>incorrect value</I> 
-    '///+<LI>Press RETURN</LI>
-    '///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI> 
-    '///+<LI><TABLE BORDER=1>
-    '///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR>
-    '///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR>
-          call check_message(sMType, "B4", "3", "8")
-    '///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR>
-          call check_message(sMType, "B5", "9", "10")
-    '///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR>      
-          call check_message(sMType, "B6", "28", "25")
-    '///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR>      
-          call check_message(sMType, "B7", "10", "12")
-    '///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR>      
-          call check_message(sMType, "B8", "11", "9")
-    '///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR>      
-          call check_message(sMType, "B9", "5", "3")
-    '///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR>      
-          call check_message(sMType, "B10", "1", "6")
-    '///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR>      
-          call check_message(sMType, "B11", "1", "6")
-    '///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR>      
-          call check_message(sMType, "B17", "3,14", "3,15")
-    '///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR>     
-          call check_message(sMType, "B18", "10,14", "10,16")
-    '///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR>      
-          call check_message(sMType, "B19", "25,10", "25,09")
-    '///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR>      
-          call check_message(sMType, "B20", "10,5", "10,7")
-    '///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR>      
-          call check_message(sMType, "B21", "11,9", "10")
-    '///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR>      
-          call check_message(sMType, "B22", "3,145", "3,14")
-    '///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR>      
-          call check_message(sMType, "B23", "1,45", "1,38")
-    '///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR>      
-          call check_message(sMType, "B24", "2,03", "2,15")
-    '///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR>      
-          call check_message(sMType, "E4", "13.12.99", "13.11.99")
-    '///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR>      
-          call check_message(sMType, "E5", "12.12.99", "13.12.99")
-    '///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR>      
-          call check_message(sMType, "E6", "14.12.99", "13.12.99")
-    '///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR>      
-          call check_message(sMType, "E7", "13.12.99", "14.12.99")
-    '///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR>
-          call check_message(sMType, "E8", "13.12.99", "12.12.99")
-    '///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR>      
-          call check_message(sMType, "E9", "13.11.99", "13.12.99")
-    '///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR>      
-          call check_message(sMType, "E10", "23.12.99", "12.12.99")
-    '///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR>      
-          call check_message(sMType, "E11", "24.12.99", "23.12.99")
-    '///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR>      
-          call check_message(sMType, "E17", "13:15", "13:16")
-    '///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR>      
-          call check_message(sMType, "E18", "10:15", "14:16")
-    '///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR>      
-          call check_message(sMType, "E19", "23:10", "12:09")
-    '///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR>      
-          call check_message(sMType, "E20", "13:15", "13:16")
-    '///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:14</TD></TR>      
-          call check_message(sMType, "E21", "13:15", "13:14")
-    '///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR>      
-          call check_message(sMType, "E22", "13:16", "13:15")
-    '///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR>      
-          call check_message(sMType, "E23", "13:15", "23:13")
-    '///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR>
-          call check_message(sMType, "E24", "12:59", "13:00")
-    '///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR>           
-          call check_message(sMType, "H4", "abc", "abcd")
-    '///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR>      
-          call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm")
-    '///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR>      
-          call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx")
-    '///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR>      
-          call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh")
-    '///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR>      
-          call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr")
-    '///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR>      
-          call check_message(sMType, "H9", "sdxc", "tgb")
-    '///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR>      
-          call check_message(sMType, "H10", "rfvbj", "dfcvgb")
-    '///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR>      
-          call check_message(sMType, "H11", "g", "we")
-    '///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR>
-    '///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR>
-          call check_message(sMType, "B30", "February", "January")
-    '///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR>      
-          call check_message(sMType, "B31", "May", "February")
-    '///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR>      
-          call check_message(sMType, "B32", "June", "January")
-    '///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR>      
-          call check_message(sMType, "B33", "August", "November")
-    '///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR>      
-          call check_message(sMType, "B34", "September", "December")
-    '///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR>      
-          call check_message(sMType, "B35", "October", "March")
-    '///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR>      
-          call check_message(sMType, "B36", "July", "August")
-    '///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR>      
-          call check_message(sMType, "B37", "April", "October")
-    '///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR>      
-          call check_message(sMType, "B38", "Name03", "Name07")
-    '///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR>            
-          call check_message(sMType, "E30", "alpha", "omega")
-    '///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR>      
-          call check_message(sMType, "E31", "beta", "zeta")
-    '///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR>      
-          call check_message(sMType, "E32", "gamma", "psi")
-    '///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR>      
-          call check_message(sMType, "E33", "delta", "pi/2")
-    '///+ </TABLE></LI></UL>
-       next iCount
+        '///+<UL>
+        '///+<LI>Goto first cell and insert the <i>correct value</i></LI>
+        '///+<LI>Press RETURN</LI>
+        '///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI>
+        '///+<LI>Enter the <i>incorrect value</I>
+        '///+<LI>Press RETURN</LI>
+        '///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI>
+        '///+<LI><TABLE BORDER=1>
+        '///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR>
+        '///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR>
+        call check_message(sMType, "B4", "3", "8")
+        '///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR>
+        call check_message(sMType, "B5", "9", "10")
+        '///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR>
+        call check_message(sMType, "B6", "28", "25")
+        '///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR>
+        call check_message(sMType, "B7", "10", "12")
+        '///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR>
+        call check_message(sMType, "B8", "11", "9")
+        '///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR>
+        call check_message(sMType, "B9", "5", "3")
+        '///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR>
+        call check_message(sMType, "B10", "1", "6")
+        '///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR>
+        call check_message(sMType, "B11", "1", "6")
+        '///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR>
+        call check_message(sMType, "B17", "3,14", "3,15")
+        '///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR>
+        call check_message(sMType, "B18", "10,14", "10,16")
+        '///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR>
+        call check_message(sMType, "B19", "25,10", "25,09")
+        '///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR>
+        call check_message(sMType, "B20", "10,5", "10,7")
+        '///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR>
+        call check_message(sMType, "B21", "11,9", "10")
+        '///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR>
+        call check_message(sMType, "B22", "3,145", "3,14")
+        '///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR>
+        call check_message(sMType, "B23", "1,45", "1,38")
+        '///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR>
+        call check_message(sMType, "B24", "2,03", "2,15")
+        '///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR>
+        call check_message(sMType, "E4", "13.12.99", "13.11.99")
+        '///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E5", "12.12.99", "13.12.99")
+        '///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E6", "14.12.99", "13.12.99")
+        '///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR>
+        call check_message(sMType, "E7", "13.12.99", "14.12.99")
+        '///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR>
+        call check_message(sMType, "E8", "13.12.99", "12.12.99")
+        '///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E9", "13.11.99", "13.12.99")
+        '///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR>
+        call check_message(sMType, "E10", "23.12.99", "12.12.99")
+        '///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR>
+        call check_message(sMType, "E11", "24.12.99", "23.12.99")
+        '///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR>
+        call check_message(sMType, "E17", "13:15", "13:16")
+        '///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR>
+        call check_message(sMType, "E18", "10:15", "14:16")
+        '///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR>
+        call check_message(sMType, "E19", "23:10", "12:09")
+        '///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR>
+        call check_message(sMType, "E20", "13:15", "13:16")
+        '///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:14</TD></TR>
+        call check_message(sMType, "E21", "13:15", "13:14")
+        '///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR>
+        call check_message(sMType, "E22", "13:16", "13:15")
+        '///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR>
+        call check_message(sMType, "E23", "13:15", "23:13")
+        '///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR>
+        call check_message(sMType, "E24", "12:59", "13:00")
+        '///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR>
+        call check_message(sMType, "H4", "abc", "abcd")
+        '///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR>
+        call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm")
+        '///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR>
+        call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx")
+        '///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR>
+        call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh")
+        '///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR>
+        call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr")
+        '///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR>
+        call check_message(sMType, "H9", "sdxc", "tgb")
+        '///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR>
+        call check_message(sMType, "H10", "rfvbj", "dfcvgb")
+        '///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR>
+        call check_message(sMType, "H11", "g", "we")
+        '///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR>
+        '///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR>
+        call check_message(sMType, "B30", "February", "January")
+        '///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR>
+        call check_message(sMType, "B31", "May", "February")
+        '///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR>
+        call check_message(sMType, "B32", "June", "January")
+        '///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR>
+        call check_message(sMType, "B33", "August", "November")
+        '///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR>
+        call check_message(sMType, "B34", "September", "December")
+        '///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR>
+        call check_message(sMType, "B35", "October", "March")
+        '///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR>
+        call check_message(sMType, "B36", "July", "August")
+        '///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR>
+        call check_message(sMType, "B37", "April", "October")
+        '///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR>
+        call check_message(sMType, "B38", "Name03", "Name07")
+        '///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR>
+        call check_message(sMType, "E30", "alpha", "omega")
+        '///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR>
+        call check_message(sMType, "E31", "beta", "zeta")
+        '///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR>
+        call check_message(sMType, "E32", "gamma", "psi")
+        '///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR>
+        call check_message(sMType, "E33", "delta", "pi/2")
+        '///+ </TABLE></LI></UL>
+    next iCount
     '/// Close the document
-	printlog "Close the document" 
-	call hCloseDocument
+    printlog "Close the document"
+    call hCloseDocument
 
 endcase
 '
 '-------------------------------------------------------------------------------
 '
 testcase tValidity_Check_Excel
-'/// This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells
-     
-    dim sInputFile as String       
+    '/// This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells
+
+    dim sInputFile as String
     dim sOutputFile as String
     dim sMType as String
     dim iCount as integer
     dim sInfoStr as String
     dim sdecimalseperator as string
-		sDecimalseperator = GetDecimalSeperator
+    sDecimalseperator = GetDecimalSeperator
 
-    sInputFile = convertpath(gTesttoolPath & "spreadsheet/optional/input/validity.ods")    
+    sInputFile = convertpath(gTesttoolPath & "spreadsheet/optional/input/validity.ods")
     sOutputFile = convertpath(gOfficePath & "user/work/validity.xls")
 
     '/// Open <i>gTesttoolPath</i>/calc/special/input/validity.ods
-	printlog "Open <i>gTesttoolPath</i>/calc/special/input/validity.ods"
+    printlog "Open <i>gTesttoolPath</i>/calc/special/input/validity.ods"
     call hFileOpen (sInputFile)
     Kontext "SecurityWarning"
     '/// If security warning occours click on 'Enable Macros'.
@@ -238,141 +233,140 @@ testcase tValidity_Check_Excel
     call hFileOpen ( sOutputFile )
     sleep (2)
     printlog " Do the following operations (see values in table) with every of the 3 sheets."
-	printlog " Goto first cell and insert the correct value"
-	printlog " Press RETURN"
-	printlog "  No warning or information message should appear"
-	printlog " Enter the incorrect value"
-	printlog " Press RETURN"
-	printlog "  A warning or information message should appear"
+    printlog " Goto first cell and insert the correct value"
+    printlog " Press RETURN"
+    printlog "  No warning or information message should appear"
+    printlog " Enter the incorrect value"
+    printlog " Press RETURN"
+    printlog "  A warning or information message should appear"
     for iCount = 1 to 3
         select case iCount
-            case 1 : sMType = "Stop"          : sInfoStr = "First"
-            case 2 : sMType = "Warning"       : sInfoStr = "Second"
-            case 3 : sMType = "Information"   : sInfoStr = "Third"
+        case 1 : sMType = "Stop"          : sInfoStr = "First"
+        case 2 : sMType = "Warning"       : sInfoStr = "Second"
+        case 3 : sMType = "Information"   : sInfoStr = "Third"
         end select
-    '/// Do the following operations (see values in table) with every of the 3 sheets.
-    call fCalcSelectSheet(sMType)
-    printlog " *** " & sInfoStr & " it is checked, if the " & sMType & " messages appears, if wrong contents are " & _
-    "inserted into the appropriate cells"
-'///+<UL>            
-'///+<LI>Goto first cell and insert the <i>correct value</i></LI> 
-'///+<LI>Press RETURN</LI>
-'///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI>
-'///+<LI>Enter the <i>incorrect value</I> 
-'///+<LI>Press RETURN</LI>
-'///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI> 
-'///+<LI><TABLE BORDER=1>
-'///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR>
-'///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR>
-      call check_message(sMType, "B4", "3", "8")
-'///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR>      
-      call check_message(sMType, "B5", "9", "10")
-'///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR>    
-      call check_message(sMType, "B6", "28", "25")
-'///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR>      
-      call check_message(sMType, "B7", "10", "12")
-'///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR>      
-      call check_message(sMType, "B8", "11", "9")
-'///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR>      
-      call check_message(sMType, "B9", "5", "3")
-'///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR>      
-      call check_message(sMType, "B10", "1", "6")
-'///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR>      
-      call check_message(sMType, "B11", "1", "6")
-'///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR>      
-      call check_message(sMType, "B17", "3" & sdecimalseperator & "14", "3" & sdecimalseperator & "15")
-'///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR>      
-      call check_message(sMType, "B18", "10" & sdecimalseperator & "14", "10" & sdecimalseperator & "16")
-'///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR>      
-      call check_message(sMType, "B19", "25" & sdecimalseperator & "10", "25" & sdecimalseperator & "09")
-'///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR>      
-      call check_message(sMType, "B20", "10" & sdecimalseperator & "5", "10" & sdecimalseperator & "7")
-'///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR>      
-      call check_message(sMType, "B21", "11" & sdecimalseperator & "9", "10")
-'///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR>       
-      call check_message(sMType, "B22", "3" & sdecimalseperator & "145", "3" & sdecimalseperator & "14")
-'///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR>      
-      call check_message(sMType, "B23", "1" & sdecimalseperator & "45", "1" & sdecimalseperator & "38")
-'///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR>      
-      call check_message(sMType, "B24", "2" & sdecimalseperator & "03", "2" & sdecimalseperator & "15")
-'///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR>      
-      call check_message(sMType, "E4", "13.12.99", "13.11.99")
-'///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR>      
-      call check_message(sMType, "E5", "12.12.99", "13.12.99")
-'///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR>      
-      call check_message(sMType, "E6", "14.12.99", "13.12.99")
-'///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR>      
-      call check_message(sMType, "E7", "13.12.99", "14.12.99")
-'///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR>      
-      call check_message(sMType, "E8", "13.12.99", "12.12.99")
-'///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR>      
-      call check_message(sMType, "E9", "13.11.99", "13.12.99")
-'///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR>      
-      call check_message(sMType, "E10", "23.12.99", "12.12.99")
-'///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR>      
-      call check_message(sMType, "E11", "24.12.99", "23.12.99")
-'///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR>      
-      call check_message(sMType, "E17", "13:15", "13:16")
-'///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR>      
-      call check_message(sMType, "E18", "10:15", "14:16")
-'///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR>      
-      call check_message(sMType, "E19", "23:10", "12:09")
-'///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR>      
-      call check_message(sMType, "E20", "13:15", "13:16")
-'///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:15</TD></TR>      
-      call check_message(sMType, "E21", "13:15", "13:14")
-'///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR>      
-      call check_message(sMType, "E22", "13:16", "13:15")
-'///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR>      
-      call check_message(sMType, "E23", "13:15", "23:13")
-'///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR>      
-      call check_message(sMType, "E24", "12:59", "13:00")
-'///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR>
-      call check_message(sMType, "H4", "abc", "abcd")
-'///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR>      
-      call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm")
-'///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR>      
-      call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx")
-'///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR>      
-      call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh")
-'///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR>      
-      call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr")
-'///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR>      
-      call check_message(sMType, "H9", "sdxc", "tgb")
-'///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR>      
-      call check_message(sMType, "H10", "rfvbj", "dfcvgb")
-'///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR>      
-      call check_message(sMType, "H11", "g", "we")
-'///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR>we</TD></TR>
-'///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR>
-      call check_message(sMType, "B30", "February", "January")
-'///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR>      
-      call check_message(sMType, "B31", "May", "February")
-'///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR>      
-      call check_message(sMType, "B32", "June", "January")
-'///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR>      
-      call check_message(sMType, "B33", "August", "November")
-'///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR>
-      call check_message(sMType, "B34", "September", "December")
-'///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR>      
-      call check_message(sMType, "B35", "October", "March")
-'///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR>      
-      call check_message(sMType, "B36", "July", "August")
-'///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR>      
-      call check_message(sMType, "B37", "April", "October")
-'///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR>      
-      call check_message(sMType, "B38", "Name03", "Name07")
-'///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR>            
-      call check_message(sMType, "E30", "alpha", "omega")
-'///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR>      
-      call check_message(sMType, "E31", "beta", "zeta")
-'///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR>  
-      call check_message(sMType, "E32", "gamma", "psi")
-'///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR>      
-      call check_message(sMType, "E33", "delta", "pi/2")
-'///+ </TABLE></LI></UL>
-   next iCount
-'/// File / Close
-   call hCloseDocument
+        '/// Do the following operations (see values in table) with every of the 3 sheets.
+        call fCalcSelectSheet(sMType)
+        printlog " *** " & sInfoStr & " it is checked, if the " & sMType & " messages appears, if wrong contents are " & "inserted into the appropriate cells"
+        '///+<UL>
+        '///+<LI>Goto first cell and insert the <i>correct value</i></LI>
+        '///+<LI>Press RETURN</LI>
+        '///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI>
+        '///+<LI>Enter the <i>incorrect value</I>
+        '///+<LI>Press RETURN</LI>
+        '///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI>
+        '///+<LI><TABLE BORDER=1>
+        '///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR>
+        '///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR>
+        call check_message(sMType, "B4", "3", "8")
+        '///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR>
+        call check_message(sMType, "B5", "9", "10")
+        '///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR>
+        call check_message(sMType, "B6", "28", "25")
+        '///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR>
+        call check_message(sMType, "B7", "10", "12")
+        '///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR>
+        call check_message(sMType, "B8", "11", "9")
+        '///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR>
+        call check_message(sMType, "B9", "5", "3")
+        '///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR>
+        call check_message(sMType, "B10", "1", "6")
+        '///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR>
+        call check_message(sMType, "B11", "1", "6")
+        '///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR>
+        call check_message(sMType, "B17", "3" & sdecimalseperator & "14", "3" & sdecimalseperator & "15")
+        '///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR>
+        call check_message(sMType, "B18", "10" & sdecimalseperator & "14", "10" & sdecimalseperator & "16")
+        '///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR>
+        call check_message(sMType, "B19", "25" & sdecimalseperator & "10", "25" & sdecimalseperator & "09")
+        '///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR>
+        call check_message(sMType, "B20", "10" & sdecimalseperator & "5", "10" & sdecimalseperator & "7")
+        '///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR>
+        call check_message(sMType, "B21", "11" & sdecimalseperator & "9", "10")
+        '///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR>
+        call check_message(sMType, "B22", "3" & sdecimalseperator & "145", "3" & sdecimalseperator & "14")
+        '///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR>
+        call check_message(sMType, "B23", "1" & sdecimalseperator & "45", "1" & sdecimalseperator & "38")
+        '///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR>
+        call check_message(sMType, "B24", "2" & sdecimalseperator & "03", "2" & sdecimalseperator & "15")
+        '///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR>
+        call check_message(sMType, "E4", "13.12.99", "13.11.99")
+        '///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E5", "12.12.99", "13.12.99")
+        '///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E6", "14.12.99", "13.12.99")
+        '///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR>
+        call check_message(sMType, "E7", "13.12.99", "14.12.99")
+        '///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR>
+        call check_message(sMType, "E8", "13.12.99", "12.12.99")
+        '///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR>
+        call check_message(sMType, "E9", "13.11.99", "13.12.99")
+        '///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR>
+        call check_message(sMType, "E10", "23.12.99", "12.12.99")
+        '///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR>
+        call check_message(sMType, "E11", "24.12.99", "23.12.99")
+        '///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR>
+        call check_message(sMType, "E17", "13:15", "13:16")
+        '///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR>
+        call check_message(sMType, "E18", "10:15", "14:16")
+        '///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR>
+        call check_message(sMType, "E19", "23:10", "12:09")
+        '///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR>
+        call check_message(sMType, "E20", "13:15", "13:16")
+        '///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:15</TD></TR>
+        call check_message(sMType, "E21", "13:15", "13:14")
+        '///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR>
+        call check_message(sMType, "E22", "13:16", "13:15")
+        '///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR>
+        call check_message(sMType, "E23", "13:15", "23:13")
+        '///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR>
+        call check_message(sMType, "E24", "12:59", "13:00")
+        '///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR>
+        call check_message(sMType, "H4", "abc", "abcd")
+        '///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR>
+        call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm")
+        '///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR>
+        call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx")
+        '///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR>
+        call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh")
+        '///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR>
+        call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr")
+        '///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR>
+        call check_message(sMType, "H9", "sdxc", "tgb")
+        '///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR>
+        call check_message(sMType, "H10", "rfvbj", "dfcvgb")
+        '///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR>
+        call check_message(sMType, "H11", "g", "we")
+        '///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR>we</TD></TR>
+        '///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR>
+        call check_message(sMType, "B30", "February", "January")
+        '///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR>
+        call check_message(sMType, "B31", "May", "February")
+        '///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR>
+        call check_message(sMType, "B32", "June", "January")
+        '///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR>
+        call check_message(sMType, "B33", "August", "November")
+        '///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR>
+        call check_message(sMType, "B34", "September", "December")
+        '///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR>
+        call check_message(sMType, "B35", "October", "March")
+        '///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR>
+        call check_message(sMType, "B36", "July", "August")
+        '///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR>
+        call check_message(sMType, "B37", "April", "October")
+        '///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR>
+        call check_message(sMType, "B38", "Name03", "Name07")
+        '///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR>
+        call check_message(sMType, "E30", "alpha", "omega")
+        '///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR>
+        call check_message(sMType, "E31", "beta", "zeta")
+        '///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR>
+        call check_message(sMType, "E32", "gamma", "psi")
+        '///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR>
+        call check_message(sMType, "E33", "delta", "pi/2")
+        '///+ </TABLE></LI></UL>
+    next iCount
+    '/// File / Close
+    call hCloseDocument
 endcase
 
diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
index 03040d7c4613..cc448d3c3830 100644
--- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
@@ -29,23 +29,6 @@
 '*
 '* short description : Resource Test - Format Menu Part II
 '*
-'************************************************************************
-'*
-' #1 tFormatPrintRanges
-' #1 tFormatCharacter
-' #1 tFormatParagraph
-' #1 tFormatChangeCase
-' #1 tFormatStyles
-' #1 tFormatAutoFormat
-' #1 tFormatConditionalFormatting
-' #1 tFormatAnchor
-' #1 tFormatAlignment
-' #1 tFormatArrange
-' #1 tFormatFlip
-' #1 tFormatGroup
-' #0 tFormatControl
-
-'*
 '\***********************************************************************
 
 sub c_upd_formatmenu2
@@ -664,7 +647,7 @@ testcase tFormatAlignment
     '/// Close document
     printlog " Close document"
     Call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -768,7 +751,7 @@ testcase tFormatGroup
     '/// Close document
     printlog " Close document"
     Call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
index d4b4092a61c7..0dd9d3200937 100644
--- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
@@ -29,14 +29,6 @@
 '*
 '* short description : Resource Test - Format Menu Part III
 '*
-'************************************************************************
-'*
-' #1 tFormatGraphicPositionAndSize
-' #1 tFormatGraphicLine
-' #1 tFormatGraphicArea
-' #1 tFormatGraphicText
-' #1 tFormatGraphicPoints
-'*
 '\***********************************************************************
 
 sub c_upd_formatmenu3
@@ -129,7 +121,7 @@ testcase tFormatGraphicPositionAndSize
     '/// Close document
     printlog " Close document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -370,7 +362,7 @@ testcase tFormatGraphicLine
     '/// Close document
     printlog " Close document"
     Call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -913,7 +905,7 @@ testcase tFormatGraphicArea
     '/// Close document
     printlog " Close document"
     Call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -1030,7 +1022,7 @@ testcase tFormatGraphicText
     '/// Close document
     printlog " Close document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -1051,7 +1043,7 @@ testcase tFormatGraphicPoints
     '/// Close document
     printlog " Close document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
index 424a74d8bf85..74598099b43d 100644
--- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
@@ -188,7 +188,7 @@ testcase tToolsSpellcheck
     '/// Close starting document
     printlog " Close starting document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -315,7 +315,7 @@ testcase tToolsHangulHanjaConversion
     '/// Close document
     printlog " Close document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -404,7 +404,7 @@ testcase tToolsLanguageThesaurus
     Thesaurus.Cancel
     printlog " Close document"
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
+    hFileDelete( gLastWorkFile )
 
 endcase
 
diff --git a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc
index 3bbc0c8f786a..1807ab4bf35a 100644
--- a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc
+++ b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc
@@ -29,11 +29,6 @@
 '*
 '* short description : tools for localisation in calc
 '*
-'**************************************************************************************************
-'*
-' #1 fFunctionname        'Returns the localized name of a given function in the current UI language
-' #1 fError_l10n          'Returns the localized name of a given errorcode in the current UI language
-'*
 '\************************************************************************************************
 
 function fFunctionname ( sFunctionname_en as string ) as string
@@ -42,16 +37,16 @@ function fFunctionname ( sFunctionname_en as string ) as string
     '///+ -Input is the english name of the function as string
     '///+ -Output is the localized name of the function as string
     '///+ -If there is no translation available the fallback is the english name
-    
+
     dim sloaddocument as string
     dim sfunctionstring as string
     dim scelladress as string
-    
-    use "global/tools/includes/required/t_doc2.inc" 
-    const CFN = "qa:qatesttool:spreadsheet:tools:includes:c_l10n_tools.in:fFunctionname "
-    
+
+    use "global/tools/includes/required/t_doc2.inc"
+    const CFN = "spreadsheet:tools:includes:c_l10n_tools.in:fFunctionname "
+
     sloaddocument = gTesttoolPath & "spreadsheet\tools\input\Functionnames.ods"
-        
+
     '///Load document with all functions <i>gTestToolPath</i>/spreadsheet/tools/input/Functionnames.ods
     hFileOpenLocally( sloaddocument )
     sleep (2)
@@ -61,69 +56,82 @@ function fFunctionname ( sFunctionname_en as string ) as string
     '///Search for function by Search and Replace dialog
     kontext "DocumentCalc"
     EditSearchAndReplace
-    sleep (1)
+
     kontext "FindAndReplace"
-    '///Setting dialog to defaults 
-    More.Click
-    SimilaritySearch.UnCheck
-    CurrentSelectionOnly.UnCheck
-    Backwards.UnCheck
-    SearchForStyles.UnCheck
-    SearchIn.Select 1
-    '///Setting search parameter
-    WholeWordsOnly.Check
-    SearchFor.SetText sFunctionname_en
-    SearchNow.click
-    kontext
-    '///If a MsgBox appears the search must have failed => Fallback to english name
-    if active.exists then
-        if active.getRT = 304 then
-            warnlog CFN & "Function not found, falling back to english name"
-            fFunctionname = sFunctionname_en
-            active.OK
+    printlog( "Reset <Find and Replace> dialog to default settings" )
+    if ( FindAndReplace.exists( 1 ) ) then
+        More.Click
+        SimilaritySearch.UnCheck
+        CurrentSelectionOnly.UnCheck
+        Backwards.UnCheck
+        SearchForStyles.UnCheck
+        SearchIn.Select 1
+        '///Setting search parameter
+        WholeWordsOnly.Check
+        SearchFor.SetText sFunctionname_en
+        SearchNow.click
+        kontext
+        '///If a MsgBox appears the search must have failed => Fallback to english name
+        if active.exists then
+            if active.getRT = 304 then
+                warnlog CFN & "Function not found, falling back to english name"
+                fFunctionname = sFunctionname_en
+                active.OK
+            else
+                '///Throw a warning if a dialog of unexpected resource type appears
+                warnlog CFN & "Unknown message box! " & active.GetText
+                active.Default
+                fFunctionname = sFunctionname_en
+            end if
+
+            kontext "FindAndReplace"
+            printlog( "Reset dialog to default settings" )
+            if ( FindAndReplace.exists( 1 ) ) then
+                WholeWordsOnly.UnCheck
+                hCloseDialog( FindAndReplace, "close" )
+            else
+                warnlog( CFN & "<FindAndReplace> not open" )
+            endif
+            call hCloseDocument
+            exit function
+        end if
+
+        kontext "FindAndReplace"
+        printlog( "Reset <Find and Replace> dialog to default settings" )
+        if ( FindAndReplace.exists( 1 ) ) then
+            WholeWordsOnly.UnCheck
+            hCloseDialog( FindAndReplace, "close" )
         else
-            '///Throw a warning if a dialog of unexpected resource type appears
-           warnlog CFN & "Unknown message box! " & active.GetText
-           active.Default
-           fFunctionname = sFunctionname_en
-       end if
-       kontext "FindAndReplace"
-       sleep (1)
-       '///Reset dialog to defaultsetting
-       WholeWordsOnly.UnCheck
-       FindAndReplace.Close
-       call hCloseDocument
-       exit function
-    end if 
-    kontext "FindAndReplace"
-    sleep (1)
-    '///Reset dialog to defaultsettings
-    WholeWordsOnly.UnCheck
-    FindAndReplace.Close
-    Kontext "RechenleisteCalc"
-    scelladress = Bereich.GetSelText    
-    if fCalcGetCellValue (scelladress) = sFunctionname_en then
-        '///Get localised string for function by extracting functionname out of next cell 
-        call fCalcSelectRange ( "B" & mid(scelladress,2) )
-        kontext ( "RechenleisteCalc" ) 
-        EingabeZeileCalc.TypeKeys ("<f2><mod1 a>")
-        editcopy
-        sfunctionstring = GetClipboardText ()
-        kontext "DocumentCalc"
-        DocumentCalc.TypeKeys ("<ESCAPE>",2)
-        ' DEBUG: printlog sfunctionstring
-        ' DEBUG: printlog len(sfunctionstring)
-        ' DEBUG: printlog instr(sfunctionstring,"(")
-        fFunctionname = mid(sfunctionstring,2,(instr(sfunctionstring,"(")-2)
-        printlog "  The name of the function in this locale (" & iSprache & ") is " & fFunctionname
+            warnlog( CFN & "<FindAndReplace> not open" )
+        endif
+
+        Kontext "RechenleisteCalc"
+        scelladress = Bereich.GetSelText
+        if fCalcGetCellValue (scelladress) = sFunctionname_en then
+            '///Get localised string for function by extracting functionname out of next cell
+            call fCalcSelectRange ( "B" & mid(scelladress,2) )
+            kontext ( "RechenleisteCalc" )
+            EingabeZeileCalc.TypeKeys ("<f2><mod1 a>")
+            editcopy
+            sfunctionstring = GetClipboardText ()
+            kontext "DocumentCalc"
+            DocumentCalc.TypeKeys ("<ESCAPE>",2)
+            ' DEBUG: printlog sfunctionstring
+            ' DEBUG: printlog len(sfunctionstring)
+            ' DEBUG: printlog instr(sfunctionstring,"(")
+            fFunctionname = mid(sfunctionstring,2,(instr(sfunctionstring,"(")-2)
+            printlog "  The name of the function in this locale (" & iSprache & ") is " & fFunctionname
+        else
+            warnlog CFN & "Function not found, falling back to english version"
+            fFunctionname = sFunctionname_en
+        end if
     else
-        warnlog CFN & "Function not found, falling back to english version"
-        fFunctionname = sFunctionname_en
-    end if
-    
+        warnlog( CFN & "Unable to open <FindAndReplace> dialog" )
+    endif
+
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
-    
+    hFileDelete( gLastWorkFile )
+
 end function
 
 '
@@ -136,16 +144,16 @@ function fError_l10n ( sError_en as string ) as string
     '///+ -Input is the english name of the error as string
     '///+ -Output is the localized name of the error as string
     '///+ -If there is no translation available the fallback is the english name
-    
+
     dim sloaddocument as string
     dim sfunctionstring as string
     dim scelladress as string
-    
-    use "global/tools/includes/required/t_doc2.inc" 
+
+    use "global/tools/includes/required/t_doc2.inc"
     const CFN = "qa:qatesttool:spreadsheet:tools:includes:c_l10n_tools.in:fError_l10n "
-    
+
     sloaddocument = gTesttoolPath & "spreadsheet\tools\input\Errorcodes.ods"
-        
+
     '///Load document with all errorcodes <i>gTestToolPath</i>/spreadsheet/tools/input/Errorcodes.ods
     hFileOpenLocally( sloaddocument )
 
@@ -156,7 +164,7 @@ function fError_l10n ( sError_en as string ) as string
     EditSearchAndReplace
     sleep (1)
     kontext "FindAndReplace"
-    '///Setting dialog to defaults 
+    '///Setting dialog to defaults
     More.Click
     SimilaritySearch.UnCheck
     CurrentSelectionOnly.UnCheck
@@ -176,27 +184,37 @@ function fError_l10n ( sError_en as string ) as string
             active.OK
         else
             '///Throw a warning if a dialog of unexpected resource type appears
-           warnlog CFN & "Unknown message box! " & active.GetText
-           active.Default
-           fError_l10n = sError_en
-       end if
-       kontext "FindAndReplace"
-       sleep (1)
-       '///Reset dialog to defaultsetting
-       WholeWordsOnly.UnCheck
-       FindAndReplace.Close
-       call hCloseDocument
-       exit function
-    end if 
+            warnlog CFN & "Unknown message box! " & active.GetText
+            active.Default
+            fError_l10n = sError_en
+        end if
+
+        kontext "FindAndReplace"
+        '///Reset dialog to defaultsetting
+        if ( FindAndReplace.exists( 1 ) ) then
+            WholeWordsOnly.UnCheck
+            hCloseDialog( FindAndReplace, "close" )
+        else
+            warnlog( CFN & "Failed to open <FindAndReplace>" )
+        endif
+
+        call hCloseDocument
+        exit function
+    end if
+
     kontext "FindAndReplace"
-    sleep (1)
     '///Reset dialog to defaultsetting
-    WholeWordsOnly.UnCheck
-    FindAndReplace.Close
+    if ( FindAndReplace.exists( 1 ) ) then
+        WholeWordsOnly.UnCheck
+        hCloseDialog( FindAndReplace, "close" )
+    else
+        warnlog( CFN & "Failed to open <FindAndReplace>" )
+    endif
+    
     Kontext "RechenleisteCalc"
-    scelladress = Bereich.GetSelText    
+    scelladress = Bereich.GetSelText
     if fCalcGetCellValue (scelladress) = sError_en then
-        '///Get localised string for ERR by extracting errorcode out of next cell 
+        '///Get localised string for ERR by extracting errorcode out of next cell
         call fCalcSelectRange ( "B" & mid(scelladress,2) )
         kontext "DocumentCalc"
         editcopy
@@ -207,8 +225,8 @@ function fError_l10n ( sError_en as string ) as string
         warnlog CFN & "Errorcode not found, falling back to english version"
         fError_l10n = sError_en
     end if
-    
+
     call hCloseDocument
-    hFileDelete ( gLastWorkFile )
-    
+    hFileDelete( gLastWorkFile )
+
 end function