cws tl82: merge with DEV300_m86

14 files changed, 649 insertions, 630 deletions

diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index e529119e0..989857403 100644..100755
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
@@ -280,7 +280,11 @@ testcase tFilePassword
       printlog "   Check: (" + i + "/" + x +"): " +sTemp
       if Passwort.isEnabled then
          if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then 
-             warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             if (4=i) then
+                warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             else
+                warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+            endif
          endif
       else
          if (instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1) then 
@@ -429,7 +433,7 @@ testcase tFilePrint
     DokumentWriter.MouseUp 99,99
 
     sFileName = convertpath( gOfficePath + "user/work/math/level1/ftc_a.odt")
-    if (hFileExists(sFileName)) then
+    if (FileExists(sFileName)) then
         '/// goto end of page; insert page break ///'
         kontext "DokumentWriter"
         DokumentWriter.typeKeys "<mod1 end>"
@@ -660,20 +664,12 @@ function hSpeichernUnterMitFilterKillTBO (sFileName as String, sFilterName, opti
     Dim bAlienNotAllowed as boolean
 
     sDerName = ConvertPath (sFileName)
-
-    if hFileExists (sDerName) = TRUE then
-        try 
-            app.kill (sDerName)
-        catch
-            Exceptlog
-        endcatch
-    end if
-    
-    if FileExists(sDerName) then
-        warnlog "file '" & sDerName & "' couldn't be deleted. Exiting function now..."
+    if ( not hDeleteFile( sDerName ) ) then
+        warnlog( "Aborting function because the file could not be deleted: " & sDerName )
+        hSpeichernUnterMitFilterKillTBO() = FALSE
         exit function
-    end if
-
+    endif
+ 
     sleep (1)
     FileSaveAs    
     Kontext "SpeichernDlg"
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 3bfac36f6..9d35f36ff 100644..100755
--- a/testautomation/math/optional/includes/m_105.inc
+++ b/testautomation/math/optional/includes/m_105.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
@@ -487,8 +487,6 @@ testcase tToolsCatalog
 endcase
 
 testcase tToolsCatalogNew
-   qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo"
-goto endsub
     dim i, j as integer
     dim sTemp as string
     dim iStartingSymbolSetCount as integer
@@ -626,7 +624,7 @@ goto endsub
                         SymbolSet.select ""
                     endcatch
                     i = Symbol.getItemCount
-                    if i <> 1 then
+                    if i < 2 then
                         warnlog "Symbol not available in new Symbolset: intsead of 1: " + i
                     endif
                     SymbolSet.setText "TBOnewSymbolSetdelete"
diff --git a/testautomation/math/optional/includes/m_106_.inc b/testautomation/math/optional/includes/m_106_.inc
index 87f6b3969..6136ebfde 100644..100755
--- a/testautomation/math/optional/includes/m_106_.inc
+++ b/testautomation/math/optional/includes/m_106_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/optional/m_lvl1.bas b/testautomation/math/optional/m_lvl1.bas
index 64cee8735..95815c34f 100755
--- a/testautomation/math/optional/m_lvl1.bas
+++ b/testautomation/math/optional/m_lvl1.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Math Function Test
 '*
diff --git a/testautomation/math/required/includes/m_001_.inc b/testautomation/math/required/includes/m_001_.inc
index 371f7f090..7ddffee84 100644..100755
--- a/testautomation/math/required/includes/m_001_.inc
+++ b/testautomation/math/required/includes/m_001_.inc
@@ -25,14 +25,14 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
 '\*****************************************************************
 
- global cActFilter as string ' used filter for save
- Const cActFilterExt = ".odf" ' used filter for save (extension)
+global cActFilter as string ' used filter for save
+Const cActFilterExt = ".odf" ' used filter for save (extension)
 
 ' "StarMath 5.0" ".smf"
 '   Datei$ = convertpath( gOfficePath + "user\work\killme" + cActFilterExt)
@@ -40,338 +40,352 @@
 '   Datei = convertpath(gofficepath + "user\work\test"+cActFilterExt)
 
 sub M_001_
-   Printlog Chr(13) + "--  File Menu  m_001_ --"
-
-   cActFilter = gMathFilter
-
-   Call tmFileNew
-  Call tmFileOpen
-'   Call Autopilot               'in Inc\desktop\autopilo.inc
-  Call tmFileClose
-  Call tmFileSave
-  Call tmFileSaveAs
-  Call tmFileSaveAll
-   Call tmFileReload
-   Call tmFileVersions
-   Call tmExportAsPDF
-   Call tExportAsPDFButton
-   Call tmFileProperties
-  Call tmFilePrinterSetting
-   Call tmFilePassword
+    Printlog Chr(13) + "--  File Menu  m_001_ --"
+
+    cActFilter = gMathFilter
+
+    Call tmFileNew
+    Call tmFileOpen
+    '   Call Autopilot               'in Inc\desktop\autopilo.inc
+    Call tmFileClose
+    Call tmFileSave
+    Call tmFileSaveAs
+    Call tmFileSaveAll
+    Call tmFileReload
+    Call tmFileVersions
+    Call tmExportAsPDF
+    Call tExportAsPDFButton
+    Call tmFileProperties
+    Call tmFilePrinterSetting
+    Call tmFilePassword
 end sub
 
 testcase tmFileNew
-'/// open application ///'
-   Call hNewDocument
-   '/// File->New->Templates and Documents ///'
-   FileNewFromTemplate
-   sleep 3
-   Kontext "TemplateAndDocuments"
-   if TemplateAndDocuments.exists (5) then
-      try
-         '/// klick button 'Organize' ///'
-         Organize.click
-         kontext "DVVerwalten"
-         if DVVerwalten.exists (5) then
-            Call DialogTest (DVVerwalten)
-            sleep 1
-            '/// close dialog 'Template Management' ///'
-            DVVerwalten.close
-         else
-            warnlog "DVVerwalten didn't exist :-("
-         endif
-      catch
-          warnlog "error ;-) - 1"
-      endcatch
-   else
-      warnlog "templates and dokuments didn't exist :-("
-   endif
-   try
-     sleep 1
-     kontext "TemplateAndDocuments"
-     sleep 1
-     Call DialogTest ( TemplateAndDocuments )
-   catch
-     warnlog "no dialogtest possibele :-("
-   endcatch
-
-' TBO i don't get in deep here, because it is not math specific
-'     and IMHO it doesn't make that sense here!
-'     should be enoug in writer...
-   '/// close dialog 'Templates and Documents' ///'
-   TemplateAndDocuments.Cancel
-'/// close application ///'
-        Call hCloseDocument
+    '/// open application ///'
+    Call hNewDocument
+    '/// File->New->Templates and Documents ///'
+    FileNewFromTemplate
+    sleep 3
+    Kontext "TemplateAndDocuments"
+    if TemplateAndDocuments.exists (5) then
+        try
+            '/// klick button 'Organize' ///'
+            Organize.click
+            kontext "DVVerwalten"
+            if DVVerwalten.exists (5) then
+                Call DialogTest (DVVerwalten)
+                sleep 1
+                '/// close dialog 'Template Management' ///'
+                DVVerwalten.close
+            else
+                warnlog "DVVerwalten didn't exist :-("
+            endif
+        catch
+            warnlog "error ;-) - 1"
+        endcatch
+    else
+        warnlog "templates and dokuments didn't exist :-("
+    endif
+    try
+        sleep 1
+        kontext "TemplateAndDocuments"
+        sleep 1
+        Call DialogTest ( TemplateAndDocuments )
+    catch
+        warnlog "no dialogtest possibele :-("
+    endcatch
+
+    ' TBO i don't get in deep here, because it is not math specific
+    '     and IMHO it doesn't make that sense here!
+    '     should be enoug in writer...
+    '/// close dialog 'Templates and Documents' ///'
+    TemplateAndDocuments.Cancel
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFilePassword
-   Dim DokumentPfad$
-   Dim Datei$
-'/// open application ///'
-while (getDocumentCount > 0)
-hCloseDocument
-wend
-   hNewDocument
-   '/// type a formula ///'
-   SchreibenInMathdok "a over b"
-
-   printlog "'/// - save doc as "+cActFilter+" with passwd - ///'"
-   FileSaveAs
-   Kontext "SpeichernDlg"
-   Datei$ = convertpath( gOfficePath + "user\work\killme" + cActFilterExt)
-   if Dir (Datei$) <> "" then kill Datei$
-   printlog "  Testfile: "+Datei$
-   'Dateityp.Select (cActFilter)
-   Passwort.Check
-   Dateiname.SetText Datei$
-   Speichern.Click
-   Kontext "Active"
-   if Active.Exists (5) then
-   ' TBO: ??? what will be ??!
-      Printlog "(1/5) " + Active.GetText
-      Active.Yes
-   end if
-
-   printlog "'/// Try wrong passwd confirmation ///'"
-   Sleep 2
-   Kontext "PasswordFileSave"
-   sleep (2)
-   try
-      Password.SetText "12345"
-      PasswordConfirm.Settext "54321"
-      PasswordFileSave.OK
-      Sleep 2
-   catch
-      warnlog "had to ask for passwd!!!!"
-   endcatch
-   Kontext
-   if (Active.Exists (5) = FALSE ) then
-      Warnlog "Wrong passwordinput not detected"
-   else
-      Printlog "(2/5) " + Active.GetText
-      Active.OK
-   end if
-
-   printlog "'/// Now do it right ///'"
-   Kontext "PasswordFileSave"
-   try
-      Password.SetText "12345"
-      PasswordConfirm.Settext "12345"
-      PasswordFileSave.OK
-   catch
-      warnlog "had to ask for passwd!!!!"
-   endcatch
-
-   Sleep 2
-   printlog "'/// Gotcha & Close file/window ///'"
-   FileClose
-   sleep 1
-
-   printlog "'/// load again with wrong passwd ///'"
-   Call hFileOpen Datei$
-   sleep 1
-   Kontext "PasswordFileOpen"
-   try
-      Passwortname.SetText "34567"
-      PasswordFileOpen.OK
-   catch
-      warnlog "had to ask for passwd!!!!"
-   endcatch
-   Kontext "Active"
-   if Active.Exists(5) then
-         Printlog "(3/5) " + Active.GetText
-      Active.Ok
-   else
-      Warnlog "Wrong passwordinput not detected by loading the document"
-   end if
-
-   printlog "'///load now with right passwd ///'"
-   Sleep 3
-   'Call hDateiOeffnen Datei$
-   Kontext "PasswordFileOpen"
-   try
-      Passwortname.SetText "12345"
-      PasswordFileOpen.OK
-   catch
-      warnlog "had to ask for passwd!!!!"
-   endcatch
-   Sleep 2
-
-   printlog "'/// - save doc with new name under 6.... (has to be automagical selected by loading this doc!) w/o passwd - ///'"
-   Datei$ = convertpath( gOfficePath + "user\work\Erwin2"+cActFilterExt)
-   if Dir (Datei$) <> "" then kill Datei$
-   FileSaveAs
-      Kontext "SpeichernDlg"
-      Dateiname.SetText Datei$
-      if (Passwort.IsChecked <> TRUE) then
-         Warnlog "#i36015# Password has to be checked! :-("
-         Passwort.Check
-         printlog "will be forced checked no!"
-      endif
-      Speichern.Click
-   Kontext "Messagebox"
-      '/// (if messagebox comes up, say YES) ///'
-      if Messagebox.Exists(2) then
-         Messagebox.Yes
-      endif
-      '/// password dialog has to show up! ///'
-   Kontext "PasswordFileSave"
-      if (PasswordFileSave.Exists(5) = FALSE)then
-         Warnlog "- Password dialog Didn't popped up after pressing save"
-      else
-         Kontext "PasswordFileSave"
-         '/// type password "a12345", confirm password: "a12345" -> RIGHT ///'
-         Password.SetText "a12345"
-         PasswordConfirm.SetText "a12345"
-         PasswordFileSave.OK
-         sleep 2
-         '/// close document ///'
-         FileClose
-         sleep 1
-      endif
-   '/// open document ///'
-   FileOpen
-      sleep 1
-      Kontext "OeffnenDlg"
-      Dateiname.SetText Datei$
-      Oeffnen.Click
-      Kontext "PasswordFileOpen"
-      sleep 1
-      '/// type password: "a12345" -> RIGHT ///'
-      PasswortName.SetText "a12345"
-      PasswordFileOpen.OK
-      sleep 5
-   '/// File->SaveAs ///'
-   FileSaveAs
-      Kontext "SpeichernDlg"
-      Dateiname.SetText Datei$
-      if (Passwort.IsChecked <> TRUE) then
-         Warnlog "#i36015# Password has to be checked! :-("
-         Passwort.Check
-         printlog "will be forced checked no!"
-      endif
-      Passwort.UnCheck
-      '/// press 'save', without changing any checkbox! -> file has to be saved WITH password protection ///'
-      Speichern.Click
-   Kontext "Messagebox"
-      '/// (if messagebox comes up, say YES) ///'
-      if Messagebox.Exists(2) then Messagebox.Yes
-   '/// password dialog needn't to show up! ///'
-   Kontext "PasswordFileSave"
-      if (PasswordFileSave.Exists(5))then
-         Warnlog "- Password dialog neeedn't popped up after pressing save"
-         Kontext "PasswordFileSave"
-         passwordFileSave.cancel
-         '/// close document ///'
-         FileClose
-      else
-         '/// close document ///'
-         hCloseDocument
-      end if
+
+    Dim DokumentPfad$
+    Dim Datei$
+    '/// open application ///'
+    hFileCloseAll()
+    hNewDocument
+    '/// type a formula ///'
+    SchreibenInMathdok "a over b" : WaitSlot()
+
+    printlog "'/// - save doc as "+cActFilter+" with passwd - ///'"
+    hUseAsyncSlot( "FileSaveAs" )
+
+    Kontext "SpeichernDlg"
+    if ( SpeichernDlg.exists( 2 ) ) then
+        Datei$ = convertpath( gOfficePath + "user\work\killme" + cActFilterExt)
+        hDeleteFile( Datei$ )
+
+        printlog "  Testfile: "+Datei$
+        Passwort.Check
+        Dateiname.SetText Datei$
+        Speichern.Click
+        Kontext "Active"
+        if Active.Exists (5) then
+            ' TBO: ??? what will be ??!
+            Printlog "(1/5) " + Active.GetText
+            hCloseDialog( Active, "yes" )
+        end if
+    else
+        warnlog( "File Save As dialog did not open" )
+    endif
+
+    printlog "'/// Try wrong passwd confirmation ///'"
+    Kontext "PasswordFileSave"
+    if ( PasswordFileSave.exists( 2 ) ) then
+        Password.SetText "12345"
+        PasswordConfirm.Settext "54321"
+       hCloseDialog( PasswordFileSave, "ok" )
+    else
+        warnlog( "Password dialog on File Save is missing" )
+    endif
+
+    Kontext
+    if ( Active.Exists ( 5 ) ) then
+        Printlog "(2/5) " + Active.GetText
+        hCloseDialog( Active, "ok" )
+    else
+        Warnlog "Wrong passwordinput not detected"
+    end if
+
+    printlog "'/// Now do it right ///'"
+    Kontext "PasswordFileSave"
+    if ( PasswordFileSave.exists( 3 ) ) then
+        Password.SetText "12345"
+        PasswordConfirm.Settext "12345"
+        hCloseDialog( PasswordFileSave, "ok" )
+    else
+        warnlog( "Password dialog on File Save is missing" )
+    endif
+
+    printlog "'/// Gotcha & Close file/window ///'"
+    hUseAsyncSlot( "FileClose" )
+
+    printlog "'/// load again with wrong passwd ///'"
+    Call hFileOpen( Datei$ )
+
+    Kontext "PasswordFileOpen"
+    if ( PasswordFileOpen.exists( 3 ) ) then
+        Passwortname.SetText "34567"
+        hCloseDialog( PasswordFileOpen, "ok" )
+    else
+        warnlog( "Password dialog on File Open is missing" )
+    endif
+
+    Kontext "Active"
+    if Active.Exists(5) then
+        Printlog "(3/5) " + Active.GetText
+        Active.Ok
+    else
+        Warnlog "Wrong passwordinput not detected by loading the document"
+    end if
+
+    printlog "'///load now with right passwd ///'"
+    Kontext "PasswordFileOpen"
+    if ( PasswordFileOpen.exists( 3 ) ) then
+        Passwortname.SetText "12345"
+        hCloseDialog( PasswordFileOpen, "ok" )
+    else
+        warnlog( "Password dialog on File Open is missing" )
+    endif
+
+    printlog "'/// - save doc with new name under 6.... (has to be automagical selected by loading this doc!) w/o passwd - ///'"
+    Datei$ = convertpath( gOfficePath + "user\work\Erwin2"+cActFilterExt)
+    hDeleteFile( Datei$ )
+
+    hUseAsyncSlot( "FileSaveAs" )
+
+    Kontext "SpeichernDlg"
+    if ( SpeichernDlg.exists( 2 ) ) then
+        Dateiname.SetText Datei$
+        if (Passwort.IsChecked <> TRUE) then
+            Warnlog "#i36015# Password has to be checked! :-("
+            Passwort.Check
+            printlog "will be forced checked no!"
+        endif
+        Speichern.Click
+    else
+        warnlog( "File Save dialog is missing" )
+    endif
+
+    Kontext "Messagebox"
+    '/// (if messagebox comes up, say YES) ///'
+    if Messagebox.Exists(2) then
+        Messagebox.Yes
+    endif
+    '/// password dialog has to show up! ///'
+    Kontext "PasswordFileSave"
+    if ( PasswordFileSave.exists( 2 ) ) then
+        '/// type password "a12345", confirm password: "a12345" -> RIGHT ///'
+        Password.SetText "a12345"
+        PasswordConfirm.SetText "a12345"
+        hCloseDialog( PasswordFileSave, "ok" )
+    else
+        warnlog( "Password dialog on FileSave is missing" )
+    endif
+    '/// close document ///'
+    hUseAsyncSlot( "FileClose" )
+    '/// open document ///'
+    hUseAsyncSlot( "FileOpen" )
+
+    Kontext "OeffnenDlg"
+    if ( OeffnenDlg.exists( 2 ) ) then
+        Dateiname.SetText Datei$
+        Oeffnen.Click
+        Kontext "PasswordFileOpen"
+        if ( PasswordFileOpen.exists( 2 ) ) then
+            '/// type password: "a12345" -> RIGHT ///'
+            PasswortName.SetText "a12345"
+            hCloseDialog( PasswordFileOpen, "ok" )
+        else
+            warnlog( "Password dialog on FileOpen is missing" )
+        endif
+    else
+        warnlog( "Failed to open File Open dialog" )
+    endif
+
+'/// File->SaveAs ///'
+    hUseAsyncSlot( "FileSaveAs" )
+    Kontext "SpeichernDlg"
+    Dateiname.SetText Datei$
+    if (Passwort.IsChecked <> TRUE) then
+        Warnlog "#i36015# Password has to be checked! :-("
+        Passwort.Check
+        printlog "will be forced checked no!"
+    endif
+    Passwort.UnCheck
+    '/// press 'save', without changing any checkbox! -> file has to be saved WITH password protection ///'
+    Speichern.Click
+    Kontext "Messagebox"
+    '/// (if messagebox comes up, say YES) ///'
+    if Messagebox.Exists(2) then Messagebox.Yes
+    '/// password dialog needn't to show up! ///'
+    Kontext "PasswordFileSave"
+    if (PasswordFileSave.Exists(5))then
+        Warnlog "- Password dialog neeedn't popped up after pressing save"
+        Kontext "PasswordFileSave"
+        hCloseDialog( passwordFileSave, "cancel" )
+        '/// close document ///'
+        hUseAsyncSlot( "FileClose" )
+    else
+        '/// close document ///'
+        hCloseDocument
+    end if
 endcase
 
 testcase tmFileReload
-   Dim Datei as String
-   dim sFilterName as string
-   dim sFilter as string
-   dim sFilterExt() as string
-
-   Datei = convertpath(gofficepath + "user\work\test"+cActFilterExt)
-   if Dir (Datei) <> "" then kill (Datei)
-
-   ' make sure saving in latest math filter works, checking global filtername and if necessary change it
-   sFilter = hGetUIFiltername("math8")
-
-   '/// open application ///'
-   hNewDocument
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   '/// File->Save As ///'
-   FileSaveAs
-   Kontext "SpeichernDlg"
-   '/// select the actual default file format ///'
-   Dateityp.Select (hFindFilterPosition( sFilter ))
-      '/// type a file name ///'
-      Dateiname.SetText Datei
-      '/// click button 'save' ///'
-      Speichern.Click
-      Kontext "Active"
-      if Active.Exists(2) then Active.Yes
-   sleep 3
-   '/// File->Close ///'
-   FileClose
-   Kontext
-   if MessageBox.Exists (1) then
-      WarnLog "After Saving and Closing the following MessageBox appears: " + MessageBox.GetText
-      MessageBox.Yes
-   end if
-
-   '/// open just saved file ///'
-   Call hFileOpen Datei
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   sleep (3)
-   '/// File->Reload ///'
-   FileReload
-   sleep (3)
-   Kontext
-   if Active.Exists (1) then
-      PrintLog "Say no to: " + Active.GetText
-      '/// say NO to active ///'
-      active.No
-   else
-      WarnLog "Missing smth to say no to! "
-   end if
-
-   Sleep 3
-   '/// File->Reload ///'
-   FileReload
-   Kontext
-   if Active.Exists (1) then
-      PrintLog "Said yes to: " + Active.GetText
-      '/// say YES to active ///'
-      active.Yes
-   end if
-   '/// close application ///'
-   Call hCloseDocument
+    Dim Datei as String
+    dim sFilterName as string
+    dim sFilter as string
+    dim sFilterExt() as string
+
+    Datei = convertpath(gofficepath + "user\work\test"+cActFilterExt)
+    hDeleteFile( Datei )
+
+    ' make sure saving in latest math filter works, checking global filtername and if necessary change it
+    sFilter = hGetUIFiltername("math8")
+
+    '/// open application ///'
+    hNewDocument
+    '/// type a formula ///'
+    call SchreibenInMathdok "a over b"
+    '/// File->Save As ///'
+    hUseAsyncSlot( "FileSaveAs" )
+    Kontext "SpeichernDlg"
+    if ( SpeichernDlg.exists( 2 ) ) then
+        '/// select the actual default file format ///'
+        Dateityp.Select (hFindFilterPosition( sFilter ))
+        '/// type a file name ///'
+        Dateiname.SetText Datei
+        '/// click button 'save' ///'
+        Speichern.Click
+        Kontext "Active"
+
+        if Active.Exists(2) then hCloseDialog( Active, "yes" )
+    else
+        warnlog( "File Save dialog did not open" )
+    endif
+
+    '/// File->Close ///'
+    hUseAsyncSlot( "FileClose" )
+    Kontext
+    if MessageBox.Exists (1) then
+        WarnLog "After Saving and Closing the following MessageBox appears: " + MessageBox.GetText
+        MessageBox.Yes
+    end if
+
+    '/// open just saved file ///'
+    Call hFileOpen( Datei )
+    '/// type a formula ///'
+    sleep( 2 )
+    call SchreibenInMathdok "a over b"
+    sleep( 2 )
+'/// File->Reload ///'
+    hUseAsyncSlot( "FileReload" )
+    Kontext
+    if Active.Exists ( 3 ) then
+        PrintLog "Say no to: " + Active.GetText
+        '/// say NO to active ///'
+        active.No
+    else
+        WarnLog "Missing smth to say no to! "
+    end if
+
+
+    '/// File->Reload ///'
+    hUseAsyncSlot( "FileReload" )
+    Kontext
+    if Active.Exists (1) then
+        PrintLog "Said yes to: " + Active.GetText
+        '/// say YES to active ///'
+        active.Yes
+    end if
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFileVersions
-   Dim Datei as String
-
-   Datei = ConvertPath (gOfficePath & "user/work/test"+cActFilterExt)
-   if app.Dir (Datei) <> "" then app.kill (Datei)
-
-   '/// open application ///'
-   Call hNewDocument
-   sleep 2
-   '/// type a formula ///'
-   SchreibenInMathdok "a over b"
-   '/// save file ///'
-   Call hFileSaveAs(Datei)
-   Sleep 3
-   try
-      '/// File->Versions ///'
-      FileVersions
-   catch
-      Warnlog "- File / Versions not accessible!"
-      goto endsub
-   endcatch
-
-   Kontext "Versionen"
-   Call DialogTest ( Versionen )
-   '/// click button 'Save New Version' ///'
-   Speichern.Click
-   Kontext "VersionskommentarEingeben"
-   Call DialogTest ( VersionskommentarEingeben )
-   '/// cancel dialog 'Insert Version Comment' ///'
-   VersionskommentarEingeben.Cancel
-   Kontext "Versionen"
-   '/// close dialog 'Version of ...' ///'
-   Versionen.Close
-   '/// close application ///'
-   Call hCloseDocument
-   if app.Dir (Datei) <> "" then app.kill Datei
+    Dim Datei as String
+
+    Datei = ConvertPath (gOfficePath & "user/work/test"+cActFilterExt)
+    if app.Dir (Datei) <> "" then app.kill (Datei)
+
+    '/// open application ///'
+    Call hNewDocument
+    sleep 2
+    '/// type a formula ///'
+    SchreibenInMathdok "a over b"
+    '/// save file ///'
+    Call hFileSaveAs(Datei)
+    Sleep 3
+    try
+        '/// File->Versions ///'
+        FileVersions
+    catch
+        Warnlog "- File / Versions not accessible!"
+        goto endsub
+    endcatch
+
+    Kontext "Versionen"
+    Call DialogTest ( Versionen )
+    '/// click button 'Save New Version' ///'
+    Speichern.Click
+    Kontext "VersionskommentarEingeben"
+    Call DialogTest ( VersionskommentarEingeben )
+    '/// cancel dialog 'Insert Version Comment' ///'
+    VersionskommentarEingeben.Cancel
+    Kontext "Versionen"
+    '/// close dialog 'Version of ...' ///'
+    Versionen.Close
+    '/// close application ///'
+    Call hCloseDocument
+    if app.Dir (Datei) <> "" then app.kill Datei
 endcase
 
 '-----------------------------------------------------------
@@ -379,284 +393,295 @@ endcase
 '-----------------------------------------------------------
 
 testcase tmFileOpen
-'/// open application ///'
-   call hNewDocument
-   '/// File->Open ///'
-   FileOpen
-      Kontext "OeffnenDlg"
-      '/// klick button 'Up one level' ///'
-      UebergeordneterOrdner.Click
-      '/// klick button 'Default Directory' ///'
-      Standard.Click
-      '/// check checkbox 'Read Only' ///'
-      NurLesen.check
-      Call DialogTest ( OeffnenDlg )
-      '/// cancel dialog 'Open' ///'
-   OeffnenDlg.Cancel
-   Sleep 2
-   '/// close application ///'
-   Call hCloseDocument
+    '/// open application ///'
+    call hNewDocument
+    '/// File->Open ///'
+    FileOpen
+    Kontext "OeffnenDlg"
+    if ( OeffnenDlg.exists( 2 ) ) then
+        '/// klick button 'Up one level' ///'
+        UebergeordneterOrdner.Click
+        '/// klick button 'Default Directory' ///'
+        Standard.Click
+        '/// check checkbox 'Read Only' ///'
+        NurLesen.check
+        Call DialogTest ( OeffnenDlg )
+        '/// cancel dialog 'Open' ///'
+        hCloseDialog( OeffnenDlg, "cancel" )
+    endif
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFileClose
-'/// open application ///'
-   hNewDocument    ' just for the records: i open ONE document
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   sleep (2)
-   '/// File->Close ///'
-   FileClose
-   Kontext         ' expecting 'modified, do you want to close?'
-   if active.exists (5) then
-      printlog "  ok, active came up: " + active.gettext
-      '/// say NO to active about 'modified stuff :-)' ///'
-      Active.Cancel   ' no, not this time
-   else
-      warnlog "active missing (1)"
-   endif
-   sleep (2)
-   '/// File->Close ///'
-   FileClose
-   Kontext
-   '/// say YES to active about 'modified stuff :-)' ///'
-   Active.Yes      ' but now - records: this document is closed
-   sleep (2)
-   Kontext "SpeichernDlg"
-   Call DialogTest ( SpeichernDlg )
-   '/// cancel dialog 'Save As' ///'
-   SpeichernDlg.Cancel
-   sleep (2)
-
-   '/// File->Close ///'
-   FileClose       ' now the office gets closed! (if there were no modifications!)
-   Kontext
-   if active.exists (5) then Active.No
-   sleep (2)
+    '/// open application ///'
+    hNewDocument    ' just for the records: i open ONE document
+    '/// type a formula ///'
+    sleep( 2 )
+    call SchreibenInMathdok "a over b"
+    sleep( 2 )
+'/// File->Close ///'
+    hUseAsyncSlot( "FileClose" )
+    Kontext         ' expecting 'modified, do you want to close?'
+    if active.exists (5) then
+        printlog "  ok, active came up: " + active.gettext
+        '/// say NO to active about 'modified stuff :-)' ///'
+        Active.Cancel   ' no, not this time
+    else
+        warnlog "active missing (1)"
+    endif
+
+    '/// File->Close ///'
+    hUseAsyncSlot( "FileClose" )
+    Kontext
+    '/// say YES to active about 'modified stuff :-)' ///'
+    hCloseDialog( Active, "yes" )
+
+    Kontext "SpeichernDlg"
+    if ( SpeichernDlg.exists( 2 ) ) then
+        Call DialogTest ( SpeichernDlg )
+        '/// cancel dialog 'Save As' ///'
+        hCloseDialog( SpeichernDlg, "cancel" )
+    else
+        warnlog( "File Save dialog did not open" )
+    endif
+
+    '/// File->Close ///'
+    hUseAsyncSlot( "FileClose" )       ' now the office gets closed! (if there were no modifications!)
+    Kontext
+    if active.exists (5) then hCloseDialog( Active, "No" )
+
 endcase
 
 testcase tmFileSave
-'/// open application ///'
-   hNewDocument
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   '/// File->Save ///'
-   FileSave
-   sleep 2
-   Kontext "SpeichernDlg"
-   UebergeordneterOrdner.click
-   Standard.Click
-'      NeuerOrdner.Click
-'      DateiAuswahl.TypeKeys "Hallo<Return>"
-'      DateiLoeschen
-'      Kontext "Messagebox"
-'      MessageBox.Yes
-   Call DialogTest (SpeichernDlg)
-   '/// cancel dialog 'Save' ///'
-   SpeichernDlg.Cancel
-    sleep 2
-   '/// close application ///'
-   Call hCloseDocument
+    '/// open application ///'
+    hNewDocument
+    '/// type a formula ///'
+    call SchreibenInMathdok "a over b"
+    '/// File->Save ///'
+    hUseAsyncSlot( "FileSave" )
+
+    Kontext "SpeichernDlg"
+    if ( SpeichernDlg.exists( 2 ) ) then
+        UebergeordneterOrdner.click
+        Standard.Click
+        '      NeuerOrdner.Click
+        '      DateiAuswahl.TypeKeys "Hallo<Return>"
+        '      DateiLoeschen
+        '      Kontext "Messagebox"
+        '      MessageBox.Yes
+        Call DialogTest (SpeichernDlg)
+        '/// cancel dialog 'Save' ///'
+        hCloseDialog( SpeichernDlg, "cancel" )
+    else
+        warnlog( "File Save dialog did not open" )
+    endif
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFileSaveAs
-'/// open application ///'
-   hNewDocument
-   sleep (2)
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   '/// File->Save As ///'
-   FileSaveAs
-   sleep 1
-   Kontext "SpeichernDlg"
-   if (SpeichernDlg.exists (5) = FALSE) then
-      warnlog "error :-("
-   endif
-   sleep 2
-   '/// check ceckbox 'save with Password' ///'
-   Passwort.check
-   '/// UNcheck ceckbox 'save with Password' ///'
-   Passwort.uncheck
-   '/// click button 'up one level' ///'
-   UebergeordneterOrdner.click
-   '/// click button 'default directory' ///'
-   Standard.Click
-   '/// click button 'create new directory' ///'
-   NeuerOrdner.click
-      kontext "NeuerOrdner"
-      '/// cancel dialog 'create new folder' ///'
-      NeuerOrdner.cancel
-   Kontext "SpeichernDlg"
-   Call DialogTest (SpeichernDlg)
-   '/// cancel dialog 'Save As' ///'
-   SpeichernDlg.Cancel
-   sleep (2)
-   '/// close application ///'
-   Call hCloseDocument
+    '/// open application ///'
+    hNewDocument
+    sleep (2)
+    '/// type a formula ///'
+    call SchreibenInMathdok "a over b"
+    '/// File->Save As ///'
+    hUseAsyncSlot( "FileSaveAs" )
+
+    Kontext "SpeichernDlg"
+    if (SpeichernDlg.exists ( 5 ) ) then
+
+        '/// check ceckbox 'save with Password' ///'
+        Passwort.check
+        '/// UNcheck ceckbox 'save with Password' ///'
+        Passwort.uncheck
+        '/// click button 'up one level' ///'
+        UebergeordneterOrdner.click
+        '/// click button 'default directory' ///'
+        Standard.Click
+        '/// click button 'create new directory' ///'
+        NeuerOrdner.click
+        kontext "NeuerOrdner"
+        '/// cancel dialog 'create new folder' ///'
+        NeuerOrdner.cancel
+        Kontext "SpeichernDlg"
+        Call DialogTest (SpeichernDlg)
+        '/// cancel dialog 'Save As' ///'
+        hCloseDialog( SpeichernDlg, "cancel" )
+    else
+        warnlog( "File Save dialog did not open" )
+    endif
+
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFileSaveAll
-'/// open application ///'
-   hNewDocument
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-   Printlog " '/// open 2. window ///"
-   hNewDocument
-   '/// type a formula ///'
-   call hTBOtypeInDoc
-
-   Printlog "  call save all"
-   '/// File->Save All ///'
-   FileSaveAll
-   Printlog "  cancel 1. save"
-   Kontext "SpeichernDlg"
-   if SpeichernDlg.exists(5) then
-       '/// cancel dialog 'save as' ///'
-       SpeichernDlg.Cancel
-   else
-       qaErrorlog "First File save dialog did not show up."
-   endif
-   Printlog "  cancel 2. save"
-   Kontext "SpeichernDlg"
-   if SpeichernDlg.exists(5) then
-       '/// cancel dialog 'save as' ///'
-       SpeichernDlg.Cancel
-   else
-       qaErrorlog "Second File save dialog did not show up."
-   endif
-
-   try
-      Kontext "SpeichernDlg"
-      SpeichernDlg.Cancel
-      printlog "smth had been typed in the starting window (just a hint ;-) )"
-   catch
-      printlog "--------- no other window want's to get saved. :-)"
-   endcatch
-
-   Sleep 2
-   Printlog "  hCloseDocument both"
-   '/// close document ///'
-   Call hCloseDocument
-   sleep 2
-   Printlog "  first closed"
-   '/// close application ///'
-   try
-   Call hCloseDocument
-   catch
-   printlog "any catching?"
-   endcatch
-   sleep 1
-   Printlog "  second closed"
-   sleep (5)
+    '/// open application ///'
+    hNewDocument
+    '/// type a formula ///'
+    call SchreibenInMathdok "a over b"
+    Printlog " '/// open 2. window ///"
+    hNewDocument
+    '/// type a formula ///'
+    call SchreibenInMathdok "a over b"
+
+    Printlog "  call save all"
+    '/// File->Save All ///'
+    FileSaveAll
+    Printlog "  cancel 1. save"
+    Kontext "SpeichernDlg"
+    if SpeichernDlg.exists(5) then
+        '/// cancel dialog 'save as' ///'
+        SpeichernDlg.Cancel
+    else
+        qaErrorlog "First File save dialog did not show up."
+    endif
+    Printlog "  cancel 2. save"
+    Kontext "SpeichernDlg"
+    if SpeichernDlg.exists(5) then
+        '/// cancel dialog 'save as' ///'
+        SpeichernDlg.Cancel
+    else
+        qaErrorlog "Second File save dialog did not show up."
+    endif
+
+    try
+        Kontext "SpeichernDlg"
+        SpeichernDlg.Cancel
+        printlog "smth had been typed in the starting window (just a hint ;-) )"
+    catch
+        printlog "--------- no other window want's to get saved. :-)"
+    endcatch
+
+    Sleep 2
+    Printlog "  hCloseDocument both"
+    '/// close document ///'
+    Call hCloseDocument
+    sleep 2
+    Printlog "  first closed"
+    '/// close application ///'
+    try
+        Call hCloseDocument
+    catch
+        printlog "any catching?"
+    endcatch
+    sleep 1
+    Printlog "  second closed"
+    sleep (5)
 endcase
 
 testcase tmExportAsPDF
-   dim sPDF as string
-   dim sTemp as string
-
-   sPDF = "PDF - Portable Document Format (.pdf)"
-
-   '/// open application ///'
-   Call hNewDocument
-
-   '/// click the button 'Export Directly as PDF' on the Functionbar ///'
-   kontext "Standardbar"
-   Sleep 5
-   ExportAsPDF.click
-      ' the 'Export as PDF' dialog has to come up, with the only 'File type' 'PDF - Portable Document Format (.pdf)'
-      kontext "ExportierenDlg"
-      sTemp = Dateityp.GetSelText
-      if (sTemp <> sPDF) then
-         Warnlog "filter for PDF export is missing :-( should: '" + sPDF + "'; is: '" +  + "'"
-      endif
-      '///+ - set Textbox 'File name' to "abc" ///'
-      Dateiname.SetText "abc"
-      '///+ - use the cursor keys in the filebrowser ///'
-      DateiAuswahl.TypeKeys "<home><down>"
-      '///+ - click on the button 'Up one level' ///'
-      UebergeordneterOrdner.Click
-      '///+ - click on the button 'Create New Directory' ///'
-      NeuerOrdner.Click
-         kontext "NeuerOrdner"
-         '///+ - - in the dialog $Foldername set textfield 'New' to 'abc' ///'
-         OrdnerName.SetText "abc"
-         '///+ - - cancel dialog $Foldername ///'
-         NeuerOrdner.cancel
-      kontext "ExportierenDlg"
-      '///+ - click on the button 'Default Directory' ///'
-      Standard.Click
-      '///+ - cancel dialog ///'
-      Kontext "ExportierenDlg"
-      ExportierenDlg.Cancel
-      
-   '/// close application ///'
-   Call hCloseDocument
+    dim sPDF as string
+    dim sTemp as string
+
+    sPDF = "PDF - Portable Document Format (.pdf)"
+
+    '/// open application ///'
+    Call hNewDocument
+
+    '/// click the button 'Export Directly as PDF' on the Functionbar ///'
+    kontext "Standardbar"
+    Sleep 5
+    ExportAsPDF.click
+    ' the 'Export as PDF' dialog has to come up, with the only 'File type' 'PDF - Portable Document Format (.pdf)'
+    kontext "ExportierenDlg"
+    sTemp = Dateityp.GetSelText
+    if (sTemp <> sPDF) then
+        Warnlog "filter for PDF export is missing :-( should: '" + sPDF + "'; is: '" +  + "'"
+    endif
+    '///+ - set Textbox 'File name' to "abc" ///'
+    Dateiname.SetText "abc"
+    '///+ - use the cursor keys in the filebrowser ///'
+    DateiAuswahl.TypeKeys "<home><down>"
+    '///+ - click on the button 'Up one level' ///'
+    UebergeordneterOrdner.Click
+    '///+ - click on the button 'Create New Directory' ///'
+    NeuerOrdner.Click
+    kontext "NeuerOrdner"
+    '///+ - - in the dialog $Foldername set textfield 'New' to 'abc' ///'
+    OrdnerName.SetText "abc"
+    '///+ - - cancel dialog $Foldername ///'
+    NeuerOrdner.cancel
+    kontext "ExportierenDlg"
+    '///+ - click on the button 'Default Directory' ///'
+    Standard.Click
+    '///+ - cancel dialog ///'
+    Kontext "ExportierenDlg"
+    hCloseDialog( ExportierenDlg, "cancel" )
+
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
 testcase tmFileProperties
-'/// open application ///'
-   Call hNewDocument
-   '/// File->Properties... ///'
-   FileProperties
-
-   Kontext
-   '/// select tabpage 'General' ///'
-   active.SetPage TabDokument
-   Kontext "TabDokument"
-   Call DialogTest ( TabDokument )
-
-   Kontext
-   '/// select tabpage 'Description' ///'
-   active.SetPage TabDokumentInfo
-   Kontext "TabDokumentInfo"
-   Call DialogTest ( TabDokumentInfo )
-
-   Kontext
-   '/// select tabpage 'Internet' ///'
-   active.SetPage TabInternet
-   Kontext "TabInternet"
-   Call DialogTest (TabInternet)
-   TabInternet.Cancel
-   '/// close application ///'
-   Call hCloseDocument
-
-   qaerrorlog "#i95523# Custom Properties is not controlable by VCL TestTool Application"
-   goto endsub
-
-   Kontext
-   '/// select tabpage 'User defined' ///'
-   active.SetPage TabBenutzer
-   Kontext "TabBenutzer"
-   Call DialogTest ( TabBenutzer )
-   '/// click button 'info fields' ///'
-   Infofelder.Click
-      Kontext "InfonamenBearbeiten"
-      Call DialogTest (InfonamenBearbeiten)
-   '/// close dialog 'edit field names' ///'
-   InfoNamenBearbeiten.Cancel
+    '/// open application ///'
+    Call hNewDocument
+    '/// File->Properties... ///'
+    hUseAsyncSlot( "FileProperties" )
+
+    Kontext
+    '/// select tabpage 'General' ///'
+    active.SetPage TabDokument
+    Kontext "TabDokument"
+    Call DialogTest ( TabDokument )
+
+    Kontext
+    '/// select tabpage 'Description' ///'
+    active.SetPage TabDokumentInfo
+    Kontext "TabDokumentInfo"
+    Call DialogTest ( TabDokumentInfo )
+
+    Kontext
+    '/// select tabpage 'Internet' ///'
+    active.SetPage TabInternet
+    Kontext "TabInternet"
+    Call DialogTest (TabInternet)
+    hCloseDialog( TabInternet, "cancel" )
+    '/// close application ///'
+    Call hCloseDocument
+
+    qaerrorlog "#i95523# Custom Properties is not controlable by VCL TestTool Application"
+    goto endsub
+
+    Kontext
+    '/// select tabpage 'User defined' ///'
+    active.SetPage TabBenutzer
+    Kontext "TabBenutzer"
+    Call DialogTest ( TabBenutzer )
+    '/// click button 'info fields' ///'
+    Infofelder.Click
+    Kontext "InfonamenBearbeiten"
+    Call DialogTest (InfonamenBearbeiten)
+    '/// close dialog 'edit field names' ///'
+    hCloseDialog( InfoNamenBearbeiten, "cancel" )
 endcase
 
 testcase tmFilePrinterSetting
-'/// open application ///'
-   Call hNewDocument
-   sleep 3
-   '/// File->Printer Settings ///'
-   FilePrintersettings
-   kontext
-   if active.exists(2) then
-       active.ok
-       qaerrorlog "There is no printer available - please install one on your system!"
-   endif
-   Kontext "DruckerEinrichten"
-   Call DialogTest (DruckerEinrichten)
-   sleep 2
-   '/// cancel dialog 'printer setup' ///'
-   DruckerEinrichten.Cancel
-   sleep 2
-   '/// close application ///'
-   Call hCloseDocument
+    '/// open application ///'
+    Call hNewDocument
+
+'/// File->Printer Settings ///'
+    hUseAsyncSlot( "FilePrintersettings" )
+    kontext
+    if active.exists(2) then
+        active.ok
+        qaerrorlog "There is no printer available - please install one on your system!"
+    endif
+
+    Kontext "DruckerEinrichten"
+    if ( DruckerEinrichten.exists( 2 ) ) then
+        Call DialogTest (DruckerEinrichten)
+    
+        '/// cancel dialog 'printer setup' ///'
+        hCloseDialog( DruckerEinrichten, "cancel" )
+    else
+        warnlog( "Printer Configuration dialog did not open" )
+    endif
+
+    '/// close application ///'
+    Call hCloseDocument
 endcase
 
-sub hTBOtypeInDoc
-   SchreibenInMathdok "a over b"
-end sub
 
diff --git a/testautomation/math/required/includes/m_002_.inc b/testautomation/math/required/includes/m_002_.inc
index 860ba8ae0..eff8ba5b8 100644..100755
--- a/testautomation/math/required/includes/m_002_.inc
+++ b/testautomation/math/required/includes/m_002_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
@@ -46,7 +46,7 @@ testcase tmEditUndoRedo
    hNewDocument
    kontext "DocumentMath"
    '/// type something into the document ///'
-   call hTBOtypeInDoc
+   call SchreibenInMathdok "a over b"
    try
       '/// Edit->Undo ///'
       EditUndo
@@ -70,7 +70,7 @@ testcase tmEditAllClipboard
 '   Commands.TypeKeys Eingabe
 
    '/// type something into the document ///'
-   call hTBOtypeInDoc
+   call SchreibenInMathdok "a over b"
    '/// Edit->Select All ///'
    EditSelectAllMath
    Sleep 2
diff --git a/testautomation/math/required/includes/m_003_.inc b/testautomation/math/required/includes/m_003_.inc
index 056bf21be..152fd1429 100644..100755
--- a/testautomation/math/required/includes/m_003_.inc
+++ b/testautomation/math/required/includes/m_003_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/required/includes/m_004_.inc b/testautomation/math/required/includes/m_004_.inc
index ce016f4dd..8f49d5633 100644..100755
--- a/testautomation/math/required/includes/m_004_.inc
+++ b/testautomation/math/required/includes/m_004_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/required/includes/m_005_.inc b/testautomation/math/required/includes/m_005_.inc
index bb580b9bd..d9c773ef7 100755
--- a/testautomation/math/required/includes/m_005_.inc
+++ b/testautomation/math/required/includes/m_005_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/required/includes/m_006_.inc b/testautomation/math/required/includes/m_006_.inc
index e94a7acc3..cea7bb704 100644..100755
--- a/testautomation/math/required/includes/m_006_.inc
+++ b/testautomation/math/required/includes/m_006_.inc
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/required/includes/m_007_.inc b/testautomation/math/required/includes/m_007_.inc
index 9fe712a51..fc8269c05 100644..100755
--- a/testautomation/math/required/includes/m_007_.inc
+++ b/testautomation/math/required/includes/m_007_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Test the Help Menu
 '*
@@ -49,7 +49,7 @@ testcase tmHelpHelpAgent
    '/// open application ///'
    Call hNewDocument
 
-   hTBOtypeInDoc
+   SchreibenInMathdok "a over b"
 
    HelpHelpAgent ' it's just a switch
    sleep 2
@@ -62,7 +62,7 @@ endcase
 testcase tmHelpTips
    '/// open application ///'
    Call hNewDocument
-   hTBOtypeInDoc
+   SchreibenInMathdok "a over b"
 
    HelpTips
    Sleep 2
@@ -75,7 +75,7 @@ endcase
 testcase tmHelpExtendedTips
    '/// open application ///'
    Call hNewDocument
-   hTBOtypeInDoc
+   SchreibenInMathdok "a over b"
 
    HelpEntendedHelp
    Sleep (2)
@@ -88,7 +88,7 @@ endcase
 testcase tmHelpAboutStarOffice
    '/// open application ///'
    Call hNewDocument
-   hTBOtypeInDoc
+   SchreibenInMathdok "a over b"
 
    HelpAboutStarOffice
    Kontext "UeberStarMath"
diff --git a/testautomation/math/required/includes/m_010_.inc b/testautomation/math/required/includes/m_010_.inc
index 940acc188..7f3cd8944 100644..100755
--- a/testautomation/math/required/includes/m_010_.inc
+++ b/testautomation/math/required/includes/m_010_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/math/required/includes/m_020_.inc b/testautomation/math/required/includes/m_020_.inc
index b2edf7170..ae79e2430 100644..100755
--- a/testautomation/math/required/includes/m_020_.inc
+++ b/testautomation/math/required/includes/m_020_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
@@ -40,33 +40,33 @@ testcase tMainToolbar
    '/// open application ///'
    Call hNewDocument
       '/// type something into document ///'
-      hTBOtypeInDoc
+      SchreibenInMathdok( "a over b" )
       kontext "Toolbar"
       '/// click buttons on Main Toolbar ///'
       '/// click 'Zoom in' ///'
-      Vergroessern.Click
+      hClickButton( Vergroessern )
       '/// click 'Zoom out' ///'
-      Verkleinern.Click
+      hClickButton( Verkleinern )
       '/// click 'Zoom 100%' ///'
-      ZoomHundertProzent.Click
+      hClickButton( ZoomHundertProzent )
       '/// click 'Zoom inEntire Formula' ///'
-      GanzeFormel.Click
+      hClickButton( GanzeFormel )
       '/// click 'Refresh' ///'
-      FormelAktualisieren.Click
+      hClickButton( FormelAktualisieren )
       '/// click 'Formula Cursor' ///'
-      FormulaCursor.Click
+      hClickButton( FormulaCursor )
       '/// click 'Symbols' ///'
-      FormelSymbole.Click
+      hClickButton( FormelSymbole )
       kontext "SymboleMath"
-      if (SymboleMath.exists <> TRUE) then
-         warnlog "Symbols Dialog didn't came up :-("
-      else
+      if ( SymboleMath.exists( 1 ) ) then
          '/// close dialog 'Symbols' ///'
-         SymboleMath.close
+         hCloseDialog( SymboleMath, "close" )
+      else
+         warnlog( "Dialog <SymboleMath> did not open" )
       endif
       kontext "Toolbar"
       '/// click 'Formula Cursor' ///'
-      FormulaCursor.Click
+      hClickButton( FormulaCursor )
    '/// close application ///'
    Call hCloseDocument
 endcase
diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas
index 4f812b0dd..13d7f5ef9 100755
--- a/testautomation/math/required/m_updt.bas
+++ b/testautomation/math/required/m_updt.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Math Update Test
 '*